diff --git a/.github/actions/common/action.yml b/.github/actions/common/action.yml
index 0f406515b..1ee8abeb0 100644
--- a/.github/actions/common/action.yml
+++ b/.github/actions/common/action.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023 Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,15 +18,15 @@ name: 'Common Job Steps'
 description: A composite action that abstracts the common steps needed to implement a job
 inputs:
   native-image:
-    description: Wether to setup GraalVM native-image
+    description: Whether to setup GraalVM native-image
     required: false
     default: 'false'
   maven-cache:
-    description: Wether to cache the Maven local repository (read-only or read-write)
+    description: Whether to cache the Maven local repository (read-only or read-write)
     required: false
     default: 'read-only'
   build-cache:
-    description:  Wether to cache the Maven build (read-only or read-write)
+    description:  Whether to cache the Maven build (read-only or read-write)
     required: false
     default: ''
   build-cache-id:
@@ -56,49 +56,23 @@ inputs:
     description: Path of the files to include in the artifact
     required: false
     default: ''
-  archive-test-results:
-    description: Wether to archive test results (excluded on windows)
-    required: false
-    default: 'false'
-  test-matrix:
-    description: |
-      A JSON matrix with a "group" dimension, and a "groups" object to resolve Maven modules
-      from glob expressions.
-
-      The resolved modules are added in the include objects with a param "module".
-      A 'misc' group is always added to represent everything else by negating all the resolved modules (E.g. '!dir1,!dir2').
-
-      E.g.
-      {
-        "os": [ "ubuntu-20.04", "windows-2022" ],
-        "group": [ "group1", "group2", "misc" ],
-        "include": [
-          { "os": "ubuntu-20.04", "platform": "linux" },
-          { "os": "windows-2022", "platform": "windows" }
-        ]
-        "groups":  {
-          "group1": [ "dir1/**", "dir2/**" ],
-          "group2": [ "dir3/**" ]
-        }
-      }
+  test-artifact-name:
+    description: Name of the test artifact to create (excluded on windows), if non empty tests are archived
     required: false
     default: ''
-outputs:
-  test-matrix:
-    value: ${{ steps.test-matrix.outputs.matrix }}
-    description: |
-      E.g.
-      groups: [ group1, group2 ]
-      includes:
-        - group: group1
-          modules: dir1,dir2,dir2a
-        - group: group2
-          modules: dir3,dir3a
-        - group: misc
-          modules: !dir1,!dir2,!dir2a,!dir3,!dir3a
+  free-space:
+    description: Whether to aggressively free disk space on the runner
+    default: 'false'
 runs:
   using: "composite"
   steps:
+    - if: ${{ inputs.free-space == 'true' }}
+      # See https://github.com/actions/runner-images/issues/2840
+      name: Free disk space
+      shell: bash
+      run: |
+        sudo rm -rf /usr/share/dotnet
+        sudo rm -rf /usr/local/share/powershell
     - if: ${{ runner.os == 'Windows' }}
       name: Use GNU tar
       shell: cmd
@@ -109,7 +83,7 @@ runs:
         git config --global core.eol lf
     - name: Set up GraalVM
       if: ${{ inputs.native-image == 'true' }}
-      uses: graalvm/setup-graalvm@v1.1.2.1
+      uses: graalvm/setup-graalvm@v1.2.1
       with:
         java-version: ${{ env.JAVA_VERSION }}
         version: ${{ env.GRAALVM_VERSION }}
@@ -117,35 +91,38 @@ runs:
         check-for-updates: 'false'
         set-java-home: 'false'
     - name: Set up JDK
-      uses: actions/setup-java@v3.11.0
+      uses: actions/setup-java@v4.1.0
       with:
         distribution: ${{ env.JAVA_DISTRO }}
         java-version: ${{ env.JAVA_VERSION }}
     - name: Cache local Maven repository (read-write)
       if: ${{ inputs.maven-cache == 'read-write' }}
-      uses: actions/cache@v3.3.1
+      uses: actions/cache@v4.0.2
       with:
+        # See https://github.com/actions/toolkit/issues/713
+        # Include must not match top level directories
         path: |
-          .m2/repository/**
-          !.m2/repository/io/helidon/build-tools
+          .m2/repository/**/*.*
+          !.m2/repository/io/helidon/build-tools/**
         enableCrossOsArchive: true
-        key: local-maven-${{ hashFiles('**/pom.xml') }}
+        # only hash top-level poms to keep it fast
+        key: local-maven-${{ hashFiles('*/pom.xml', 'pom.xml') }}
         restore-keys: |
           local-maven-
     - name: Cache local Maven repository (read-only)
       if: ${{ inputs.maven-cache == 'read-only' }}
-      uses: actions/cache/restore@v3.3.1
+      uses: actions/cache/restore@v4.0.2
       with:
         path: |
-          .m2/repository/**
-          !.m2/repository/io/helidon/build-tools
+          .m2/repository/**/*.*
+          !.m2/repository/io/helidon/build-tools/**
         enableCrossOsArchive: true
-        key: local-maven-${{ hashFiles('**/pom.xml') }}
+        key: local-maven-${{ hashFiles('*/pom.xml', 'pom.xml') }}
         restore-keys: |
           local-maven-
     - name: Build cache (read-write)
       if: ${{ inputs.build-cache == 'read-write' }}
-      uses: actions/cache@v3.3.1
+      uses: actions/cache@v4.0.2
       with:
         path: |
           ./**/target/**
@@ -157,7 +134,7 @@ runs:
           build-cache-${{ github.run_id }}-
     - name: Build cache (read-only)
       if: ${{ inputs.build-cache == 'read-only' }}
-      uses: actions/cache/restore@v3.3.1
+      uses: actions/cache/restore@v4.0.2
       with:
         path: |
           ./**/target/**
@@ -168,13 +145,6 @@ runs:
         restore-keys: |
           build-cache-${{ github.run_id }}-${{ github.run_attempt }}-
           build-cache-${{ github.run_id }}-
-    - name: Populate Maven cache
-      if: ${{ inputs.maven-cache == 'read-write' }}
-      run: |
-        mvn ${MAVEN_ARGS} -T 8 \
-          -Dmaven.repo.local=${{ github.workspace }}/.m2/repository \
-          dependency:go-offline
-      shell: bash
     - name: Exec
       env:
         GPG_PASSPHRASE: ${{ inputs.GPG_PASSPHRASE }}
@@ -183,26 +153,23 @@ runs:
         MAVEN_ARGS: |
           ${{ env.MAVEN_ARGS }}
           -Dmaven.repo.local=${{ github.workspace }}/.m2/repository
+          -Dcache.record=${{ inputs.build-cache == 'read-write' }}
       run: ${{ inputs.run }}
       shell: bash
-    - id: test-matrix
-      if: ${{ inputs.test-matrix != '' }}
-      run: ./.github/actions/common/matrix.sh '${{ inputs.test-matrix }}' >> "${GITHUB_OUTPUT}"
-      shell: bash
     - name: Archive test results
       # https://github.com/actions/upload-artifact/issues/240
-      if: ${{ inputs.archive-test-results == 'true' && runner.os != 'Windows' && always() }}
-      uses: actions/upload-artifact@v3.1.2
+      if: ${{ inputs.test-artifact-name != '' && runner.os != 'Windows' && always() }}
+      uses: actions/upload-artifact@v4
       with:
         if-no-files-found: 'ignore'
-        name: test-results
+        name: ${{ inputs.test-artifact-name }}
         path: |
           **/target/surefire-reports/*.txt
           **/target/failsafe-reports/*.txt
           **/target/it/**/*.log
     - name: Archive artifacts
       if: ${{ inputs.artifact-name != '' && inputs.artifact-path != ''  && always() }}
-      uses: actions/upload-artifact@v3.1.2
+      uses: actions/upload-artifact@v4
       with:
         if-no-files-found: 'ignore'
         name: ${{ inputs.artifact-name }}
diff --git a/.github/actions/common/matrix.sh b/.github/actions/common/matrix.sh
deleted file mode 100755
index 7d06efabe..000000000
--- a/.github/actions/common/matrix.sh
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2023 Oracle and/or its affiliates.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -o pipefail || true  # trace ERR through pipes
-set -o errtrace || true # trace ERR through commands and functions
-set -o errexit || true  # exit the script if any statement returns a non-true return value
-
-on_error(){
-  CODE="${?}" && \
-  set +x && \
-  printf "[ERROR] Error(code=%s) occurred at %s:%s command: %s\n" \
-      "${CODE}" "${BASH_SOURCE[0]}" "${LINENO}" "${BASH_COMMAND}"
-}
-trap on_error ERR
-
-shopt -s globstar
-shopt -s extglob
-
-ERROR_FILE=$(mktemp -t XXXmatrix)
-readonly ERROR_FILE
-
-#
-# Merge two JSON arrays.
-#
-# arg1: first array
-# arg2: second array
-#
-json_merge_arrays() {
-  jq '.[]' <<< "$(printf "%s\n%s" "${1}" "${2}")" | jq -s
-}
-
-#
-# Merge two JSON objects.
-#
-# arg1: first object
-# arg2: second object
-#
-json_merge_objects() {
-  jq -s '.[0] * .[1]' <<< "$(printf "%s\n%s" "${1}" "${2}")"
-}
-
-#
-# Get the value for a key in a JSON object.
-#
-# arg1: key
-# arg2: JSON object
-#
-json_map_get() {
-  jq -r --arg a "${1}" 'to_entries[] | select (.key == $a).value[]' <<< "${2}"
-}
-
-#
-# Get the keys in a JSON object.
-#
-# arg1: JSON object
-#
-json_keys() {
-  jq -r 'keys | .[]' <<< "${1}"
-}
-
-#
-# Expand the given glob expressions to match directories with pom.xml files.
-# Exclude directories that are nested under 'src'
-#
-# args: prefix expr...
-#
-list_modules() {
-  local prefix files
-  prefix="${1}"
-  shift
-  files=()
-  printf "## Resolving module expressions: %s\n" "${*}" >&2
-  for exp in "${@}" ; do
-    printf "## Resolving module expression: %s\n" "${exp}" >&2
-    for i in ${exp}/pom.xml ; do
-      if [ -f "${i}" ] && [[ ! "${i}" =~ "src/" ]] ; then
-        files+=("${prefix}${i%%/pom.xml}")
-      fi
-    done
-  done
-  if [ ${#files[*]} -eq 0 ] ; then
-    printf "## ERROR: Unresolved expressions: %s\n" "${*}" >&2
-    echo "${@}" >> "${ERROR_FILE}"
-    return 1
-  fi
-  IFS=","
-  printf "## Resolved expressions: %s, modules: %s\n" "${*}" "${files[*]}" >&2
-  echo "${files[*]}"
-}
-
-#
-# Print a JSON object for a group
-#
-# args: group prefix expr...
-#
-resolve_group() {
-  local group
-  group="${1}"
-  shift
-  echo -ne '
-  {
-      "group": "'"${group}"'",
-      "modules": "'"$(list_modules "${@}")"'"
-  }'
-}
-
-#
-# Print JSON objects for the groups.
-# Always add a 'misc' at the end that matches everything else
-#
-# arg1: JSON object E.g. '{ "group1": [ "dir1/**", "dir2/**" ], "group2": [ "dir3/**" ] }'
-#
-resolve_groups() {
-  local groups modules all_modules
-  all_modules=()
-  groups="$(jq '.groups // []' <<< "${1}")"
-  for group in $(json_keys "${groups}") ; do
-    readarray -t modules <<< "$(json_map_get "${group}" "${groups}")"
-    printf "## Resolving group: %s, expressions: %s\n" "${group}" "${modules[*]}" >&2
-    resolve_group "${group}" "" "${modules[@]}"
-    all_modules+=("${modules[@]}")
-  done
-  if [ ${#all_modules[@]} -gt 0 ] ; then
-      printf "## Resolving group: misc, expressions: %s\n" "${all_modules[2]}" >&2
-      resolve_group "misc" "!" "${all_modules[@]}"
-  fi
-}
-
-#
-# Generate the 'matrix' output
-#
-# arg1: JSON object E.g. '{ "group1": [ "dir1/**", "dir2/**" ], "group2": [ "dir3/**" ] }'
-#
-main() {
-  local groups resolved_include extra_include merged_include resolved_matrix matrix errors
-
-  printf "## Processing JSON: \n%s\n" "$(jq <<< "${1}")" >&2
-  resolved_include="$(resolve_groups "${1}" | jq -s)"
-
-  readarray -t errors < "${ERROR_FILE}"
-  if [ ${#errors[*]} -ne 0 ] ; then
-    printf "## ERROR: Unresolved expressions: %s\n" "${errors[*]}" >&2
-    exit 1
-  fi
-
-  printf "## Resolved include JSON: \n%s\n" "$(jq <<< "${resolved_include}")" >&2
-
-  extra_include="$(jq '.include // []' <<< "${1}")"
-  extra_matrix="$(jq 'del(.groups, .group, .include)' <<< "${1}")"
-  printf "## Additional include JSON: \n%s\n" "${extra_include}" >&2
-  printf "## Additional matrix JSON: \n%s\n" "${extra_matrix}" >&2
-
-  groups="$(jq '.group // []' <<< "${1}")"
-  if [ "${groups}" != "[]" ] ; then
-    merged_groups="$(json_merge_arrays "${groups}" '[ "misc" ]')"
-  else
-    merged_groups="[]"
-  fi
-
-  merged_include="$(json_merge_arrays "${resolved_include}" "${extra_include}")"
-  resolved_matrix="$(jq <<< '{
-    "group": '"${merged_groups}"',
-    "include": '"${merged_include}"'
-  }')"
-  matrix="$(json_merge_objects "${resolved_matrix}" "${extra_matrix}")"
-  printf "## Final matrix JSON: \n%s\n" "${matrix}" >&2
-
-  echo "matrix=$(jq -c <<< "${matrix}")"
-}
-
-if [ ${#@} -lt 0 ] ; then
-    error "Usage $(basename "${0}") JSON" >&2
-    exit 1
-fi
-
-main "${1}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f04b3fbdb..f99ca7466 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023 Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -40,11 +40,11 @@ jobs:
     outputs:
       tag: ${{ steps.create-tag.outputs.tag }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.SERVICE_ACCOUNT_TOKEN }}
       - name: Set up JDK
-        uses: actions/setup-java@v3.11.0
+        uses: actions/setup-java@v4.1.0
         with:
           distribution: ${{ env.JAVA_DISTRO }}
           java-version: ${{ env.JAVA_VERSION }}
@@ -61,7 +61,7 @@ jobs:
     timeout-minutes: 30
     environment: release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ needs.create-tag.outputs.tag }}
       - uses: ./.github/actions/common
@@ -70,4 +70,6 @@ jobs:
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
           MAVEN_SETTINGS: ${{ secrets.MAVEN_SETTINGS }}
           build-cache: read-only
+          artifact-name: io-helidon-build-tools-artifacts-${{ github.ref_name }}
+          artifact-path: target/nexus-staging/
           run: etc/scripts/release.sh release_build
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index e4732911a..18c92c48c 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023 Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -35,9 +35,10 @@ env:
     -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
     -Dmaven.wagon.http.retryHandler.count=3
     -Djdk.toolchain.version=${JAVA_VERSION}
+    -Dcache.enabled=true
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: "${{ github.workflow }}-${{ github.ref }}"
   cancel-in-progress: true
 
 jobs:
@@ -45,7 +46,7 @@ jobs:
     timeout-minutes: 5
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
           fetch-depth: 0
@@ -56,7 +57,7 @@ jobs:
     timeout-minutes: 5
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
       - uses: ./.github/actions/common
@@ -66,19 +67,18 @@ jobs:
     timeout-minutes: 5
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
       - uses: ./.github/actions/common
         with:
+          maven-cache: none
           run: etc/scripts/shellcheck.sh
   build:
     timeout-minutes: 15
     runs-on: ubuntu-20.04
-    outputs:
-      test-matrix: ${{ steps.build.outputs.test-matrix }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
       - id: build
@@ -86,47 +86,40 @@ jobs:
         with:
           build-cache: read-write
           maven-cache: read-write
-          artifact-name: helidon-cli
+          artifact-name: helidon-cli-dist
           artifact-path: cli/impl/target/helidon-cli.zip
           run: |
-            mvn ${MAVEN_ARGS} -T 8 \
+            mvn --version
+            mvn ${MAVEN_ARGS} build-cache:go-offline
+            mvn ${MAVEN_ARGS} -T8 \
+              -Dorg.slf4j.simpleLogger.showThreadName=true \
               -DskipTests \
-              -Pbuild-cache \
+              -P tests \
               install
-          test-matrix: |
-            {
-              "os": [ "ubuntu-20.04", "windows-2022" ],
-              "group": [ "cli", "cli-functional", "archetype", "linker" ],
-              "include": [
-                { "os": "ubuntu-20.04", "platform": "linux" },
-                { "os": "windows-2022", "platform": "windows" }
-              ],
-              "groups": {
-                "cli": [ "cli/**!(test)", "maven-plugins/*cli*" ],
-                "cli-functional": [ "cli/tests/**" ],
-                "archetype": [ "archetype/**", "maven-plugins/*archetype*" ],
-                "linker": [ "linker/**" ]
-              }
-            }
   tests:
     needs: build
     timeout-minutes: 15
     strategy:
-      matrix: ${{ fromJSON(needs.build.outputs.test-matrix) }}
+      matrix:
+        os: [ ubuntu-20.04, windows-2022 ]
+        moduleSet: [ cli, cli-functional, archetype, linker, others ]
+        include:
+          - { os: ubuntu-20.04, platform: linux }
+          - { os: windows-2022, platform: windows }
     runs-on: ${{ matrix.os }}
-    name: tests/${{ matrix.group }}-${{ matrix.platform }}
+    name: tests/${{ matrix.moduleSet }}-${{ matrix.platform }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
       - uses: ./.github/actions/common
         with:
           build-cache: read-only
-          archive-test-results: true
+          test-artifact-name: tests-${{ matrix.moduleSet }}
           run: |
             mvn ${MAVEN_ARGS} \
-              -pl ${{ matrix.modules }} \
-              -Pbuild-cache \
+              -DreactorRule=tests \
+              -DmoduleSet=${{ matrix.moduleSet }} \
               -Dsurefire.reportNameSuffix=${{ matrix.platform }} \
               verify
   spotbugs:
@@ -134,7 +127,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
       - uses: ./.github/actions/common
@@ -150,7 +143,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
       - uses: ./.github/actions/common
@@ -161,12 +154,12 @@ jobs:
               -DskipTests \
               -Pjavadoc,build-cache \
               package
-  vscode-extension:
+  vscode-ext:
     needs: build
     timeout-minutes: 15
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
       - uses: ./.github/actions/common
@@ -176,7 +169,7 @@ jobs:
             mvn ${MAVEN_ARGS} \
               -pl ide-support/vscode-extension \
               -DskipTests \
-              -Pvscode \
+              -P vscode \
               install
   cli:
     needs: build
@@ -185,25 +178,21 @@ jobs:
       matrix:
         os: [ ubuntu-20.04, windows-2022, macos-12 ]
         include:
-          - os: ubuntu-20.04
-            platform: linux-amd64
-          - os: windows-2022
-            platform: windows-amd64
-            file-ext: .exe
-          - os: macos-12
-            platform: darwin-amd64
+          - { os: ubuntu-20.04, platform: linux-amd64 }
+          - { os: windows-2022, platform: windows-amd64, file-ext: .exe }
+          - { os: macos-12, platform: darwin-amd64 }
     runs-on: ${{ matrix.os }}
     name: cli/${{ matrix.platform }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
       - uses: ./.github/actions/common
         with:
           build-cache: read-only
           native-image: true
-          archive-test-results: true
-          artifact-name: helidon-cli
+          test-artifact-name: helidon-cli-smoketest-${{ matrix.platform }}
+          artifact-name: helidon-cli-bin-${{ matrix.platform }}
           artifact-path: cli/impl/target/helidon-cli-${{ matrix.platform }}${{ matrix.file-ext }}
           run: |
             # build the executable
@@ -221,4 +210,30 @@ jobs:
               -Dnative.image.name=helidon-cli-${{ matrix.platform }} \
               -Dsurefire.reportNameSuffix=native-image-${{ matrix.platform }} \
               -Dtest=CliFunctionalV2Test#*Native* \
+              -P tests \
               test
+  cli-binaries:
+    runs-on: ubuntu-20.04
+    needs: [ build, cli ]
+    name: cli/binaries
+    steps:
+      - uses: actions/upload-artifact/merge@v4
+        with:
+          name: helidon-cli
+          pattern: "helidon-cli-{bin-*,dist}"
+  test-results:
+    runs-on: ubuntu-20.04
+    needs: [ tests, cli ]
+    name: tests/results
+    steps:
+      - uses: actions/upload-artifact/merge@v4
+        with:
+          name: test-results
+          pattern: "*test*"
+  gate:
+    runs-on: ubuntu-20.04
+    needs: [ copyright, checkstyle, shellcheck, spotbugs, javadoc, vscode-ext, cli-binaries, test-results ]
+    steps:
+      - shell: bash
+        run: |
+          echo OK
diff --git a/.mvn/cache-config.xml b/.mvn/cache-config.xml
new file mode 100644
index 000000000..16f399115
--- /dev/null
+++ b/.mvn/cache-config.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<cacheConfig>
+    <enabled>false</enabled>
+    <lifecycleConfig>
+        <project glob="**/*">
+            <projectFilesExcludes>
+                <exclude>.*/**</exclude>
+                <exclude>etc/**</exclude>
+                <exclude>**/vscode-extension/**</exclude>
+            </projectFilesExcludes>
+        </project>
+    </lifecycleConfig>
+    <reactorRules>
+        <reactorRule name="tests">
+            <profiles>
+                <profile>tests</profile>
+            </profiles>
+            <moduleSets>
+                <moduleSet name="cli">
+                    <includes>
+                        <include>cli/**</include>
+                        <include>maven-plugins/*cli*</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/tests/**</exclude>
+                    </excludes>
+                </moduleSet>
+                <moduleSet name="cli-functional">
+                    <includes>
+                        <include>cli/tests/**</include>
+                    </includes>
+                </moduleSet>
+                <moduleSet name="archetype">
+                    <includes>
+                        <include>archetype/**</include>
+                        <include>maven-plugins/*archetype*</include>
+                    </includes>
+                </moduleSet>
+                <moduleSet name="linker">
+                    <includes>
+                        <include>linker/**</include>
+                    </includes>
+                </moduleSet>
+                <moduleSet name="others">
+                    <includes>
+                        <include>**/*</include>
+                    </includes>
+                </moduleSet>
+            </moduleSets>
+        </reactorRule>
+    </reactorRules>
+</cacheConfig>
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 000000000..42289a5a3
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.1.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.1.0 https://maven.apache.org/xsd/core-extensions-1.1.0.xsd">
+    <extension>
+        <groupId>io.helidon.build-tools</groupId>
+        <artifactId>helidon-build-cache-maven-extension</artifactId>
+        <version>4.0.7</version>
+    </extension>
+</extensions>
diff --git a/cli/codegen/pom.xml b/cli/codegen/pom.xml
index 0444f45d1..ec1503db6 100644
--- a/cli/codegen/pom.xml
+++ b/cli/codegen/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2020, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -56,6 +56,14 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>META-INF/services/com.sun.source.util.Plugin</exclude>
+                </excludes>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -71,26 +79,14 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
-                    <execution>
-                        <id>default-resources</id>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/resources</directory>
-                                    <excludes>
-                                        <exclude>META-INF/services/com.sun.source.util.Plugin</exclude>
-                                    </excludes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
                     <execution>
                         <id>javac-plugin</id>
                         <goals>
-                            <goal>resources</goal>
+                            <goal>copy-resources</goal>
                         </goals>
                         <phase>process-classes</phase>
                         <configuration>
+                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/main/resources</directory>
diff --git a/cli/common/src/main/java/io/helidon/build/cli/common/SemVer.java b/cli/common/src/main/java/io/helidon/build/cli/common/SemVer.java
index daa814e61..1ade6f6b2 100644
--- a/cli/common/src/main/java/io/helidon/build/cli/common/SemVer.java
+++ b/cli/common/src/main/java/io/helidon/build/cli/common/SemVer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2023, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ static List<String> latestMajorVersions(List<ArchetypesData.Version> versions) {
                 Maps.mapEntry(groups, Strings::isValid, VersionRange::higherOrEqual, MavenVersion::toMavenVersion);
 
         // the latest of each group
-        Collection<MavenVersion> latest = Maps.mapEntryValue(ranges, entry->entry.getKey().resolveLatest(entry.getValue()))
+        Collection<MavenVersion> latest = Maps.mapEntryValue(ranges, entry-> entry.getKey().resolveLatest(entry.getValue()))
                                               .values();
         List<ArchetypesData.Version> latestVersions = versions.stream()
                 .filter(version -> latest.contains(version.toMavenVersion()))
diff --git a/cli/impl/pom.xml b/cli/impl/pom.xml
index 617e04f20..0a49641e2 100644
--- a/cli/impl/pom.xml
+++ b/cli/impl/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2020, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -189,9 +189,9 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <reuseForks>false</reuseForks>
-                    <systemProperties>
+                    <systemPropertyVariables>
                         <helidon.test.version>2.5.0</helidon.test.version>
-                    </systemProperties>
+                    </systemPropertyVariables>
                     <environmentVariables>
                         <formatEnv>%s</formatEnv>
                     </environmentVariables>
diff --git a/cli/pom.xml b/cli/pom.xml
index b2af1e6c6..c6b6c8c3f 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2020, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -34,7 +34,14 @@
         <module>common</module>
         <module>impl</module>
         <module>plugin</module>
-        <module>tests</module>
     </modules>
 
+    <profiles>
+        <profile>
+            <id>tests</id>
+            <modules>
+                <module>tests</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>
diff --git a/cli/tests/functional/src/test/java/io/helidon/build/cli/tests/CliDistributionTest.java b/cli/tests/functional/src/test/java/io/helidon/build/cli/tests/CliDistributionTest.java
index fb8372770..9f1d32d3a 100644
--- a/cli/tests/functional/src/test/java/io/helidon/build/cli/tests/CliDistributionTest.java
+++ b/cli/tests/functional/src/test/java/io/helidon/build/cli/tests/CliDistributionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2023, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@
 /**
  * CLI distribution tests.
  */
-public class CliDistributionTest {
+class CliDistributionTest {
 
     private static final Logger LOGGER = Logger.getLogger(CliDistributionTest.class.getName());
     private static Path distDir;
diff --git a/cli/tests/functional/src/test/java/io/helidon/build/cli/tests/CliFunctionalV2Test.java b/cli/tests/functional/src/test/java/io/helidon/build/cli/tests/CliFunctionalV2Test.java
index 962488765..00bb01077 100644
--- a/cli/tests/functional/src/test/java/io/helidon/build/cli/tests/CliFunctionalV2Test.java
+++ b/cli/tests/functional/src/test/java/io/helidon/build/cli/tests/CliFunctionalV2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@
 import static org.hamcrest.Matchers.hasItem;
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class CliFunctionalV2Test {
+class CliFunctionalV2Test {
 
     private static String expectedOutput;
     private static Path workDir;
@@ -74,7 +74,7 @@ static void setup() throws IOException {
     }
 
     @AfterEach
-    public void cleanUp() throws IOException {
+    void cleanUp() throws IOException {
         deleteDirectoryContent(workDir);
     }
 
@@ -175,7 +175,7 @@ void interactiveTestNativeImage() {
     }
 
     @Test
-    public void testDebug() {
+    void testDebug() {
         String output = buildArchetype("testDebug")
                 .addOption("batch")
                 .addOption("debug")
@@ -186,7 +186,7 @@ public void testDebug() {
     }
 
     @Test
-    public void testVerbose() {
+    void testVerbose() {
         String output = cliProcessBuilder()
                 .workDirectory(workDir)
                 .addOption("verbose")
@@ -198,7 +198,7 @@ public void testVerbose() {
     }
 
     @Test
-    public void IncorrectFlavorTest() {
+    void incorrectFlavorTest() {
         try {
             cliProcessBuilder()
                     .addArg("flavor", "wrongFlavor")
@@ -214,7 +214,7 @@ public void IncorrectFlavorTest() {
     }
 
     @Test
-    public void IncorrectHelidonVersionTest() {
+    void incorrectHelidonVersionTest() {
         try {
             cliProcessBuilder()
                     .addArg("version", "0.0.0")
@@ -229,7 +229,7 @@ public void IncorrectHelidonVersionTest() {
     }
 
     @Test
-    public void testVersionCommand() {
+    void testVersionCommand() {
         String output = cliProcessBuilder().version().start(5, TimeUnit.MINUTES);
 
         assertThat(output, containsString(FunctionalUtils.CLI_VERSION));
@@ -237,7 +237,7 @@ public void testVersionCommand() {
     }
 
     @Test
-    public void testCacheContent() {
+    void testCacheContent() {
         cliProcessBuilder().info().addOption("reset").start(5, TimeUnit.MINUTES);
         Path cacheDir = Config.userConfig().cacheDir();
         List<String> content = SourcePath.scan(cacheDir).stream()
@@ -273,44 +273,44 @@ static class Builder {
         private ExecutionMode mode = ExecutionMode.CLASSPATH;
         private final List<String> args = new LinkedList<>();
 
-        public Builder executable(Path executable) {
+        Builder executable(Path executable) {
             this.executable = executable;
             this.mode = ExecutionMode.EXECUTABLE;
             return this;
         }
 
-        public Builder input(File input) {
+        Builder input(File input) {
             this.input = input;
             return this;
         }
 
-        public Builder init() {
+        Builder init() {
             args.add(0, "init");
             return this;
         }
 
-        public Builder info() {
+        Builder info() {
             args.add(0, "info");
             return this;
         }
 
-        public Builder version() {
+        Builder version() {
             args.add(0, "version");
             return this;
         }
 
-        public Builder workDirectory(Path workDir) {
+        Builder workDirectory(Path workDir) {
             this.workDir = workDir;
             return this;
         }
 
-        public Builder addArg(String option, String value) {
+        Builder addArg(String option, String value) {
             addOption(option);
             addValue(value);
             return this;
         }
 
-        public Builder addOption(String option) {
+        Builder addOption(String option) {
             Strings.requireValid(option, "Provided option is not valid");
             if (!option.startsWith("--")) {
                 option = String.format("--%s", option);
@@ -323,7 +323,7 @@ private void addValue(String value) {
             args.add(Strings.requireValid(value, "Provided value is not valid"));
         }
 
-        public ProcessMonitor start() {
+        ProcessMonitor start() {
             List<String> cmdArgs = new LinkedList<>();
             if (mode == ExecutionMode.CLASSPATH) {
                 cmdArgs.addAll(FunctionalUtils.buildJavaCommand());
@@ -354,7 +354,7 @@ public ProcessMonitor start() {
             }
         }
 
-        public String start(long timeout, TimeUnit unit) {
+        String start(long timeout, TimeUnit unit) {
             try {
                 String output = start().waitForCompletion(timeout, unit).output();
                 return AnsiTextStyle.strip(output);
@@ -365,7 +365,7 @@ public String start(long timeout, TimeUnit unit) {
             }
         }
 
-        public void execute(Path wd) {
+        void execute(Path wd) {
             args.add("--project");
             args.add(wd.toString());
             addResetUrl(args);
diff --git a/cli/tests/functional/src/test/java/io/helidon/build/cli/tests/CliMavenTest.java b/cli/tests/functional/src/test/java/io/helidon/build/cli/tests/CliMavenTest.java
index 7056a160c..cdd18cf2f 100644
--- a/cli/tests/functional/src/test/java/io/helidon/build/cli/tests/CliMavenTest.java
+++ b/cli/tests/functional/src/test/java/io/helidon/build/cli/tests/CliMavenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,11 +29,11 @@
 
 import io.helidon.build.cli.impl.Helidon;
 import io.helidon.build.common.FileUtils;
+import io.helidon.build.common.PrintStreams;
 import io.helidon.build.common.ProcessMonitor;
 import io.helidon.build.common.maven.MavenCommand;
 import io.helidon.build.common.maven.MavenVersion;
 import io.helidon.webclient.WebClient;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -45,13 +45,14 @@
 import static io.helidon.build.cli.tests.FunctionalUtils.downloadMavenDist;
 import static io.helidon.build.cli.tests.FunctionalUtils.setMavenLocalRepoUrl;
 import static io.helidon.build.cli.tests.FunctionalUtils.validateSeProject;
+import static io.helidon.build.cli.tests.FunctionalUtils.waitForApplication;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @SuppressWarnings("SpellCheckingInspection")
-public class CliMavenTest {
+class CliMavenTest {
 
     private static final List<String> MAVEN_VERSIONS = List.of("3.1.1", "3.2.5", "3.8.1", "3.8.2", "3.8.4");
     private static final MavenVersion MAVEN_3_2_5 = MavenVersion.toMavenVersion("3.2.5");
@@ -65,7 +66,7 @@ public class CliMavenTest {
     private static Path workDir;
     private static Path mavenDirectory;
 
-    private ByteArrayOutputStream stream;
+    private final StringBuilder capturedOutput = new StringBuilder();
 
     @BeforeAll
     static void setUp() throws IOException {
@@ -80,12 +81,7 @@ static void setUp() throws IOException {
     @BeforeEach
     void refresh() throws IOException {
         workDir = Files.createTempDirectory("generated");
-        stream = new ByteArrayOutputStream();
-    }
-
-    @AfterEach
-    void close() throws IOException {
-        stream.close();
+        capturedOutput.setLength(0);
     }
 
     @SuppressWarnings("unused")
@@ -95,11 +91,11 @@ static Stream<String> getValidMavenVersions() {
     }
 
     @Test
-    public void testWrongMavenVersion() throws Exception {
+    void testWrongMavenVersion() throws Exception {
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
         Path mavenBinDir = mavenDirectory.resolve("apache-maven-3.1.1/bin");
         List<String> mavenArgs = List.of(
-                "archetype:generate",
+                "org.apache.maven.plugins:maven-archetype-plugin:3.2.1:generate",
                 "-DinteractiveMode=false",
                 "-DarchetypeGroupId=io.helidon.archetypes",
                 "-DarchetypeArtifactId=helidon",
@@ -125,39 +121,39 @@ public void testWrongMavenVersion() throws Exception {
 
     @ParameterizedTest
     @MethodSource("getValidMavenVersions")
-    public void testMissingValues(String version) {
+    void testMissingValues(String version) {
         missingArtifactGroupPackageValues(version);
         missingFlavorValue(version);
         missingBaseValue(version);
     }
 
     @Test //Issue#499 https://github.com/oracle/helidon-build-tools/issues/499
-    public void catchDevLoopRecompilationFails() {
+    void catchDevLoopRecompilationFails() {
         String output = runIssue499("2.2.3");
         assertThat(output, containsString("COMPILATION ERROR :"));
     }
 
     @Test //Issue#499 https://github.com/oracle/helidon-build-tools/issues/499
-    public void testDevLoopRecompilationFails() {
+    void testDevLoopRecompilationFails() {
         runIssue499(CLI_VERSION);
     }
 
     @Test //Issue#259 https://github.com/oracle/helidon-build-tools/issues/259
-    public void catchingJansiIssue() {
+    void catchingJansiIssue() {
         String output = runCliMavenPluginJansiIssue("2.1.0");
         assertThat(output, containsString("org/fusesource/jansi/AnsiOutputStream"));
         assertThat(output, containsString("BUILD FAILURE"));
     }
 
     @Test //Issue#259 https://github.com/oracle/helidon-build-tools/issues/259
-    public void testFixJansiIssue() {
+    void testFixJansiIssue() {
         String output = runCliMavenPluginJansiIssue(CLI_VERSION);
         assertThat(output, containsString("BUILD SUCCESS"));
         validateSeProject(workDir);
     }
 
     @Test
-    public void testCliMavenPlugin() throws Exception {
+    void testCliMavenPlugin() throws Exception {
         int port = FunctionalUtils.getAvailablePort();
         Path mavenBinDir = mavenDirectory.resolve("apache-maven-3.8.4/bin");
         generateBareSe(workDir, "testCliMavenPlugin");
@@ -165,16 +161,17 @@ public void testCliMavenPlugin() throws Exception {
         ProcessMonitor monitor = MavenCommand.builder()
                 .executable(mavenBinDir.resolve(FunctionalUtils.getMvnExecutable(mavenBinDir)))
                 .directory(workDir.resolve("bare-se"))
-                .stdOut(new PrintStream(stream))
+                .stdOut(PrintStreams.delegate(PrintStreams.STDOUT, this::record))
+                .stdOut(PrintStreams.delegate(PrintStreams.STDERR, this::record))
                 .addOptionalArgument(LOCAL_REPO_ARG)
                 .addArgument("-Ddev.appJvmArgs=-Dserver.port=" + port)
                 .addArgument("io.helidon.build-tools:helidon-cli-maven-plugin:" + CLI_VERSION + ":dev")
                 .build()
                 .start();
-        FunctionalUtils.waitForApplication(port, stream);
+        waitForApplication(port, capturedOutput::toString);
         monitor.stop();
 
-        assertThat(stream.toString(), containsString("BUILD SUCCESS"));
+        assertThat(capturedOutput.toString(), containsString("BUILD SUCCESS"));
     }
 
     private String runCliMavenPluginJansiIssue(String pluginVersion) {
@@ -185,23 +182,23 @@ private String runCliMavenPluginJansiIssue(String pluginVersion) {
             ProcessMonitor monitor = MavenCommand.builder()
                     .executable(mavenBinDir.resolve(FunctionalUtils.getMvnExecutable(mavenBinDir)))
                     .directory(workDir.resolve("bare-se"))
-                    .stdOut(new PrintStream(stream))
-                    .stdErr(new PrintStream(stream))
+                    .stdOut(PrintStreams.delegate(PrintStreams.STDOUT, this::record))
+                    .stdOut(PrintStreams.delegate(PrintStreams.STDERR, this::record))
                     .addArgument("-B")
                     .addOptionalArgument(LOCAL_REPO_ARG)
                     .addArgument("-Ddev.appJvmArgs=-Dserver.port=" + port)
                     .addArgument("io.helidon.build-tools:helidon-cli-maven-plugin:" + pluginVersion + ":dev")
                     .build()
                     .start();
-            FunctionalUtils.waitForApplication(port, stream);
+            waitForApplication(port, capturedOutput::toString);
             monitor.stop();
-            return stream.toString();
+            return capturedOutput.toString();
         } catch (Exception e) {
-            return stream.toString();
+            return capturedOutput.toString();
         }
     }
 
-    public String runIssue499(String pluginVersion) {
+    String runIssue499(String pluginVersion) {
         int port = FunctionalUtils.getAvailablePort();
         Path mavenBinDir = mavenDirectory.resolve("apache-maven-3.8.2/bin");
         generateBareSe(workDir, "runIssue499-" + pluginVersion);
@@ -209,14 +206,14 @@ public String runIssue499(String pluginVersion) {
             ProcessMonitor monitor = MavenCommand.builder()
                     .executable(mavenBinDir.resolve(FunctionalUtils.getMvnExecutable(mavenBinDir)))
                     .directory(workDir.resolve("bare-se"))
-                    .stdOut(new PrintStream(stream))
-                    .stdErr(new PrintStream(stream))
+                    .stdOut(PrintStreams.delegate(PrintStreams.STDOUT, this::record))
+                    .stdOut(PrintStreams.delegate(PrintStreams.STDERR, this::record))
                     .addOptionalArgument(LOCAL_REPO_ARG)
                     .addArgument("-Ddev.appJvmArgs=-Dserver.port=" + port)
                     .addArgument("io.helidon.build-tools:helidon-cli-maven-plugin:" + pluginVersion + ":dev")
                     .build()
                     .start();
-            FunctionalUtils.waitForApplication(port, stream);
+            waitForApplication(port, capturedOutput::toString);
 
             try (Stream<Path> paths = Files.walk(workDir)) {
                 paths.filter(p -> p.toString().endsWith("Main.java"))
@@ -232,7 +229,7 @@ public String runIssue499(String pluginVersion) {
                         });
             }
 
-            FunctionalUtils.waitForApplication(port, stream);
+            waitForApplication(port, capturedOutput::toString);
 
             WebClient.builder()
                     .baseUri("http://localhost:" + port + "/greet")
@@ -242,9 +239,9 @@ public String runIssue499(String pluginVersion) {
                     .toCompletableFuture().get();
 
             monitor.stop();
-            return stream.toString();
+            return capturedOutput.toString();
         } catch (Exception e) {
-            return stream.toString();
+            return capturedOutput.toString();
         }
     }
 
@@ -254,22 +251,22 @@ private void runMissingValueTest(List<String> args, String mavenVersion) throws
             MavenCommand.builder()
                     .executable(mavenBinDir.resolve(FunctionalUtils.getMvnExecutable(mavenBinDir)))
                     .directory(workDir)
-                    .stdOut(new PrintStream(stream))
-                    .stdErr(new PrintStream(stream))
+                    .stdOut(PrintStreams.delegate(PrintStreams.STDOUT, this::record))
+                    .stdOut(PrintStreams.delegate(PrintStreams.STDERR, this::record))
                     .addOptionalArgument(LOCAL_REPO_ARG)
                     .addArguments(args)
                     .build()
                     .start()
                     .waitForCompletion(10, TimeUnit.MINUTES);
         } catch (ProcessMonitor.ProcessFailedException e) {
-            throw new Exception(stream.toString());
+            throw new Exception(capturedOutput.toString());
         }
     }
 
     private void missingArtifactGroupPackageValues(String mavenVersion) {
         List<String> args = List.of(
                 "-B",
-                "archetype:generate",
+                "org.apache.maven.plugins:maven-archetype-plugin:3.2.1:generate",
                 "-DinteractiveMode=false",
                 "-DarchetypeGroupId=io.helidon.archetypes",
                 "-DarchetypeArtifactId=helidon",
@@ -284,7 +281,7 @@ private void missingArtifactGroupPackageValues(String mavenVersion) {
     private void missingFlavorValue(String mavenVersion) {
         List<String> args = List.of(
                 "-B",
-                "archetype:generate",
+                "org.apache.maven.plugins:maven-archetype-plugin:3.2.1:generate",
                 "-DinteractiveMode=false",
                 "-DarchetypeGroupId=io.helidon.archetypes",
                 "-DarchetypeArtifactId=helidon",
@@ -301,7 +298,7 @@ private void missingFlavorValue(String mavenVersion) {
     private void missingBaseValue(String mavenVersion) {
         List<String> args = List.of(
                 "-B",
-                "archetype:generate",
+                "org.apache.maven.plugins:maven-archetype-plugin:3.2.1:generate",
                 "-DinteractiveMode=false",
                 "-DarchetypeGroupId=io.helidon.archetypes",
                 "-DarchetypeArtifactId=helidon",
@@ -333,4 +330,11 @@ void generateBareSe(Path wd, String artifactId) {
         validateSeProject(wd);
     }
 
+    private void record(PrintStream stream, String str) {
+        String line = str + System.lineSeparator();
+        stream.print(str);
+        synchronized (capturedOutput) {
+            capturedOutput.append(line);
+        }
+    }
 }
diff --git a/cli/tests/functional/src/test/java/io/helidon/build/cli/tests/FunctionalUtils.java b/cli/tests/functional/src/test/java/io/helidon/build/cli/tests/FunctionalUtils.java
index 4512359de..dc780de7b 100644
--- a/cli/tests/functional/src/test/java/io/helidon/build/cli/tests/FunctionalUtils.java
+++ b/cli/tests/functional/src/test/java/io/helidon/build/cli/tests/FunctionalUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 import io.helidon.build.common.Proxies;
 import io.helidon.build.common.SourcePath;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -36,6 +35,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Supplier;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
@@ -43,7 +43,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-public class FunctionalUtils {
+class FunctionalUtils {
 
     private static final Logger LOGGER = Logger.getLogger(FunctionalUtils.class.getName());
     private static final String MAVEN_DIST_URL = "https://archive.apache.org/dist/maven/maven-3/%s/binaries/apache-maven-%s-bin.zip";
@@ -94,7 +94,7 @@ static void downloadFileFromUrl(Path destination, URL url) {
         }
     }
 
-    static void waitForApplication(int port, ByteArrayOutputStream os) throws Exception {
+    static void waitForApplication(int port, Supplier<String> output) throws Exception {
         long timeout = 60 * 1000;
         long now = System.currentTimeMillis();
         URL url = new URL("http://localhost:" + port + "/greet");
@@ -106,7 +106,7 @@ static void waitForApplication(int port, ByteArrayOutputStream os) throws Except
             if ((System.currentTimeMillis() - now) > timeout) {
                 throw new Exception(String.format("Application failed to start on port : %s\nProcess output:\n %s",
                         port,
-                        os.toString()));
+                        output.get()));
             }
             try {
                 conn = (HttpURLConnection) url.openConnection();
diff --git a/cli/tests/pom.xml b/cli/tests/pom.xml
index a73314bd7..876c21d96 100644
--- a/cli/tests/pom.xml
+++ b/cli/tests/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,30 +18,17 @@
 -->
 <project>
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>io.helidon.build-tools.cli</groupId>
         <artifactId>helidon-cli-project</artifactId>
         <version>3.0.0-SNAPSHOT</version>
     </parent>
-
     <groupId>io.helidon.build-tools.cli.tests</groupId>
     <artifactId>helidon-cli-tests</artifactId>
     <packaging>pom</packaging>
     <name>Helidon Command Line Interface Tests</name>
 
-    <profiles>
-        <profile>
-            <id>run-test</id>
-            <activation>
-                <property>
-                    <name>!skipTests</name>
-                </property>
-            </activation>
-            <modules>
-                <module>functional</module>
-            </modules>
-        </profile>
-    </profiles>
-
+    <modules>
+        <module>functional</module>
+    </modules>
 </project>
diff --git a/common/common/pom.xml b/common/common/pom.xml
index 2be09ff0f..2745480d4 100644
--- a/common/common/pom.xml
+++ b/common/common/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2021, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2021, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -32,14 +32,13 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/common/common/src/main/java/io/helidon/build/common/Maps.java b/common/common/src/main/java/io/helidon/build/common/Maps.java
index 75adae29c..28723e511 100644
--- a/common/common/src/main/java/io/helidon/build/common/Maps.java
+++ b/common/common/src/main/java/io/helidon/build/common/Maps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -434,7 +434,7 @@ public static <T, U, K, V> Map<K, List<V>> mapEntry(
         return map.entrySet().stream()
                   .filter(entry-> keyFilter.test(entry.getKey()))
                   .collect(Collectors.toMap(
-                          entry->keyMapper.apply(entry.getKey()),
-                          entry->entry.getValue().stream().map(valueMapper).collect(Collectors.toList())));
+                          entry-> keyMapper.apply(entry.getKey()),
+                          entry-> entry.getValue().stream().map(valueMapper).collect(Collectors.toList())));
     }
 }
diff --git a/common/test-utils/pom.xml b/common/test-utils/pom.xml
index 70606924c..30ae756ca 100644
--- a/common/test-utils/pom.xml
+++ b/common/test-utils/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2021, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2021, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -52,5 +52,9 @@
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-reporting</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/dev-loop/dev-loop/src/test/java/io/helidon/build/devloop/maven/MavenProjectConfigCollectorTestIT.java b/dev-loop/dev-loop/src/test/java/io/helidon/build/devloop/maven/MavenProjectConfigCollectorTestIT.java
index 134d643ec..839fda0d2 100644
--- a/dev-loop/dev-loop/src/test/java/io/helidon/build/devloop/maven/MavenProjectConfigCollectorTestIT.java
+++ b/dev-loop/dev-loop/src/test/java/io/helidon/build/devloop/maven/MavenProjectConfigCollectorTestIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,11 +20,11 @@
 import java.nio.file.Path;
 
 import io.helidon.build.cli.common.ProjectConfig;
+import io.helidon.build.common.FileUtils;
 import io.helidon.build.common.test.utils.ConfigurationParameterSource;
 import io.helidon.build.devloop.BuildExecutor;
 import io.helidon.build.devloop.TestMonitor;
 
-import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -41,7 +41,6 @@
 
 /**
  * Unit test for class {@link MavenProjectConfigCollector}.
- *
  * NOTE: This test requires that the snapshot jar is already built, so is disabled by default; to run:
  * <pre>
  *    mvn install -DskipTests && mvn test -Dtest=MavenProjectConfigCollectorTest
@@ -91,7 +90,7 @@ void testWithoutCompile(String basedir) throws Exception {
         final Path dotHelidonFile = projectDir.resolve(DOT_HELIDON);
 
         Files.deleteIfExists(dotHelidonFile);
-        FileUtils.touch(dotHelidonFile.toFile());
+        FileUtils.touch(dotHelidonFile);
         ProjectConfig config = ProjectConfig.projectConfig(projectDir);
         assertThat(config.keySet().isEmpty(), is(true));
 
@@ -113,7 +112,7 @@ void testWithCompile(String basedir) throws Exception {
         final Path dotHelidonFile = projectDir.resolve(DOT_HELIDON);
 
         Files.deleteIfExists(dotHelidonFile);
-        FileUtils.touch(dotHelidonFile.toFile());
+        FileUtils.touch(dotHelidonFile);
         ProjectConfig config = ProjectConfig.projectConfig(projectDir);
         assertThat(config.keySet().isEmpty(), is(true));
 
diff --git a/etc/copyright-exclude.txt b/etc/copyright-exclude.txt
index 6d0ab0ce4..1ad7383ef 100644
--- a/etc/copyright-exclude.txt
+++ b/etc/copyright-exclude.txt
@@ -6,6 +6,7 @@ LICENSE.txt
 3RD-PARTY-LICENSE.txt
 etc/copyright-exclude.txt
 etc/copyright.txt
+etc/dependency-check-suppression.xml
 etc/images/
 _plantuml-config.txt
 superagent.js
@@ -40,4 +41,4 @@ freemarker-implicit.ftl
 expected
 expected-config
 .helidon
-jvm.config
\ No newline at end of file
+jvm.config
diff --git a/etc/dependency-check-suppression.xml b/etc/dependency-check-suppression.xml
new file mode 100644
index 000000000..29dd8df11
--- /dev/null
+++ b/etc/dependency-check-suppression.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
+<!-- For information see https://jeremylong.github.io/DependencyCheck/general/suppression.html -->
+
+
+<!--
+    These are FPs.
+    See https://github.com/jeremylong/DependencyCheck/issues/5973
+-->
+    <suppress>
+        <packageUrl regex="true">^pkg:maven/org\.codehaus\.plexus/plexus\-(cipher|classworlds|component-annotations|interpolation|container-default|sec-dispatcher)@.*$</packageUrl>
+        <cve>CVE-2022-4244</cve>
+        <cve>CVE-2022-4245</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: plexus-java-1.1.1.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.codehaus\.plexus/plexus\-java@.*$</packageUrl>
+        <cve>CVE-2022-4244</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: plexus-java-1.1.1.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.codehaus\.plexus/plexus\-java@.*$</packageUrl>
+        <cve>CVE-2022-4245</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: plexus-velocity-1.2.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.codehaus\.plexus/plexus\-velocity@.*$</packageUrl>
+        <cve>CVE-2022-4244</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: plexus-velocity-1.2.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.codehaus\.plexus/plexus\-velocity@.*$</packageUrl>
+        <cve>CVE-2022-4245</cve>
+    </suppress>
+
+</suppressions>
diff --git a/etc/scripts/checkstyle.sh b/etc/scripts/checkstyle.sh
index 913576456..96ede1599 100755
--- a/etc/scripts/checkstyle.sh
+++ b/etc/scripts/checkstyle.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2018, 2023 Oracle and/or its affiliates.
+# Copyright (c) 2018, 2024 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -49,6 +49,9 @@ readonly  RESULT_FILE
 
 die(){ echo "${1}" ; exit 1 ;}
 
+# Remove cache
+rm -f "${WS_DIR}"/target/checkstyle-*
+
 # shellcheck disable=SC2086
 mvn ${MAVEN_ARGS} checkstyle:checkstyle-aggregate \
     -f "${WS_DIR}"/pom.xml \
diff --git a/etc/scripts/owasp-dependency-check.sh b/etc/scripts/owasp-dependency-check.sh
new file mode 100755
index 000000000..34e00014f
--- /dev/null
+++ b/etc/scripts/owasp-dependency-check.sh
@@ -0,0 +1,64 @@
+#!/bin/bash -e
+#
+# Copyright (c) 2020, 2024 Oracle and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+set -o pipefail || true  # trace ERR through pipes
+set -o errtrace || true # trace ERR through commands and functions
+set -o errexit || true  # exit the script if any statement returns a non-true return value
+
+# Path to this script
+if [ -h "${0}" ] ; then
+    SCRIPT_PATH="$(readlink "${0}")"
+else
+    # shellcheck disable=SC155
+    SCRIPT_PATH="${0}"
+fi
+readonly SCRIPT_PATH
+
+# Path to the root of the workspace
+# shellcheck disable=SC2046
+WS_DIR=$(cd $(dirname -- "${SCRIPT_PATH}") ; cd ../.. ; pwd -P)
+
+on_error(){
+    CODE="${?}" && \
+    set +x && \
+    printf "[ERROR] Error(code=%s) occurred at %s:%s command: %s\n" \
+        "${CODE}" "${BASH_SOURCE[0]}" "${LINENO}" "${BASH_COMMAND}"
+}
+trap on_error ERR
+
+RESULT_FILE=$(mktemp -t XXXdependency-check-result)
+readonly  RESULT_FILE
+
+die() { cat "${RESULT_FILE}" ; echo "Dependency report in ${WS_DIR}/target" ; echo "${1}" ; exit 1 ;}
+
+if [ "${PIPELINE}" = "true" ] ; then
+    # If in pipeline do a priming build before scan
+    # shellcheck disable=SC2086
+    mvn ${MAVEN_ARGS} -f "${WS_DIR}"/pom.xml clean install -DskipTests
+fi
+
+# Setting NVD_API_KEY is not required but improves behavior of NVD API throttling
+
+# shellcheck disable=SC2086
+mvn ${MAVEN_ARGS} -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN org.owasp:dependency-check-maven:aggregate \
+        -f "${WS_DIR}"/pom.xml \
+        -Dtop.parent.basedir="${WS_DIR}" \
+        -Dnvd-api-key="${NVD_API_KEY}" \
+        > "${RESULT_FILE}" || die "Error running the Maven command"
+
+grep -i "One or more dependencies were identified with known vulnerabilities" "${RESULT_FILE}" \
+    && die "CVE SCAN ERROR" || echo "CVE SCAN OK"
diff --git a/ide-support/lsp/helidon-lsp-maven-plugin/pom.xml b/ide-support/lsp/helidon-lsp-maven-plugin/pom.xml
index e161eb300..a00a72116 100644
--- a/ide-support/lsp/helidon-lsp-maven-plugin/pom.xml
+++ b/ide-support/lsp/helidon-lsp-maven-plugin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
@@ -52,6 +53,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/maven-plugins/enforcer-maven-plugin/src/main/java/io/helidon/build/maven/enforcer/inclusivenaming/InlusiveNamingConfig.java b/maven-plugins/enforcer-maven-plugin/src/main/java/io/helidon/build/maven/enforcer/inclusivenaming/InlusiveNamingConfig.java
index ae0143b76..bcb776418 100644
--- a/maven-plugins/enforcer-maven-plugin/src/main/java/io/helidon/build/maven/enforcer/inclusivenaming/InlusiveNamingConfig.java
+++ b/maven-plugins/enforcer-maven-plugin/src/main/java/io/helidon/build/maven/enforcer/inclusivenaming/InlusiveNamingConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2023, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,7 +64,7 @@ public class InlusiveNamingConfig {
     private XmlData[] additionalTerms;
 
     /**
-     * XML file equivalent to the inclusive naming JSON {@link https://inclusivenaming.org/word-lists/index.json}.
+     * XML file equivalent to the inclusive naming <a href="https://inclusivenaming.org/word-lists/index.json">JSON</a>.
      */
     @Parameter
     private File inclusiveNamingFile;
diff --git a/maven-plugins/helidon-archetype-maven-plugin/README.md b/maven-plugins/helidon-archetype-maven-plugin/README.md
index 2b9f88cdf..7a4237160 100644
--- a/maven-plugins/helidon-archetype-maven-plugin/README.md
+++ b/maven-plugins/helidon-archetype-maven-plugin/README.md
@@ -25,21 +25,21 @@ This goal binds to the `package` phase by default.
 ### General usage
 
 The plugin includes a custom packaging `helidon-archetype`. You need to declare the plugin as an extension to enable
- the use of the custom packaging.
+the use of the custom packaging.
 
 ```xml
 <project>
-    <!-- ... -->
-    <packaging>helidon-archetype</packaging>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>io.helidon.build-tools</groupId>
-                <artifactId>helidon-archetype-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
+ <!-- ... -->
+ <packaging>helidon-archetype</packaging>
+ <build>
+  <plugins>
+   <plugin>
+    <groupId>io.helidon.build-tools</groupId>
+    <artifactId>helidon-archetype-maven-plugin</artifactId>
+    <extensions>true</extensions>
+   </plugin>
+  </plugins>
+ </build>
 </project>
 ```
 
@@ -51,7 +51,8 @@ Maven goal to test Helidon archetypes.
 |--------------------------|---------|-------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------|
 | invokerEnvVars           | Map     | `{}`                                            | Invoker environment variables                                                                                              |
 | permutation              | String  | `null`                                          | Indices (comma separated) of the permutations to process                                                                   |
-| permutationStartIndex    | Integer | `1`                                             | Permutation start index (resume-from)                                                                                      |
+| permutationStartIndex    | Integer | `1`                                             | Permutation start index                                                                                                    |
+| permutationEndIndex      | Integer | `-1`                                            | Permutation end index                                                                                                      |
 | permutationsOnly         | boolean | `false`                                         | Whether to only generate input permutations                                                                                |
 | generatePermutations     | boolean | `true`                                          | Whether to auto-compute input permutations                                                                                 |
 | permutationFilters       | List    | `[]`                                            | Permutation filters to filter the computed permutations.                                                                   |
@@ -61,6 +62,7 @@ Maven goal to test Helidon archetypes.
 | externalDefaults         | boolean | `false`                                         | External defaults to use when generating archetypes                                                                        |
 | externalValues           | boolean | `false`                                         | External values to use when generating archetypes                                                                          |
 | testGoal                 | String  | `package`                                       | The goal to use when building archetypes.                                                                                  |
+| testProfiles             | List    | `[]`                                            | The profiles to use when building archetypes.                                                                              |
 | mavenArchetypeCompatible | boolean | `60`                                            | Indicate if the project should be generated with the maven-archetype-plugin or with the Helidon archetype engine directly. |
 | debug                    | boolean | `false`                                         | Whether to show debug statements in the build output                                                                       |
 | showVersion              | boolean | `false`                                         | flag to show the maven version used.                                                                                       |
@@ -69,4 +71,4 @@ Maven goal to test Helidon archetypes.
 | testProjectsDirectory    | File    | `${project.build.testOutputDirectory}/projects` | Directory of test projects                                                                                                 |
 | skip                     | boolean | `false`                                         | Skip the integration test                                                                                                  |
 
-The above parameters are mapped to user properties of the form `archetype.test.PROPERTY`, e.g. `-Darchetype.test.skip=true`.
\ No newline at end of file
+The above parameters are mapped to user properties of the form `archetype.test.PROPERTY`, e.g. `-Darchetype.test.skip=true`.
diff --git a/maven-plugins/helidon-archetype-maven-plugin/pom.xml b/maven-plugins/helidon-archetype-maven-plugin/pom.xml
index 0a7ac8a90..3acc4d8e5 100644
--- a/maven-plugins/helidon-archetype-maven-plugin/pom.xml
+++ b/maven-plugins/helidon-archetype-maven-plugin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2020, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -60,6 +60,36 @@
             <artifactId>maven-core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-util</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-model</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-artifact</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-settings</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-settings-builder</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-builder-support</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-archiver</artifactId>
diff --git a/maven-plugins/helidon-archetype-maven-plugin/src/it/projects/test1/src/main/archetype/files/pom.xml.mustache b/maven-plugins/helidon-archetype-maven-plugin/src/it/projects/test1/src/main/archetype/files/pom.xml.mustache
index f20ae8d8e..2c2615c8d 100644
--- a/maven-plugins/helidon-archetype-maven-plugin/src/it/projects/test1/src/main/archetype/files/pom.xml.mustache
+++ b/maven-plugins/helidon-archetype-maven-plugin/src/it/projects/test1/src/main/archetype/files/pom.xml.mustache
@@ -29,7 +29,18 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.release>11</maven.compiler.release>
     </properties>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.8.1</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 </project>
diff --git a/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/IntegrationTestMojo.java b/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/IntegrationTestMojo.java
index 8e3fec1f7..e8bed27c3 100644
--- a/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/IntegrationTestMojo.java
+++ b/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/IntegrationTestMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,6 +49,7 @@
 import io.helidon.build.common.ansi.AnsiConsoleInstaller;
 import io.helidon.build.maven.archetype.config.Validation;
 
+import org.apache.maven.RepositoryUtils;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -58,17 +59,17 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.artifact.ProjectArtifact;
 import org.apache.maven.shared.invoker.DefaultInvocationRequest;
 import org.apache.maven.shared.invoker.InvocationOutputHandler;
 import org.apache.maven.shared.invoker.InvocationRequest;
 import org.apache.maven.shared.invoker.InvocationResult;
 import org.apache.maven.shared.invoker.Invoker;
 import org.apache.maven.shared.invoker.MavenInvocationException;
-import org.apache.maven.shared.transfer.artifact.install.ArtifactInstallerException;
-import org.apache.maven.shared.transfer.project.NoFileAssignedException;
-import org.apache.maven.shared.transfer.project.install.ProjectInstaller;
-import org.apache.maven.shared.transfer.project.install.ProjectInstallerRequest;
 import org.codehaus.plexus.PlexusContainer;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.installation.InstallRequest;
+import org.eclipse.aether.installation.InstallationException;
 
 import static io.helidon.build.common.FileUtils.ensureDirectory;
 import static io.helidon.build.common.FileUtils.unique;
@@ -107,7 +108,6 @@ public class IntegrationTestMojo extends AbstractMojo {
      */
     @Parameter(defaultValue = "${session}", readonly = true, required = true)
     private MavenSession session;
-
     /**
      * Skip the integration test.
      */
@@ -119,7 +119,7 @@ public class IntegrationTestMojo extends AbstractMojo {
      * Directory of test projects.
      */
     @Parameter(property = "archetype.test.projectsDirectory", defaultValue = "${project.build.testOutputDirectory}/projects",
-            required = true)
+               required = true)
     private File testProjectsDirectory;
 
     /**
@@ -165,6 +165,12 @@ public class IntegrationTestMojo extends AbstractMojo {
     @Parameter(property = "archetype.test.testGoal", defaultValue = "package")
     private String testGoal;
 
+    /**
+     * The profiles to use when building archetypes.
+     */
+    @Parameter(property = "archetype.test.testProfiles")
+    private List<String> testProfiles = List.of();
+
     /**
      * External values to use when generating archetypes.
      */
@@ -219,6 +225,12 @@ public class IntegrationTestMojo extends AbstractMojo {
     @Parameter(property = "archetype.test.permutationStartIndex", defaultValue = "1")
     private int permutationStartIndex;
 
+    /**
+     * Permutations end index.
+     */
+    @Parameter(property = "archetype.test.permutationEndIndex", defaultValue = "-1")
+    private int permutationEndIndex;
+
     /**
      * Permutations to process.
      */
@@ -232,7 +244,7 @@ public class IntegrationTestMojo extends AbstractMojo {
     private Map<String, String> invokerEnvVars;
 
     @Component
-    private ProjectInstaller installer;
+    private RepositorySystem repoSystem;
 
     @Component
     private PluginContainerManager pluginContainerManager;
@@ -308,11 +320,11 @@ private List<Map<String, String>> permutations(Path archetypeFile) {
         try (FileSystem fileSystem = newFileSystem(archetypeFile, this.getClass().getClassLoader())) {
             Script script = ScriptLoader.load(fileSystem.getPath("main.xml"));
             InputPermutations.Builder builder = InputPermutations.builder()
-                                                       .script(script)
-                                                       .externalValues(externalValues)
-                                                       .externalDefaults(externalDefaults)
-                                                       .inputFilters(inputFilters)
-                                                       .permutationFilters(permutationFilters);
+                    .script(script)
+                    .externalValues(externalValues)
+                    .externalDefaults(externalDefaults)
+                    .inputFilters(inputFilters)
+                    .permutationFilters(permutationFilters);
             if (inputFiltersFile != null) {
                 builder.inputFilters(filtersFromFile(inputFiltersFile));
             }
@@ -350,14 +362,15 @@ private Map<Integer, Map<String, String>> filterPermutations() {
             Iterator<Map<String, String>> it = permutations.iterator();
             for (int i = 1; it.hasNext(); i++) {
                 Map<String, String> next = it.next();
-                if (i >= permutationStartIndex) {
+                if (i >= permutationStartIndex
+                    && (permutationEndIndex <= 0 || i <= permutationEndIndex)) {
                     perms.put(i, next);
                 }
             }
         } else {
             List<Integer> indices = Arrays.stream(permutation.split(","))
-                                          .map(Integer::valueOf)
-                                          .collect(Collectors.toList());
+                    .map(Integer::valueOf)
+                    .collect(Collectors.toList());
             Iterator<Map<String, String>> it = permutations.iterator();
             for (int i = 1; it.hasNext(); i++) {
                 Map<String, String> next = it.next();
@@ -381,7 +394,7 @@ private void processIntegrationTest(String testName,
         Path ourProjectDir = project.getFile().toPath();
         Path projectsDir = ourProjectDir.getParent().resolve("target/projects");
         ensureDirectory(projectsDir);
-        String projectName = props.getProperty("artifactId");
+        String projectName = props.getProperty("artifactId", "my-project");
         Path outputDir = unique(projectsDir, projectName);
         projectName = outputDir.getFileName().toString();
         props.setProperty("artifactId", projectName);
@@ -463,11 +476,11 @@ private void generate(Path archetypeFile, Properties props, Path outputDir) {
         try {
             FileSystem fileSystem = newFileSystem(archetypeFile, this.getClass().getClassLoader());
             ArchetypeEngineV2 engine = ArchetypeEngineV2.builder()
-                                                        .fileSystem(fileSystem)
-                                                        .inputResolver(new BatchInputResolver())
-                                                        .externalValues(Maps.fromProperties(props))
-                                                        .directorySupplier(n -> outputDir)
-                                                        .build();
+                    .fileSystem(fileSystem)
+                    .inputResolver(new BatchInputResolver())
+                    .externalValues(Maps.fromProperties(props))
+                    .directorySupplier(n -> outputDir)
+                    .build();
             engine.generate();
         } catch (IOException ex) {
             throw new UncheckedIOException(ex);
@@ -482,16 +495,18 @@ private void mavenCompatGenerate(String archetypeGroupId,
                                      Path basedir) throws MojoExecutionException {
 
         // pre-install the archetype JAR so that the post-generate script can resolve it
-        ProjectInstallerRequest projectInstallerRequest = new ProjectInstallerRequest().setProject(project);
         try {
-            installer.install(session.getProjectBuildingRequest(), projectInstallerRequest);
-        } catch (IOException | ArtifactInstallerException | NoFileAssignedException ex) {
-            throw new MojoExecutionException("Unable to pre-install archetype artifact", ex);
+            InstallRequest request = new InstallRequest();
+            request.addArtifact(RepositoryUtils.toArtifact(new ProjectArtifact(project)));
+            request.addArtifact(RepositoryUtils.toArtifact(project.getArtifact()));
+            repoSystem.install(session.getRepositorySession(), request);
+        } catch (InstallationException ex) {
+            throw new MojoExecutionException("Unable to pre-install project", ex);
         }
 
         PlexusContainer container = pluginContainerManager.create(MAVEN_ARCHETYPE_PLUGIN,
-                                                                  project.getRemotePluginRepositories(),
-                                                                  session.getRepositorySession());
+                project.getRemotePluginRepositories(),
+                session.getRepositorySession());
 
         Object[] args = new Object[] {
                 container,
@@ -509,10 +524,15 @@ private void mavenCompatGenerate(String archetypeGroupId,
     private void invokePostArchetypeGenerationGoals(File basedir) throws IOException, MojoExecutionException {
         FileLogger logger = setupBuildLogger(basedir);
 
-        getLog().info("Invoking post-archetype-generation goal: " + testGoal);
+        getLog().info(String.format("Invoking post-archetype-generation goal: %s, profiles: %s", testGoal, testProfiles));
+
+        File localRepo = session.getRepositorySession().getLocalRepository().getBasedir();
         InvocationRequest request = new DefaultInvocationRequest()
+                .setUserSettingsFile(session.getRequest().getUserSettingsFile())
+                .setLocalRepositoryDirectory(localRepo)
                 .setBaseDirectory(basedir)
-                .setGoals(List.of(testGoal))
+                .addArgs(List.of(testGoal))
+                .setProfiles(testProfiles)
                 .setBatchMode(true)
                 .setShowErrors(true)
                 .setDebug(debug)
diff --git a/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/MavenArchetypeGenerator.java b/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/MavenArchetypeGenerator.java
index be27757c3..13942f44f 100644
--- a/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/MavenArchetypeGenerator.java
+++ b/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/MavenArchetypeGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2023, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,7 +67,7 @@ static void generate(PlexusContainer container,
                 .setPackage(properties.getProperty("package"))
                 .setOutputDirectory(basedir.toString())
                 .setProperties(properties)
-                .setProjectBuildingRequest(session.getProjectBuildingRequest());
+                .setRepositorySession(session.getRepositorySession());
 
         ArchetypeGenerationResult result = new ArchetypeGenerationResult();
 
diff --git a/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/MustacheHelper.java b/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/MustacheHelper.java
index 0f565b433..7e8624e2e 100644
--- a/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/MustacheHelper.java
+++ b/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/MustacheHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 import java.io.Writer;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
@@ -41,6 +40,9 @@
 import com.github.mustachejava.reflect.SimpleObjectHandler;
 import com.github.mustachejava.util.Wrapper;
 
+import static java.nio.file.StandardOpenOption.CREATE;
+import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
+
 /**
  * Mustache helper.
  */
@@ -88,8 +90,7 @@ public static void renderMustacheTemplate(InputStream is, String name, Path targ
 
         Mustache m = MUSTACHE_FACTORY.compile(new InputStreamReader(is), name);
         Files.createDirectories(target.getParent());
-        try (Writer writer = Files.newBufferedWriter(target, StandardOpenOption.CREATE,
-                StandardOpenOption.TRUNCATE_EXISTING)) {
+        try (Writer writer = Files.newBufferedWriter(target, CREATE, TRUNCATE_EXISTING)) {
             m.execute(writer, scope).flush();
         }
     }
@@ -122,7 +123,6 @@ public String toString() {
         }
     }
 
-
     private static final class ObjectHandler extends SimpleObjectHandler {
 
         @Override
@@ -141,10 +141,10 @@ public Wrapper find(String name, List<Object> ignore) {
                         result = ((Map<?, ?>) scope).get(name);
                     } else if (scope instanceof Map.Entry) {
                         switch (name) {
-                            case("key"):
+                            case "key":
                                 result = ((Map.Entry<?, ?>) scope).getKey();
                                 break;
-                            case("value"):
+                            case "value":
                                 result = ((Map.Entry<?, ?>) scope).getValue();
                                 break;
                             default:
diff --git a/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/PluginContainerManager.java b/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/PluginContainerManager.java
index 1236efc59..eb1cd0ccb 100644
--- a/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/PluginContainerManager.java
+++ b/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/PluginContainerManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2023, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,8 @@
  */
 package io.helidon.build.maven.archetype;
 
-import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Deque;
 import java.util.List;
 import java.util.Map;
 
@@ -33,6 +31,7 @@
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.PlexusContainerException;
 import org.codehaus.plexus.classworlds.realm.ClassRealm;
+import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.configuration.PlexusConfigurationException;
@@ -74,15 +73,11 @@ public PlexusContainer create(Plugin plugin, List<RemoteRepository> repos, Repos
             containerConfiguration.setClassPathScanning(PlexusConstants.SCANNING_INDEX);
             containerConfiguration.setRealm(classRealm);
             PlexusContainer container = new DefaultPlexusContainer(containerConfiguration);
-            Deque<ClassRealm> stack = new ArrayDeque<>();
-            stack.push(classRealm);
-            while (!stack.isEmpty()) {
-                ClassRealm realm = stack.pop();
-                container.discoverComponents(realm);
-                realm.getImportRealms().forEach(stack::push);
-            }
+            container.discoverComponents(classRealm);
+            container.discoverComponents(classRealm.getWorld().getRealm("maven.api"));
+            container.discoverComponents(classRealm.getWorld().getRealm("plexus.core"));
             return container;
-        } catch (PlexusContainerException | PlexusConfigurationException ex) {
+        } catch (PlexusContainerException | PlexusConfigurationException | NoSuchRealmException ex) {
             throw new RuntimeException(ex);
         }
     }
diff --git a/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/postgenerate/Aether.java b/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/postgenerate/Aether.java
index 621b2da6e..5efef31f6 100644
--- a/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/postgenerate/Aether.java
+++ b/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/postgenerate/Aether.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,17 +18,11 @@
 import java.io.File;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.cli.transfer.Slf4jMavenTransferListener;
 import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
-import org.apache.maven.settings.Mirror;
-import org.apache.maven.settings.Settings;
-import org.apache.maven.settings.building.DefaultSettingsBuilder;
-import org.apache.maven.settings.building.DefaultSettingsBuilderFactory;
-import org.apache.maven.settings.building.DefaultSettingsBuildingRequest;
-import org.apache.maven.settings.building.SettingsBuildingException;
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.providers.http.HttpWagon;
 import org.codehaus.plexus.DefaultPlexusContainer;
@@ -36,18 +30,13 @@
 import org.codehaus.plexus.PlexusContainerException;
 import org.codehaus.plexus.component.composition.CycleDetectedInComponentGraphException;
 import org.codehaus.plexus.component.repository.ComponentDescriptor;
-import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.collection.CollectRequest;
 import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
 import org.eclipse.aether.graph.Dependency;
 import org.eclipse.aether.internal.transport.wagon.PlexusWagonProvider;
-import org.eclipse.aether.repository.Authentication;
-import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.repository.MirrorSelector;
-import org.eclipse.aether.repository.Proxy;
-import org.eclipse.aether.repository.ProxySelector;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.repository.RepositoryPolicy;
 import org.eclipse.aether.resolution.ArtifactRequest;
@@ -59,9 +48,6 @@
 import org.eclipse.aether.transport.wagon.WagonProvider;
 import org.eclipse.aether.transport.wagon.WagonTransporterFactory;
 import org.eclipse.aether.util.filter.DependencyFilterUtils;
-import org.eclipse.aether.util.repository.AuthenticationBuilder;
-import org.eclipse.aether.util.repository.DefaultMirrorSelector;
-import org.eclipse.aether.util.repository.DefaultProxySelector;
 
 import static java.util.stream.Collectors.toList;
 
@@ -70,123 +56,42 @@
  */
 final class Aether {
 
-    private final Settings settings;
     private final List<RemoteRepository> remoteRepos;
     private final RepositorySystem repoSystem;
-    private final DefaultRepositorySystemSession repoSession;
+    private final RepositorySystemSession repoSession;
 
     /**
-     * Create a new Aether instance.
+     * Create a new instance.
      *
-     * @param localRepoDir        local repository directory
-     * @param remoteArtifactRepos remote artifacts repositories
-     * @param activeProfiles      list of profile ids to activate
+     * @param repoSession repository system session
+     * @param remoteRepos remote repositories
      */
-    @SuppressWarnings("unchecked")
-    Aether(File localRepoDir, List<ArtifactRepository> remoteArtifactRepos, List<String> activeProfiles) {
-        try {
-            PlexusContainer container = new DefaultPlexusContainer();
-            container.addComponentDescriptor(plexusDesc(Wagon.class, "http", HttpWagon.class));
-            container.addComponentDescriptor(plexusDesc(Wagon.class, "https", HttpWagon.class));
-            repoSystem = MavenRepositorySystemUtils
-                    .newServiceLocator()
-                    .setServices(WagonProvider.class, new PlexusWagonProvider(container))
-                    .addService(TransporterFactory.class, WagonTransporterFactory.class)
-                    .addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class)
-                    .getService(RepositorySystem.class);
-            settings = settings();
-            if (activeProfiles != null) {
-                settings.setActiveProfiles(activeProfiles);
-            }
-            repoSession = MavenRepositorySystemUtils.newSession();
-            repoSession.setTransferListener(new Slf4jMavenTransferListener());
-            repoSession.setProxySelector(proxySelector());
-            repoSession.setMirrorSelector(mirrorSelector());
-            repoSession.setLocalRepositoryManager(repoSystem
-                    .newLocalRepositoryManager(repoSession, new LocalRepository(localRepoDir)));
-            remoteRepos = remoteArtifactRepos.stream().map(this::remoteRepo).collect(toList());
-        } catch (CycleDetectedInComponentGraphException | PlexusContainerException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-
-    @SuppressWarnings({"unchecked", "rawtypes", "SameParameterValue"})
-    private static ComponentDescriptor plexusDesc(Class<?> roleClass, String roleHint, Class<?> implClass) {
-        ComponentDescriptor desc = new ComponentDescriptor();
-        desc.setRoleClass(roleClass);
-        desc.setRoleHint(roleHint);
-        desc.setImplementationClass(implClass);
-        desc.setInstantiationStrategy("per-lookup");
-        return desc;
-    }
-
-    private static Settings settings() {
-        DefaultSettingsBuilder builder = new DefaultSettingsBuilderFactory().newInstance();
-        DefaultSettingsBuildingRequest request = new DefaultSettingsBuildingRequest();
-        String userSettings = System.getProperty("org.apache.maven.user-settings");
-        if (userSettings == null) {
-            File userHome = new File(System.getProperty("user.home")).getAbsoluteFile();
-            request.setUserSettingsFile(new File(userHome, "/.m2/settings.xml"));
-        } else {
-            request.setUserSettingsFile(new File(userSettings));
-        }
-        String globalSettings = System.getProperty("org.apache.maven.global-settings");
-        if (globalSettings != null) {
-            request.setGlobalSettingsFile(new File(globalSettings));
-        }
-        try {
-            return builder.build(request).getEffectiveSettings();
-        } catch (SettingsBuildingException ex) {
-            throw new IllegalStateException(ex);
-        }
+    Aether(RepositorySystemSession repoSession, List<RemoteRepository> remoteRepos) {
+        this.repoSession = repoSession;
+        this.repoSystem = repoSystem();
+        this.remoteRepos = remoteRepos;
     }
 
-    private MirrorSelector mirrorSelector() {
-        DefaultMirrorSelector selector = new DefaultMirrorSelector();
-        List<Mirror> mirrors = settings.getMirrors();
-        if (mirrors != null) {
-            for (Mirror mirror : mirrors) {
-                selector.add(mirror.getId(), mirror.getUrl(), mirror.getLayout(), false,
-                        mirror.getMirrorOf(), mirror.getMirrorOfLayouts());
-            }
-        }
-        return selector;
-    }
-
-    private ProxySelector proxySelector() {
-        org.apache.maven.settings.Proxy proxyDef = settings.getActiveProxy();
-        if (proxyDef != null) {
-            Authentication auth = null;
-            if (proxyDef.getUsername() != null) {
-                auth = new AuthenticationBuilder().addString(proxyDef.getUsername(), proxyDef.getPassword()).build();
-            }
-            DefaultProxySelector selector = new DefaultProxySelector();
-            Proxy proxy = new Proxy(proxyDef.getProtocol(), proxyDef.getHost(), proxyDef.getPort(), auth);
-            selector.add(proxy, proxyDef.getNonProxyHosts());
-            return selector;
-        }
-        return null;
+    /**
+     * Create a new instance.
+     *
+     * @param repoSession   repository system session
+     * @param artifactRepos remote artifact repositories
+     * @param ignored       used for pseudo overload of {@code artifactRepos}
+     */
+    Aether(RepositorySystemSession repoSession, List<ArtifactRepository> artifactRepos, boolean ignored) {
+        this.repoSession = repoSession;
+        this.repoSystem = repoSystem();
+        this.remoteRepos = artifactRepos.stream().map(this::remoteRepo).collect(Collectors.toList());
     }
 
-    private RemoteRepository remoteRepo(ArtifactRepository aRepo) {
-        RemoteRepository.Builder builder = new RemoteRepository.Builder(aRepo.getId(), aRepo.getLayout().getId(),
-                aRepo.getUrl());
-        ArtifactRepositoryPolicy releases = aRepo.getReleases();
-        if (releases != null) {
-            RepositoryPolicy releasePolicy = new RepositoryPolicy(releases.isEnabled(), releases.getUpdatePolicy(),
-                    releases.getChecksumPolicy());
-            builder.setReleasePolicy(releasePolicy);
-        }
-        ArtifactRepositoryPolicy snapshots = aRepo.getSnapshots();
-        if (snapshots != null) {
-            RepositoryPolicy snapshotPolicy = new RepositoryPolicy(snapshots.isEnabled(), snapshots.getUpdatePolicy(),
-                    snapshots.getChecksumPolicy());
-            builder.setSnapshotPolicy(snapshotPolicy);
-        }
-        RemoteRepository repository = builder.build();
-        return new RemoteRepository.Builder(repository)
-                .setProxy(repoSession.getProxySelector().getProxy(repository))
-                .build();
+    /**
+     * Get the repository system session.
+     *
+     * @return RepositorySystemSession
+     */
+    RepositorySystemSession repoSession() {
+        return repoSession;
     }
 
     /**
@@ -247,4 +152,52 @@ List<File> resolveDependencies(List<String> coords) {
         }
         return files;
     }
+
+    private RemoteRepository remoteRepo(ArtifactRepository repo) {
+        RemoteRepository.Builder builder = new RemoteRepository.Builder(repo.getId(), repo.getLayout().getId(),
+                repo.getUrl());
+        ArtifactRepositoryPolicy releases = repo.getReleases();
+        if (releases != null) {
+            RepositoryPolicy releasePolicy = new RepositoryPolicy(releases.isEnabled(), releases.getUpdatePolicy(),
+                    releases.getChecksumPolicy());
+            builder.setReleasePolicy(releasePolicy);
+        }
+        ArtifactRepositoryPolicy snapshots = repo.getSnapshots();
+        if (snapshots != null) {
+            RepositoryPolicy snapshotPolicy = new RepositoryPolicy(snapshots.isEnabled(), snapshots.getUpdatePolicy(),
+                    snapshots.getChecksumPolicy());
+            builder.setSnapshotPolicy(snapshotPolicy);
+        }
+        RemoteRepository repository = builder.build();
+        return new RemoteRepository.Builder(repository)
+                .setProxy(repoSession.getProxySelector().getProxy(repository))
+                .build();
+    }
+
+    @SuppressWarnings({"unchecked", "rawtypes", "SameParameterValue"})
+    private static ComponentDescriptor plexusDesc(Class<?> roleClass, String roleHint, Class<?> implClass) {
+        ComponentDescriptor desc = new ComponentDescriptor();
+        desc.setRoleClass(roleClass);
+        desc.setRoleHint(roleHint);
+        desc.setImplementationClass(implClass);
+        desc.setInstantiationStrategy("per-lookup");
+        return desc;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static RepositorySystem repoSystem() {
+        try {
+            PlexusContainer container = new DefaultPlexusContainer();
+            container.addComponentDescriptor(plexusDesc(Wagon.class, "http", HttpWagon.class));
+            container.addComponentDescriptor(plexusDesc(Wagon.class, "https", HttpWagon.class));
+            return MavenRepositorySystemUtils
+                    .newServiceLocator()
+                    .setServices(WagonProvider.class, new PlexusWagonProvider(container))
+                    .addService(TransporterFactory.class, WagonTransporterFactory.class)
+                    .addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class)
+                    .getService(RepositorySystem.class);
+        } catch (CycleDetectedInComponentGraphException | PlexusContainerException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
 }
diff --git a/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/postgenerate/EngineFacade.java b/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/postgenerate/EngineFacade.java
index b540836a3..64467ee1e 100644
--- a/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/postgenerate/EngineFacade.java
+++ b/maven-plugins/helidon-archetype-maven-plugin/src/main/java/io/helidon/build/maven/archetype/postgenerate/EngineFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -30,12 +31,14 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Properties;
 
 import org.apache.maven.archetype.ArchetypeGenerationRequest;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.versioning.ComparableVersion;
 import org.apache.maven.project.ProjectBuildingRequest;
+import org.eclipse.aether.RepositorySystemSession;
 
 import static java.util.Collections.emptyMap;
 
@@ -52,44 +55,6 @@ private EngineFacade() {
 
     private static final String MAVEN_CORE_POM_PROPERTIES = "META-INF/maven/org.apache.maven/maven-core/pom.properties";
 
-    private static String getMavenVersion() {
-        // see org.apache.maven.rtinfo.internal.DefaultRuntimeInformation
-        Properties props = new Properties();
-        try {
-            props.load(EngineFacade.class.getClassLoader().getResourceAsStream(MAVEN_CORE_POM_PROPERTIES));
-        } catch (IOException ex) {
-            throw new UncheckedIOException(ex);
-        }
-        String version = props.getProperty("version", "").trim();
-        return version.startsWith("${") ? "" : version;
-    }
-
-    private static void checkMavenVersion() {
-        String mavenVersion = getMavenVersion();
-        ComparableVersion minMavenVersion = new ComparableVersion("3.2.5");
-        if (!mavenVersion.isEmpty() && new ComparableVersion(mavenVersion).compareTo(minMavenVersion) < 0) {
-            throw new IllegalStateException("Requires Maven >= 3.2.5");
-        }
-    }
-
-    private static void checkJavaVersion() {
-        try {
-            // using reflection to run on Java 8
-            Method versionMethod = Runtime.class.getMethod("version");
-            Runtime runtime = Runtime.getRuntime();
-            Object version = versionMethod.invoke(runtime);
-            Method featureMethod = version.getClass().getMethod("feature");
-            Object feature = featureMethod.invoke(version);
-            if (feature instanceof Integer && (int) feature < 11) {
-                throw new IllegalStateException();
-            }
-        } catch (NoSuchMethodException | IllegalStateException ex) {
-            throw new IllegalStateException("Requires Java >= 11");
-        } catch (Throwable ex) {
-            throw new IllegalStateException("Unable to verify Java version", ex);
-        }
-    }
-
     /**
      * Generate a project.
      *
@@ -101,10 +66,22 @@ public static void generate(ArchetypeGenerationRequest request, List<String> dep
         checkMavenVersion();
         checkJavaVersion();
 
-        ProjectBuildingRequest mavenRequest = request.getProjectBuildingRequest();
-        File localRepo = mavenRequest.getRepositorySession().getLocalRepository().getBasedir();
-        List<ArtifactRepository> remoteRepos = mavenRequest.getRemoteRepositories();
-        Aether aether = new Aether(localRepo, remoteRepos, mavenRequest.getActiveProfileIds());
+        Aether aether = EngineFacade.<RepositorySystemSession>invoke(request, "getRepositorySession")
+                // archetype-common >= 3.3.0
+                .map(repoSession -> new Aether(repoSession, request.getRemoteArtifactRepositories()))
+                // archetype-common < 3.3.0
+                .orElseGet(() -> {
+                    ProjectBuildingRequest pbr = EngineFacade.<ProjectBuildingRequest>invoke(request, "getProjectBuildingRequest")
+                            .orElseThrow(() -> new IllegalStateException("Unable to get project building request"));
+                    RepositorySystemSession repoSession = EngineFacade.<RepositorySystemSession>invoke(pbr,
+                                    "getRepositorySession")
+                            .orElseThrow(() -> new IllegalStateException("Unable to get repository system session"));
+                    List<ArtifactRepository> artifactRepos = EngineFacade.<List<ArtifactRepository>>invoke(request,
+                                    "getRemoteArtifactRepositories")
+                            .orElseThrow(() -> new IllegalStateException("Unable to get artifact repositories"));
+                    return new Aether(repoSession, artifactRepos, true);
+                });
+        File localRepo = aether.repoSession().getLocalRepository().getBasedir();
 
         // enable mvn:// URL support
         System.setProperty(MAVEN_URL_REPO_PROPERTY, localRepo.getAbsolutePath());
@@ -125,8 +102,6 @@ public static void generate(ArchetypeGenerationRequest request, List<String> dep
         Properties archetypeProps = request.getProperties();
         Map<String, String> props = new HashMap<>();
         archetypeProps.stringPropertyNames().forEach(k -> props.put(k, archetypeProps.getProperty(k)));
-        Properties userProps = request.getProjectBuildingRequest().getUserProperties();
-        userProps.stringPropertyNames().forEach(k -> props.putIfAbsent(k, userProps.getProperty(k)));
 
         // resolve the archetype JAR from the local repository
         File archetypeFile = aether.resolveArtifact(request.getArchetypeGroupId(), request.getArchetypeArtifactId(),
@@ -142,4 +117,54 @@ public static void generate(ArchetypeGenerationRequest request, List<String> dep
             throw new IllegalStateException(ioe);
         }
     }
+
+    private static String getMavenVersion() {
+        // see org.apache.maven.rtinfo.internal.DefaultRuntimeInformation
+        Properties props = new Properties();
+        try {
+            props.load(EngineFacade.class.getClassLoader().getResourceAsStream(MAVEN_CORE_POM_PROPERTIES));
+        } catch (IOException ex) {
+            throw new UncheckedIOException(ex);
+        }
+        String version = props.getProperty("version", "").trim();
+        return version.startsWith("${") ? "" : version;
+    }
+
+    private static void checkMavenVersion() {
+        String mavenVersion = getMavenVersion();
+        ComparableVersion minMavenVersion = new ComparableVersion("3.2.5");
+        if (!mavenVersion.isEmpty() && new ComparableVersion(mavenVersion).compareTo(minMavenVersion) < 0) {
+            throw new IllegalStateException("Requires Maven >= 3.2.5");
+        }
+    }
+
+    private static void checkJavaVersion() {
+        try {
+            // using reflection to run on Java 8
+            Method versionMethod = Runtime.class.getMethod("version");
+            Runtime runtime = Runtime.getRuntime();
+            Object version = versionMethod.invoke(runtime);
+            Method featureMethod = version.getClass().getMethod("feature");
+            Object feature = featureMethod.invoke(version);
+            if (feature instanceof Integer && (int) feature < 11) {
+                throw new IllegalStateException();
+            }
+        } catch (NoSuchMethodException | IllegalStateException ex) {
+            throw new IllegalStateException("Requires Java >= 11");
+        } catch (Throwable ex) {
+            throw new IllegalStateException("Unable to verify Java version", ex);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <T> Optional<T> invoke(Object object, String methodName) {
+        try {
+            Method method =  object.getClass().getMethod(methodName);
+            return Optional.ofNullable((T) method.invoke(object));
+        } catch (NoSuchMethodException ex) {
+            return Optional.empty();
+        } catch (IllegalAccessException | InvocationTargetException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
 }
diff --git a/maven-plugins/helidon-cli-maven-plugin/pom.xml b/maven-plugins/helidon-cli-maven-plugin/pom.xml
index 3f828db40..50c5812a3 100644
--- a/maven-plugins/helidon-cli-maven-plugin/pom.xml
+++ b/maven-plugins/helidon-cli-maven-plugin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -66,6 +66,11 @@
             <artifactId>maven-core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-model</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.sonatype.plexus</groupId>
             <artifactId>plexus-build-api</artifactId>
@@ -140,9 +145,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <systemProperties>
+                    <systemPropertyVariables>
                         <version>${project.version}</version>
-                    </systemProperties>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/maven-plugins/services-maven-plugin/etc/spotbugs/exclude.xml b/maven-plugins/services-maven-plugin/etc/spotbugs/exclude.xml
index 6866d8c11..bd88fb9dd 100644
--- a/maven-plugins/services-maven-plugin/etc/spotbugs/exclude.xml
+++ b/maven-plugins/services-maven-plugin/etc/spotbugs/exclude.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022 Oracle and/or its affiliates.
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 
     <Match>
         <!-- vulnerable to XML External Entity attacks -->
-        <Class name="io.helidon.build.maven.services.HelpMojo"/>
+        <Class name="io.helidon.build_tools.helidon_services_plugin.HelpMojo"/>
         <Bug pattern="XXE_DOCUMENT"/>
     </Match>
 
diff --git a/maven-plugins/sitegen-maven-plugin/README.md b/maven-plugins/sitegen-maven-plugin/README.md
index f678f7e25..63bb2c60e 100644
--- a/maven-plugins/sitegen-maven-plugin/README.md
+++ b/maven-plugins/sitegen-maven-plugin/README.md
@@ -47,37 +47,17 @@ Creates the site archive.
 The parameter `siteArchiveSkip` is mapped to a user property:
  `sitegen.siteArchiveSkip`.
 
-## Goal: `preprocess-adoc`
+## Goal: `serve`
 
-Pre-includes included text specified by AsciiDoc `include::` directives into
- an `.adoc` file, adding AsciiDoc comments to track where each snippet of
- included content is in the updated file and where it came from.
+Serve the site.
 
 ### Optional Parameters
 
-| Property        | Type    | Default<br/>Value    | Description                                                    |
-|-----------------|---------|----------------------|----------------------------------------------------------------|
-| inputDirectory  | File    | `${project.basedir}` | Directory containing the files to be processed                 |
-| outputDirectory | File    | `${project.basedir}` | Directory where the reformatted `.adoc` file should be written |
-| checkPreprocess | Boolean | `false`              | Check that the input and output files are the same             |
-| includes        | List    | []                   | List of files to include                                       |
-| exclude         | List    | []                   | List of files to exclude                                       |
-
-All parameters are mapped to user properties of the form `sitegen.PROPERTY`.
-
-## Goal: `naturalize-adoc`
-
-Converts a preprocessed `.adoc` file back into natural form with conventional
- `include::` directives.
-
-### Optional Parameters
-
-| Property        | Type | Default<br/>Value    | Description                                                    |
-|-----------------|------|----------------------|----------------------------------------------------------------|
-| inputDirectory  | File | `${project.basedir}` | Directory containing the files to be processed                 |
-| outputDirectory | File | `${project.basedir}` | Directory where the reformatted `.adoc` file should be written |
-| includes        | List | []                   | List of files to include                                       |
-| exclude         | List | []                   | List of files to exclude                                       |
+| Property            | Type    | Default<br/>Value                 | Description                                              |
+|---------------------|---------|-----------------------------------|----------------------------------------------------------|
+| siteOutputDirectory | File    | `${project.build.directory}/site` | Directory containing the generate site files to archive. |
+| sitePort            | int     | 8080                              | TCP port to use.                                         |
+| siteServeSkip       | Boolean | `false`                           | Skip this goal execution                                 |
 
 All parameters are mapped to user properties of the form `sitegen.PROPERTY`.
 
diff --git a/maven-plugins/sitegen-maven-plugin/pom.xml b/maven-plugins/sitegen-maven-plugin/pom.xml
index 63f93f416..d8d90b023 100644
--- a/maven-plugins/sitegen-maven-plugin/pom.xml
+++ b/maven-plugins/sitegen-maven-plugin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -60,7 +60,6 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-archiver</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -73,16 +72,28 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.maven.shared</groupId>
-            <artifactId>maven-filtering</artifactId>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-model</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-settings</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.maven.doxia</groupId>
-            <artifactId>doxia-site-renderer</artifactId>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-settings-builder</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-site-plugin</artifactId>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-builder-support</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.shared</groupId>
+            <artifactId>maven-filtering</artifactId>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
@@ -124,6 +135,7 @@
         <dependency>
             <groupId>com.github.wumpz</groupId>
             <artifactId>diffutils</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.helidon.build-tools.common</groupId>
diff --git a/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/Config.java b/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/Config.java
index 2416f6dff..2c66c3f3f 100644
--- a/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/Config.java
+++ b/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/Config.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 import io.helidon.build.common.FileUtils;
 import io.helidon.build.common.SubstitutionVariables;
 
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
 
@@ -303,8 +304,8 @@ public static Config create(Path path, Map<String, String> properties) {
      * @return new instance
      */
     public static Config create(Reader reader, Map<String, String> properties) {
-        Yaml yaml = new Yaml(new SafeConstructor());
-        return create(yaml.loadAs(reader, Object.class), properties);
+        Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
+        return create((Object) yaml.loadAs(reader, Object.class), properties);
     }
 
     private static final Set<Class<?>> PRIMITIVE_BOXED =
diff --git a/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/maven/AbstractAsciiDocMojo.java b/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/maven/AbstractAsciiDocMojo.java
deleted file mode 100644
index 556f058c2..000000000
--- a/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/maven/AbstractAsciiDocMojo.java
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * Copyright (c) 2019, 2023 Oracle and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.helidon.build.maven.sitegen.maven;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.PathMatcher;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import io.helidon.build.common.Maps;
-import io.helidon.build.common.maven.plugin.PlexusLoggerHolder;
-import io.helidon.build.maven.sitegen.asciidoctor.AsciidocExtensionRegistry;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-import org.asciidoctor.Asciidoctor;
-import org.asciidoctor.Attributes;
-import org.asciidoctor.Options;
-import org.asciidoctor.OptionsBuilder;
-import org.asciidoctor.SafeMode;
-import org.asciidoctor.ast.Document;
-import org.asciidoctor.log.LogHandler;
-import org.asciidoctor.log.LogRecord;
-
-import static io.helidon.build.maven.sitegen.maven.Constants.PROPERTY_PREFIX;
-
-/**
- * Processes AsciiDoc files to convert them between "natural" format (with
- * standard AsciiDoc {@code include::} includes) and "preprocessed" format, (with
- * comments identifying included text and the text pre-included.
- * <p>
- * The "preprocessed" format renders nicely on GitHub (because GitHub AsciiDoc
- * rendering does not yet support {@code include::}). The "natural" format is
- * more convenient for developers to edit because it uses the familiar AsciiDoc
- * {@code include::} syntax.
- * <p>
- * This class contains the behavior common between the two separate mojos
- * ({@link PreprocessAsciiDocMojo} and {@link NaturalizeAsciiDocMojo}).
- * <table>
- * <caption>Settings common to both goals</caption>
- * <tr>
- * <th>Property</th>
- * <th>Usage</th>
- * </tr>
- *
- * <tr>
- * <td>inputDirectory</td>
- * <td>directory containing the files to be processed</td>
- * </tr>
- *
- * <tr>
- * <td>outputDirectory</td>
- * <td>where the reformatted .adoc file should be written</td>
- * </tr>
- *
- * <tr>
- * <td>includes</td>
- * <td>glob expressions for .adoc files to process</td>
- * </tr>
- *
- * <tr>
- * <td>excludes</td>
- * <td>glob expressions for .adoc files to skip</td>
- * </tr>
- *
- * </table>
- */
-public abstract class AbstractAsciiDocMojo extends AbstractMojo {
-
-    private static final String DEFAULT_SRC_DIR = "${project.basedir}";
-    private static final String JRUBY_DEBUG_PROPERTY_NAME = "jruby.cli.verbose";
-    private static final boolean WINDOWS = System.getProperty("os.name").toLowerCase().contains("win");
-
-    @Component
-    @SuppressWarnings("unused")
-    private PlexusLoggerHolder plexusLogHolder;
-
-    @Parameter(defaultValue = "${project}", readonly = true)
-    private MavenProject project;
-
-    @Parameter(property = PROPERTY_PREFIX + "inputDirectory",
-            defaultValue = DEFAULT_SRC_DIR,
-            required = true)
-    private File inputDirectory;
-
-    /**
-     * Where the pre-included file should be stored; not stored if
-     * not specified.
-     */
-    @Parameter(property = PROPERTY_PREFIX + "outputDirectory",
-            defaultValue = "${project.basedir}")
-    private File outputDirectory;
-
-    /**
-     * List of files to include.
-     */
-    @Parameter(property = PROPERTY_PREFIX + "includes",
-            required = true,
-            defaultValue = "README.adoc")
-    private String[] includes;
-
-    /**
-     * List of files to exclude.
-     */
-    @Parameter(property = PROPERTY_PREFIX + "excludes")
-    private String[] excludes;
-
-    /**
-     * @return the Maven project for this mojo
-     */
-    public MavenProject project() {
-        return project;
-    }
-
-    @Override
-    public void execute() throws MojoExecutionException, MojoFailureException {
-        validateParams(inputDirectory, includes);
-
-        // enable jruby verbose mode on debugging
-        final String previousJRubyCliVerboseValue = System.getProperty(JRUBY_DEBUG_PROPERTY_NAME);
-        if (getLog().isDebugEnabled()) {
-            System.setProperty(JRUBY_DEBUG_PROPERTY_NAME, "true");
-        }
-
-        AtomicBoolean isPrelim = new AtomicBoolean();
-        Asciidoctor asciiDoctor = createAsciiDoctor("simple", isPrelim);
-        try {
-            for (Path p : inputs(inputDirectory.toPath(), includes, excludes)) {
-                processFile(asciiDoctor, inputDirectory.toPath(), p, isPrelim);
-            }
-        } catch (IOException ex) {
-            throw new MojoExecutionException("Error collecting inputs", ex);
-        } finally {
-            if (getLog().isDebugEnabled()) {
-                if (previousJRubyCliVerboseValue == null) {
-                    System.clearProperty(JRUBY_DEBUG_PROPERTY_NAME);
-                } else {
-                    System.setProperty(JRUBY_DEBUG_PROPERTY_NAME, previousJRubyCliVerboseValue);
-                }
-            }
-        }
-    }
-
-    /**
-     * Computes paths to be processed as inputs, based on an input directory
-     * and glob-style include and exclude expressions identifying paths within
-     * that input directory.
-     *
-     * @param inputDirectory the directory within which to search for files
-     * @param includes       glob-style include expressions
-     * @param excludes       glob-style exclude expressions
-     * @return Paths within the input directory tree that match the includes and
-     * are not ruled out by the excludes
-     * @throws IOException in case of errors matching candidate paths
-     */
-    static Collection<Path> inputs(Path inputDirectory, String[] includes, String[] excludes) throws IOException {
-        return Files.find(inputDirectory, Integer.MAX_VALUE, (path, attrs) ->
-                            matches(path, pathMatchers(inputDirectory, includes))
-                                    && !matches(path, pathMatchers(inputDirectory, excludes)))
-                    .collect(Collectors.toSet());
-    }
-
-    /**
-     * @return output type produced by the mojo
-     */
-    abstract String outputType();
-
-    /**
-     * Performs any work needed after the file has been processed.
-     *
-     * @param adocFilePath path to the AsciiDoc input file
-     * @param outputPath   path to the AsciiDoc output file
-     * @throws IOException            in case of I/O errors working with the files
-     * @throws MojoFailureException   in case the post-processing finds a user-correctable error
-     * @throws MojoExecutionException in case the post-processing encounters a system error
-     */
-    void postProcessFile(Path adocFilePath, Path outputPath) throws
-            IOException, MojoFailureException, MojoExecutionException {
-    }
-
-    /**
-     * Processes the AsciiDoctor file using a previously-created Asciidoctor
-     * instance.
-     *
-     * @param asciiDoctor    Asciidoctor instance (reusable for multiple files)
-     * @param inputDirectory Path for the directory where the input file resides
-     * @param adocFilePath   Full Path for the input file
-     * @throws IOException            in case of I/O errors working with the files
-     * @throws MojoFailureException   in case the post-processing finds a user-correctable error
-     * @throws MojoExecutionException in case the post-processing encounters a system error
-     */
-    void processFile(
-            Asciidoctor asciiDoctor,
-            Path inputDirectory,
-            Path adocFilePath,
-            AtomicBoolean isPrelim) throws IOException, MojoFailureException, MojoExecutionException {
-
-        Path relativeInputPath = inputDirectory.relativize(adocFilePath);
-        Path outputPath = outputDirectory.toPath().resolve(relativeInputPath);
-
-        getLog().info(String.format("processing %s to format '%s' in %s",
-                adocFilePath,
-                outputType(),
-                outputPath));
-
-        /*
-         * Process the document once, suppressing the preprocessing,
-         * to gather attributes that might be needed to resolve include
-         * references during the second, real AsciiDoctor processing.
-         */
-        Map<String, Object> attributes = new HashMap<>(projectProperties(project));
-        isPrelim.set(true);
-        Document doc = asciiDoctor.loadFile(adocFilePath.toFile(),
-                asciiDoctorOptions(
-                        attributes,
-                        relativeInputPath,
-                        outputDirectory,
-                        inputDirectory.toAbsolutePath(),
-                        false));
-
-        attributes.putAll(doc.getAttributes());
-
-        isPrelim.set(false);
-        asciiDoctor.loadFile(adocFilePath.toFile(),
-                asciiDoctorOptions(
-                        attributes,
-                        relativeInputPath,
-                        outputDirectory,
-                        inputDirectory.toAbsolutePath(),
-                        true));
-        /*
-         * We do not need to convert the document because the
-         * preprocessor has written the updated version of the .adoc
-         * file already, and we do not need any rendered output as a
-         * result of invoking this mojo.
-         */
-
-        postProcessFile(adocFilePath, outputPath);
-
-    }
-
-    /**
-     * Creates a stream of PathMatchers, one for each glob.
-     *
-     * @param inputDirectory Path within which the globs are applied
-     * @param globs          the glob patterns
-     * @return PathMatchers for the globs
-     */
-    private static Stream<PathMatcher> pathMatchers(Path inputDirectory, String[] globs) {
-        return Arrays.stream(globs)
-                     .map(glob -> {
-                         if (WINDOWS) {
-                             String pattern = "glob:" + inputDirectory + File.separator + glob.replace("/", "\\");
-                             return FileSystems.getDefault().getPathMatcher(pattern.replace("\\", "\\\\"));
-                         }
-                         return FileSystems.getDefault().getPathMatcher("glob:" + inputDirectory + "/" + glob);
-                     });
-    }
-
-    private static boolean matches(Path candidate, Stream<PathMatcher> matchers) {
-        return matchers.anyMatch((m) -> (m.matches(candidate)));
-    }
-
-    static void validateParams(File inputDirectory, String[] includes) throws MojoExecutionException {
-        if (includes.length == 0) {
-            throw new MojoExecutionException("You must specify at least one 'includes'");
-        }
-        if (!inputDirectory.exists()
-                || !inputDirectory.isDirectory()) {
-            throw new MojoExecutionException(
-                    String.format(
-                            "inputDirectory %s does not exist or is not a directory",
-                            inputDirectory));
-        }
-    }
-
-    private Asciidoctor createAsciiDoctor(String backendName, AtomicBoolean isPrelim) {
-        Asciidoctor asciiDoctor = Asciidoctor.Factory.create();
-        asciiDoctor.registerLogHandler(new SelectiveLogHandler(isPrelim));
-        AsciidocExtensionRegistry.create(backendName).register(asciiDoctor);
-        return asciiDoctor;
-    }
-
-    private static class SelectiveLogHandler implements LogHandler {
-
-        private final AtomicBoolean isPrelim;
-
-        private SelectiveLogHandler(AtomicBoolean isPrelim) {
-            this.isPrelim = isPrelim;
-        }
-
-        @Override
-        public void log(LogRecord logRecord) {
-            if (!isPrelim.get()) {
-                System.err.println(logRecord.getMessage());
-            }
-        }
-    }
-
-    private Options asciiDoctorOptions(Map<String, Object> attributes,
-                                       Path inputRelativePath,
-                                       File outputDirectory,
-                                       Path baseDirPath,
-                                       boolean runPreprocessing) {
-        OptionsBuilder optionsBuilder =
-                Options.builder()
-                       .attributes(Attributes.builder().attributes(attributes).build())
-                       .safe(SafeMode.UNSAFE)
-                       .headerFooter(false)
-                       .baseDir(baseDirPath.toFile())
-                       .eruby("");
-        if (outputDirectory != null) {
-            optionsBuilder.option("preincludeOutputPath", outputDirectory.toPath().resolve(inputRelativePath));
-        }
-        if (runPreprocessing) {
-            optionsBuilder.option("preprocessOutputType", outputType());
-        }
-        return optionsBuilder.build();
-    }
-
-    /**
-     * Get the project properties.
-     *
-     * @param project project
-     * @return map
-     */
-    static Map<String, String> projectProperties(MavenProject project) {
-        Map<String, String> map = new HashMap<>(Maps.fromProperties(project.getProperties()));
-        map.put("project.groupId", project.getGroupId());
-        map.put("project.artifactId", project.getArtifactId());
-        map.put("project.version", project.getVersion());
-        map.put("project.basedir", project.getBasedir().getAbsolutePath());
-        return map;
-    }
-}
diff --git a/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/maven/DoxiaSiteRenderer.java b/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/maven/DoxiaSiteRenderer.java
deleted file mode 100644
index 18264a692..000000000
--- a/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/maven/DoxiaSiteRenderer.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2020, 2023 Oracle and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.helidon.build.maven.sitegen.maven;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Writer;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import io.helidon.build.common.FileUtils;
-import io.helidon.build.common.maven.plugin.PlexusLoggerHolder;
-import io.helidon.build.maven.sitegen.Config;
-import io.helidon.build.maven.sitegen.RenderingException;
-import io.helidon.build.maven.sitegen.Site;
-
-import org.apache.maven.doxia.siterenderer.DefaultSiteRenderer;
-import org.apache.maven.doxia.siterenderer.DocumentRenderer;
-import org.apache.maven.doxia.siterenderer.Renderer;
-import org.apache.maven.doxia.siterenderer.RendererException;
-import org.apache.maven.doxia.siterenderer.RenderingContext;
-import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
-import org.apache.maven.plugins.site.render.ReportDocumentRenderer;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.util.IOUtil;
-
-/**
- * Doxia site renderer.
- */
-@Component(role = Renderer.class)
-public class DoxiaSiteRenderer extends DefaultSiteRenderer {
-
-    @Requirement
-    @SuppressWarnings("unused")
-    private PlexusLoggerHolder plexusLogHolder;
-
-    @Override
-    public void render(Collection<DocumentRenderer> documents, SiteRenderingContext context, File outputDirectory)
-            throws RendererException, IOException {
-
-        Path outputDir = outputDirectory.toPath();
-        for (DocumentRenderer docRenderer : documents) {
-            if (!(docRenderer instanceof ReportDocumentRenderer)) {
-                continue;
-            }
-            RenderingContext renderingContext = docRenderer.getRenderingContext();
-            Path outputFile = outputDir.resolve(docRenderer.getOutputName());
-            Path inputFile = renderingContext.getBasedir().toPath().resolve(renderingContext.getInputName());
-            long lastModifiedTime = FileUtils.lastModifiedMillis(outputFile);
-            boolean modified = !Files.exists(outputFile)
-                    || (FileUtils.lastModifiedMillis(inputFile) > lastModifiedTime)
-                    || (context.getDecoration().getLastModified() > lastModifiedTime);
-
-            if (modified || docRenderer.isOverwrite()) {
-                if (!Files.exists(outputFile)) {
-                    Files.createDirectories(outputFile.getParent());
-                }
-
-                if (getLogger().isDebugEnabled()) {
-                    getLogger().debug("Generating " + outputFile);
-                }
-
-                Writer writer = null;
-                try {
-                    if (!docRenderer.isExternalReport()) {
-                        writer = Files.newBufferedWriter(outputFile, Charset.forName(context.getOutputEncoding()));
-                    }
-                    docRenderer.renderDocument(writer, this, context);
-                } finally {
-                    IOUtil.close(writer);
-                }
-            } else {
-                if (getLogger().isDebugEnabled()) {
-                    getLogger().debug(inputFile + " unchanged, not regenerating...");
-                }
-            }
-        }
-
-        Map<String, String> properties = new HashMap<>();
-        Map<String, ?> templateProps = context.getTemplateProperties();
-        if (templateProps != null) {
-            templateProps.forEach((k, v) -> properties.put(k, v.toString()));
-            MavenProject project = (MavenProject) templateProps.get("project");
-            if (project != null) {
-                properties.put("project.groupId", project.getGroupId());
-                properties.put("project.artifactId", project.getArtifactId());
-                properties.put("project.version", project.getVersion());
-                properties.put("project.basedir", project.getBasedir().getAbsolutePath());
-            }
-        }
-
-        Path siteDir = context.getSiteDirectories().iterator().next().toPath();
-        Path configFile = siteDir.resolve("sitegen.yaml");
-        Config config = Config.create(configFile, properties);
-        Site site = Site.create(config);
-
-        // enable jruby verbose mode on debugging
-        if (getLogger().isDebugEnabled()) {
-            System.setProperty("jruby.cli.verbose", "true");
-        }
-
-        try {
-            site.generate(siteDir, outputDir);
-        } catch (RenderingException ex) {
-            throw new RendererException("Rendering error", ex);
-        }
-    }
-
-    @Override
-    public void copyResources(SiteRenderingContext context, File resourcesDir, File outputDir) {
-    }
-
-    @Override
-    public void copyResources(SiteRenderingContext context, File outputDirectory) {
-    }
-}
diff --git a/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/maven/GenerateMojo.java b/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/maven/GenerateMojo.java
index dcd0e39d1..aa4499a13 100644
--- a/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/maven/GenerateMojo.java
+++ b/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/maven/GenerateMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2018, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,10 @@
 package io.helidon.build.maven.sitegen.maven;
 
 import java.io.File;
+import java.util.HashMap;
 import java.util.Map;
 
+import io.helidon.build.common.Maps;
 import io.helidon.build.common.maven.plugin.PlexusLoggerHolder;
 import io.helidon.build.maven.sitegen.Config;
 import io.helidon.build.maven.sitegen.RenderingException;
@@ -35,7 +37,7 @@
 /**
  * Goal that generates the site files.
  */
-@Mojo(name = "generate", defaultPhase = LifecyclePhase.COMPILE)
+@Mojo(name = "generate", defaultPhase = LifecyclePhase.COMPILE, threadSafe = true)
 public class GenerateMojo extends AbstractMojo {
 
     @Component
@@ -85,7 +87,11 @@ public void execute() throws MojoExecutionException {
 
         project.addCompileSourceRoot(siteSourceDirectory.getAbsolutePath());
 
-        Map<String, String> properties = AbstractAsciiDocMojo.projectProperties(project);
+        Map<String, String> properties = new HashMap<>(Maps.fromProperties(project.getProperties()));
+        properties.put("project.groupId", project.getGroupId());
+        properties.put("project.artifactId", project.getArtifactId());
+        properties.put("project.version", project.getVersion());
+        properties.put("project.basedir", project.getBasedir().getAbsolutePath());
 
         try {
             Config config = Config.create(siteConfigFile.toPath(), properties);
diff --git a/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/maven/NaturalizeAsciiDocMojo.java b/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/maven/NaturalizeAsciiDocMojo.java
deleted file mode 100644
index f73b2de5c..000000000
--- a/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/maven/NaturalizeAsciiDocMojo.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2019, 2023 Oracle and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.helidon.build.maven.sitegen.maven;
-
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-
-/**
- * Converts the "preprocessed" form of AsciiDoc files (with text pre-included
- * and includes described in comments) into "natural" form (using standard
- * {@code include::} directives).
- * <p>
- * Although the preprocessed form renders better on GitHub, developers can more
- * easily edit the natural form.
- * <p>
- * See {@link AbstractAsciiDocMojo} for a description of the parameters for
- * this goal. (This goal inherits the common settings and adds no others.)
- */
-@Mojo(name = "naturalize-adoc",
-        defaultPhase = LifecyclePhase.GENERATE_SOURCES)
-public class NaturalizeAsciiDocMojo extends AbstractAsciiDocMojo {
-
-    @Override
-    String outputType() {
-        return "natural";
-    }
-}
diff --git a/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/maven/PreprocessAsciiDocMojo.java b/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/maven/PreprocessAsciiDocMojo.java
deleted file mode 100644
index 0118426de..000000000
--- a/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/maven/PreprocessAsciiDocMojo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2018, 2023 Oracle and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.helidon.build.maven.sitegen.maven;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.DigestInputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import com.github.difflib.DiffUtils;
-import com.github.difflib.algorithm.DiffException;
-import com.github.difflib.patch.Delta;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-
-/**
- * Preprocesses AsciiDoc files to "pre-execute" includes so the resulting
- * AsciiDoc output will render nicely on GitHub (because GitHub AsciiDoc
- * rendering does not yet support {@code include::}).
- * <table>
- * <caption>Additional settings (see {@link AbstractAsciiDocMojo})</caption>
- * <tr>
- * <th>Property</th>
- * <th>Usage</th>
- * </tr>
- *
- * <tr>
- * <td>check</td>
- * <td>whether to check that the input and output are the same. Typically used
- * in pipeline builds to make sure that the developer committed a pre-included
- * version of the .adoc file.
- * </td>
- * </tr>
- * </table>
- */
-@Mojo(name = "preprocess-adoc", defaultPhase = LifecyclePhase.GENERATE_SOURCES)
-public class PreprocessAsciiDocMojo extends AbstractAsciiDocMojo {
-
-    /**
-     * Whether to check that the input and output files are the same. Primarily
-     * intended for use during a pipeline build to make sure that the .adoc file
-     * in the repository is the same as the pre-included form (to ensure that the
-     * developer has included the updated pre-included file in the commit).
-     */
-    @Parameter(property = Constants.PROPERTY_PREFIX + "checkPreprocess", defaultValue = "false")
-    private boolean checkPreprocess;
-
-    @Override
-    void postProcessFile(Path adocFilePath, Path outputPath)
-            throws IOException, MojoFailureException, MojoExecutionException {
-
-        if (checkPreprocess) {
-            compareFiles(adocFilePath, outputPath);
-        }
-    }
-
-    @Override
-    String outputType() {
-        return "preprocessed";
-    }
-
-    private void compareFiles(Path pathA, Path pathB) throws IOException, MojoFailureException, MojoExecutionException {
-        if (pathA.equals(pathB)) {
-            getLog().warn(
-                    new IllegalArgumentException(
-                            "'check' set to true but it will always pass: "
-                                    + "input and output files are the same"));
-        }
-        try {
-            byte[] inputDigest = digest(pathA);
-            byte[] outputDigest = digest(pathB);
-            if (!Arrays.equals(inputDigest, outputDigest)) {
-                throw new MojoFailureException(String.format(
-                        "file %s does not match its expected pre-processed form; "
-                                + "the commit might need an up-to-date file from running 'preprocess-adoc'%n%s ",
-                        pathA,
-                        formatDiffs(pathA, pathB)));
-            }
-        } catch (NoSuchAlgorithmException e) {
-            throw new MojoExecutionException("error checking for matching input and output files", e);
-        } catch (DiffException ex) {
-            throw new MojoExecutionException(
-                    String.format("Error comparing %s and %s", pathA, pathB.toString()),
-                    ex);
-        }
-    }
-
-    private byte[] digest(Path path) throws IOException, NoSuchAlgorithmException {
-        MessageDigest md = MessageDigest.getInstance("MD5");
-        byte[] buffer = new byte[256];
-        try (InputStream is = new BufferedInputStream(Files.newInputStream(path));
-             DigestInputStream dis = new DigestInputStream(is, md)) {
-            //noinspection StatementWithEmptyBody
-            while (dis.read(buffer) != -1) {
-            }
-        }
-        return md.digest();
-    }
-
-    private String formatDiffs(Path pathA, Path pathB) throws IOException, DiffException {
-        List<String> contentA = Files.readAllLines(pathA);
-        List<String> contentB = Files.readAllLines(pathB);
-        return DiffUtils.diff(contentA, contentB).getDeltas().stream()
-                        .map(Delta::toString)
-                        .collect(Collectors.joining(System.lineSeparator()));
-    }
-}
diff --git a/maven-plugins/sitegen-maven-plugin/src/test/java/io/helidon/build/maven/sitegen/maven/PreprocessAsciiDocMojoTest.java b/maven-plugins/sitegen-maven-plugin/src/test/java/io/helidon/build/maven/sitegen/maven/PreprocessAsciiDocMojoTest.java
deleted file mode 100644
index a26d00730..000000000
--- a/maven-plugins/sitegen-maven-plugin/src/test/java/io/helidon/build/maven/sitegen/maven/PreprocessAsciiDocMojoTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2018, 2023 Oracle and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.helidon.build.maven.sitegen.maven;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collection;
-import java.util.List;
-
-import com.github.difflib.DiffUtils;
-import com.github.difflib.algorithm.DiffException;
-
-import static io.helidon.build.common.test.utils.TestFiles.targetDir;
-import static io.helidon.build.maven.sitegen.maven.MavenPluginHelper.mojo;
-import static io.helidon.build.maven.sitegen.maven.AbstractAsciiDocMojo.inputs;
-import static org.hamcrest.CoreMatchers.hasItems;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.junit.jupiter.api.Test;
-
-/**
- * Tests {@link PreprocessAsciiDocMojo}.
- */
-public class PreprocessAsciiDocMojoTest {
-
-    private static final Path TARGET_DIR = targetDir(PreprocessAsciiDocMojoTest.class);
-    private static final Path TEST_ROOT = TARGET_DIR.resolve("test-classes/preprocess");
-
-    @Test
-    public void testSimpleIncludes() throws IOException {
-        Collection<Path> matched = inputs(TEST_ROOT,
-                new String[]{"a/*.adoc"},
-                new String[0]);
-        assertThat(matched, hasItems(TEST_ROOT.resolve("a/a.adoc")));
-    }
-
-    @Test
-    public void testDoubleStarInclude() throws IOException {
-        Collection<Path> matched = inputs(TEST_ROOT,
-                new String[]{"**/*.adoc"},
-                new String[0]);
-        assertThat(matched, hasItems(
-                TEST_ROOT.resolve("a/a.adoc"),
-                TEST_ROOT.resolve("b/b.adoc"),
-                TEST_ROOT.resolve("b/b1/b1.adoc"),
-                TEST_ROOT.resolve("b/b2/b2.adoc")));
-    }
-
-    @Test
-    public void testEmbeddedDoubleStarIncludes() throws IOException {
-        Collection<Path> matched = inputs(TEST_ROOT,
-                new String[]{"b/**/*.adoc"},
-                new String[0]);
-        assertThat(matched, hasItems(
-                TEST_ROOT.resolve("b/b1/b1.adoc"),
-                TEST_ROOT.resolve("b/b2/b2.adoc")));
-    }
-
-    @Test
-    public void testSimpleExcludes() throws IOException {
-        Collection<Path> matched = inputs(TEST_ROOT,
-                new String[]{"**/*.adoc"},
-                new String[]{"b/b2/b2.adoc", "b/b.adoc"});
-        assertThat(matched, hasItems(
-                TEST_ROOT.resolve("a/a.adoc"),
-                TEST_ROOT.resolve("b/b1/b1.adoc")));
-    }
-
-    @Test
-    public void testDoubleStarExclude() throws IOException {
-        Collection<Path> matched = inputs(TEST_ROOT,
-                new String[]{"**/*.adoc"},
-                new String[]{"b/**"});
-        assertThat(matched, hasItems(TEST_ROOT.resolve("a/a.adoc")));
-    }
-
-    @Test
-    public void testWithRealIncludes() throws Exception {
-        runMojo("preprocess-mojo/pom-test-includes.xml",
-                "variousIncludes-afterFullPreprocessing.adoc",
-                "preprocess-adoc",
-                PreprocessAsciiDocMojo.class);
-    }
-
-    @Test
-    public void testWithRealIncludesAndNaturalOutput() throws Exception {
-        runMojo("preprocess-mojo/pom-test-includes-natural-output.xml",
-                "variousIncludes-naturalForm.adoc",
-                "naturalize-adoc",
-                NaturalizeAsciiDocMojo.class);
-    }
-
-    private void runMojo(String pomFile,
-                         String expectedFile,
-                         String goal,
-                         Class<? extends AbstractAsciiDocMojo> mojoClass) throws Exception {
-
-        AbstractAsciiDocMojo mojo = mojo(pomFile, TARGET_DIR.resolve("test-classes"), goal, mojoClass);
-
-        mojo.execute();
-
-        String baseDir = mojo.project().getBasedir().toPath().toString();
-        Path mojoOutputPath = Paths.get(baseDir, "../../../../target/docs",
-                "variousIncludes.adoc").normalize();
-        List<String> mojoOutput = Files.readAllLines(mojoOutputPath);
-
-        Path expectedOutputPath = Paths.get(baseDir, "../preprocess-adoc", expectedFile);
-        List<String> expectedOutput = Files.readAllLines(expectedOutputPath);
-
-        try {
-            String reason = DiffUtils.diff(expectedOutput, mojoOutput).toString();
-            assertThat(reason, expectedOutput, is(mojoOutput));
-        } catch (DiffException ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-}
diff --git a/maven-plugins/sitegen-maven-plugin/src/test/resources/basic2/_expected.ftl b/maven-plugins/sitegen-maven-plugin/src/test/resources/basic2/_expected.ftl
index 6379ad287..4bd728b72 100644
--- a/maven-plugins/sitegen-maven-plugin/src/test/resources/basic2/_expected.ftl
+++ b/maven-plugins/sitegen-maven-plugin/src/test/resources/basic2/_expected.ftl
@@ -41,7 +41,7 @@ $ mvn
 <dl>
 <dt>asciidoctor-version</dt>
 <dd>
-2.0.16
+2.0.20
 </dd>
 <dt>safe-mode-name</dt>
 <dd>
diff --git a/maven-plugins/snakeyaml-codegen-maven-plugin/etc/spotbugs/exclude.xml b/maven-plugins/snakeyaml-codegen-maven-plugin/etc/spotbugs/exclude.xml
index afd658947..fac00d1e4 100644
--- a/maven-plugins/snakeyaml-codegen-maven-plugin/etc/spotbugs/exclude.xml
+++ b/maven-plugins/snakeyaml-codegen-maven-plugin/etc/spotbugs/exclude.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022 Oracle and/or its affiliates.
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 
     <Match>
         <!-- vulnerable to XML External Entity attacks  -->
-        <Class name="io.helidon.build.maven.snakeyaml.codegen.HelpMojo"/>
+        <Class name="io.helidon.build_tools.snakeyaml_codegen_maven_plugin.HelpMojo"/>
         <Bug pattern="XXE_DOCUMENT"/>
     </Match>
 
diff --git a/pom.xml b/pom.xml
index 6a204b242..355093e31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -122,17 +122,17 @@
         Changing these version requires approval for a new third party dependency!
         -->
         <version.lib.apache-commons>3.10</version.lib.apache-commons>
-        <version.lib.archetype-common>3.2.0</version.lib.archetype-common>
-        <version.lib.asciidoctorj>2.5.2</version.lib.asciidoctorj>
-        <version.lib.asm>7.2</version.lib.asm>
-        <version.lib.checkstyle>9.1</version.lib.checkstyle>
+        <version.lib.archetype-common>3.3.0</version.lib.archetype-common>
+        <version.lib.asciidoctorj>2.5.11</version.lib.asciidoctorj>
+        <version.lib.asm>9.5</version.lib.asm>
+        <version.lib.checkstyle>10.12.6</version.lib.checkstyle>
         <version.lib.diffutils>2.2</version.lib.diffutils>
         <version.lib.doxia>1.11.1</version.lib.doxia>
         <version.lib.freemarker>2.3.23</version.lib.freemarker>
-        <version.lib.groovy>2.4.16</version.lib.groovy>
         <version.lib.gson>2.8.9</version.lib.gson>
+        <version.lib.guava>32.0.1-jre</version.lib.guava>
         <version.lib.hamcrest>1.3</version.lib.hamcrest>
-        <version.lib.invoker>3.0.1</version.lib.invoker>
+        <version.lib.invoker>3.3.0</version.lib.invoker>
         <version.lib.jackson>2.11.0</version.lib.jackson>
         <version.lib.jandex>2.1.1.Final</version.lib.jandex>
         <version.lib.jansi>1.18</version.lib.jansi>
@@ -140,21 +140,21 @@
         <version.lib.jaxb-core>2.3.0.1</version.lib.jaxb-core>
         <version.lib.jaxb-impl>2.3.3</version.lib.jaxb-impl>
         <version.lib.jsonp-impl>1.1.4</version.lib.jsonp-impl>
-        <version.lib.junit>5.8.0-M1</version.lib.junit>
+        <version.lib.junit>5.9.3</version.lib.junit>
         <version.lib.junit-platform>1.8.0-M1</version.lib.junit-platform>
         <version.lib.junit4>4.13.1</version.lib.junit4>
         <version.lib.lsp4j>0.16.0</version.lib.lsp4j>
         <version.lib.lsp4mp>0.2.0</version.lib.lsp4mp>
-        <version.lib.maven>3.6.2</version.lib.maven>
+        <version.lib.maven>3.8.8</version.lib.maven>
         <version.lib.maven-annotations>3.5</version.lib.maven-annotations>
-        <version.lib.maven-archiver>3.5.0</version.lib.maven-archiver>
+        <version.lib.maven-archiver>3.6.1</version.lib.maven-archiver>
         <version.lib.maven-artifact-transfer>0.13.1</version.lib.maven-artifact-transfer>
         <version.lib.maven-embedder>3.6.2</version.lib.maven-embedder>
         <version.lib.maven-enforcer>3.4.0</version.lib.maven-enforcer>
-        <version.lib.maven-filtering>3.1.1</version.lib.maven-filtering>
+        <version.lib.maven-filtering>3.3.1</version.lib.maven-filtering>
         <version.lib.maven-plugin-testing-harness>3.3.0</version.lib.maven-plugin-testing-harness>
-        <version.lib.maven-resolver>1.4.1</version.lib.maven-resolver>
-        <version.lib.maven-settings>3.6.2</version.lib.maven-settings>
+        <version.lib.maven-resolver>1.6.3</version.lib.maven-resolver>
+        <version.lib.maven-settings>3.8.8</version.lib.maven-settings>
         <version.lib.mock-server>5.10.0</version.lib.mock-server>
         <version.lib.mustache>0.9.6</version.lib.mustache>
         <version.lib.mockito>3.10.0</version.lib.mockito>
@@ -166,9 +166,9 @@
         <version.lib.rhino>1.7.14</version.lib.rhino>
         <version.lib.site-plugin>3.8.2</version.lib.site-plugin>
         <version.lib.slf4j>1.7.25</version.lib.slf4j>
-        <version.lib.snakeyaml>1.32</version.lib.snakeyaml>
+        <version.lib.snakeyaml>2.0</version.lib.snakeyaml>
         <version.lib.spotbugs-annotations>3.1.12</version.lib.spotbugs-annotations>
-        <version.lib.wagon-http>3.3.4</version.lib.wagon-http>
+        <version.lib.wagon-http>3.5.3</version.lib.wagon-http>
         <version.lib.commons-text>1.10.0</version.lib.commons-text>
 
         <!--
@@ -179,10 +179,11 @@
         <version.plugin.assembly>3.3.0</version.plugin.assembly>
         <version.plugin.build-helper>3.2.0</version.plugin.build-helper>
         <version.plugin.buildnumber>1.4</version.plugin.buildnumber>
-        <version.plugin.checkstyle>3.1.2</version.plugin.checkstyle>
+        <version.plugin.checkstyle>3.3.1</version.plugin.checkstyle>
         <version.plugin.clean>3.1.0</version.plugin.clean>
         <version.plugin.compiler>3.8.1</version.plugin.compiler>
         <version.plugin.dependency>3.3.0</version.plugin.dependency>
+        <version.plugin.dependency-check>9.0.9</version.plugin.dependency-check>
         <version.plugin.deploy>2.8.2</version.plugin.deploy>
         <version.plugin.enforcer>3.4.0</version.plugin.enforcer>
         <version.plugin.failsafe>3.0.0-M5</version.plugin.failsafe>
@@ -193,16 +194,16 @@
         <version.plugin.graalvm>0.9.23</version.plugin.graalvm>
         <version.plugin.jacoco>0.7.9</version.plugin.jacoco>
         <version.plugin.jar>3.0.2</version.plugin.jar>
-        <version.plugin.javadoc>3.2.0</version.plugin.javadoc>
-        <version.plugin.invoker>3.2.2</version.plugin.invoker>
+        <version.plugin.javadoc>3.6.2</version.plugin.javadoc>
+        <version.plugin.invoker>3.8.0</version.plugin.invoker>
         <version.plugin.license>1.16</version.plugin.license>
         <version.plugin.plexus>2.1.0</version.plugin.plexus>
-        <version.plugin.plugin-plugin>3.6.0</version.plugin.plugin-plugin>
+        <version.plugin.plugin-plugin>3.10.2</version.plugin.plugin-plugin>
         <version.plugin.nexus-staging>1.6.13</version.plugin.nexus-staging>
         <version.plugin.release-plugin>2.5.3</version.plugin.release-plugin>
         <version.plugin.resources>2.7</version.plugin.resources>
         <version.plugin.source>3.0.1</version.plugin.source>
-        <version.plugin.spotbugs>4.7.1.1</version.plugin.spotbugs>
+        <version.plugin.spotbugs>4.7.3.5</version.plugin.spotbugs>
         <version.plugin.surefire>3.1.2</version.plugin.surefire>
         <version.plugin.failsafe>3.1.2</version.plugin.failsafe>
         <version.plugin.toolchains>3.1.0</version.plugin.toolchains>
@@ -360,9 +361,8 @@
                     <artifactId>maven-checkstyle-plugin</artifactId>
                     <version>${version.plugin.checkstyle}</version>
                     <configuration>
-                        <sourceDirectories>
-                            <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-                        </sourceDirectories>
+                        <configLocation>${maven.multiModuleProjectDirectory}/etc/checkstyle.xml</configLocation>
+                        <suppressionsLocation>${maven.multiModuleProjectDirectory}/etc/checkstyle-suppressions.xml</suppressionsLocation>
                     </configuration>
                     <dependencies>
                         <dependency>
@@ -376,6 +376,11 @@
                                 </exclusion>
                             </exclusions>
                         </dependency>
+                        <dependency>
+                            <groupId>org.apache.maven.doxia</groupId>
+                            <artifactId>doxia-core</artifactId>
+                            <version>1.9</version>
+                        </dependency>
                     </dependencies>
                 </plugin>
                 <plugin>
@@ -398,23 +403,6 @@
                         </plugins>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>license-maven-plugin</artifactId>
-                    <version>${version.plugin.license}</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.maven.doxia</groupId>
-                            <artifactId>doxia-core</artifactId>
-                            <version>1.6</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.maven.doxia</groupId>
-                            <artifactId>doxia-site-renderer</artifactId>
-                            <version>1.6</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-gpg-plugin</artifactId>
@@ -480,13 +468,6 @@
                             <goal>install</goal>
                         </goals>
                     </configuration>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.codehaus.groovy</groupId>
-                            <artifactId>groovy</artifactId>
-                            <version>${version.lib.groovy}</version>
-                        </dependency>
-                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -508,6 +489,35 @@
                     <artifactId>native-maven-plugin</artifactId>
                     <version>${version.plugin.graalvm}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.owasp</groupId>
+                    <artifactId>dependency-check-maven</artifactId>
+                    <version>${version.plugin.dependency-check}</version>
+                    <configuration>
+                        <skip>${dependency-check.skip}</skip>
+                        <skipTestScope>true</skipTestScope>
+                        <failBuildOnAnyVulnerability>false</failBuildOnAnyVulnerability>
+                        <assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
+                        <nvdApiKey>${nvd-api-key}</nvdApiKey>
+                        <excludes>
+                            <!-- Exclude stuff we do not deploy -->
+                            <!-- This should be excluded by above, but for some reason it persists -->
+                            <exclude>org.testng:testng</exclude>
+                        </excludes>
+                        <formats>
+                            <format>HTML</format>
+                        </formats>
+                        <suppressionFiles>
+                            <!--suppress UnresolvedMavenProperty -->
+                            <suppressionFile>${maven.multiModuleProjectDirectory}/etc/dependency-check-suppression.xml</suppressionFile>
+                        </suppressionFiles>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>io.helidon.build-tools</groupId>
+                    <artifactId>helidon-build-cache-maven-plugin</artifactId>
+                    <version>4.0.7</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -554,14 +564,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <configuration>
-                    <configLocation>/etc/checkstyle.xml</configLocation>
-                    <suppressionsLocation>/etc/checkstyle-suppressions.xml</suppressionsLocation>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -617,6 +619,21 @@
                 <artifactId>maven-artifact</artifactId>
                 <version>${version.lib.maven}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-settings</artifactId>
+                <version>${version.lib.maven}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-settings-builder</artifactId>
+                <version>${version.lib.maven}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-builder-support</artifactId>
+                <version>${version.lib.maven}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.maven.enforcer</groupId>
                 <artifactId>enforcer-api</artifactId>
@@ -756,6 +773,12 @@
                 <groupId>com.github.wumpz</groupId>
                 <artifactId>diffutils</artifactId>
                 <version>${version.lib.diffutils}</version>
+                <exclusions>
+                    <exclusion>
+                    <groupId>org.eclipse.jgit</groupId>
+                    <artifactId>org.eclipse.jgit</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>com.github.spullara.mustache.java</groupId>
@@ -858,6 +881,12 @@
                 <artifactId>gson</artifactId>
                 <version>${version.lib.gson}</version>
             </dependency>
+            <dependency>
+                <!-- force upgrade trans dep of lsp4j and maven-core -->
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${version.lib.guava}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.maven.shared</groupId>
                 <artifactId>maven-artifact-transfer</artifactId>
@@ -867,6 +896,13 @@
                 <groupId>org.apache.maven.archetype</groupId>
                 <artifactId>archetype-common</artifactId>
                 <version>${version.lib.archetype-common}</version>
+                <exclusions>
+                    <exclusion>
+                        <!-- not needed -->
+                        <groupId>org.apache.ivy</groupId>
+                        <artifactId>ivy</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven.wagon</groupId>
@@ -888,6 +924,11 @@
                 <artifactId>maven-resolver-connector-basic</artifactId>
                 <version>${version.lib.maven-resolver}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.maven.resolver</groupId>
+                <artifactId>maven-resolver-util</artifactId>
+                <version>${version.lib.maven-resolver}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-embedder</artifactId>
@@ -930,8 +971,10 @@
                         <executions>
                             <execution>
                                 <goals>
-                                    <goal>check</goal>
+                                    <goal>spotbugs</goal>
+                                    <goal>verify</goal>
                                 </goals>
+                                <phase>verify</phase>
                             </execution>
                         </executions>
                     </plugin>
@@ -952,14 +995,6 @@
                                     <goal>check</goal>
                                 </goals>
                                 <phase>validate</phase>
-                                <configuration>
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <configLocation>${maven.multiModuleProjectDirectory}/etc/checkstyle.xml</configLocation>
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <suppressionsLocation>
-                                        ${maven.multiModuleProjectDirectory}/etc/checkstyle-suppressions.xml
-                                    </suppressionsLocation>
-                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
@@ -1091,26 +1126,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>build-cache</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.helidon.build-tools</groupId>
-                        <artifactId>helidon-build-cache-maven-plugin</artifactId>
-                        <version>3.0.5</version>
-                        <extensions>true</extensions>
-                        <configuration>
-                            <projectFilesExcludes>
-                                <exclude>.*/**</exclude>
-                                <exclude>etc/**</exclude>
-                                <exclude>**/vscode-extension/**</exclude>
-                            </projectFilesExcludes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>toolchain</id>
             <activation>