Merge branch 'main' into develop-v2

# Conflicts:
#	imagetool/pom.xml
#	imagetool/src/test/java/com/oracle/weblogic/imagetool/aru/VersionTest.java
#	installer/pom.xml
#	pom.xml
#	tests/pom.xml

Author: ddsharpe

.github/workflows/publish-github-pages.yml

@@ -26,26 +26,32 @@ jobs:
 
     steps:
       - name: Checkout main
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: main
           path: main
 
       - name: Checkout gh-pages
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: gh-pages
           path: gh-pages
           token: ${{ secrets.PUBLISH_SECRET }}
 
       - name: Build and publish site
         run: |
-          curl -fL -o hugo.tar.gz "https://github.com/gohugoio/hugo/releases/download/v0.82.0/hugo_0.82.0_Linux-64bit.tar.gz"
+          echo "Downloading Hugo for generating HTML documentation from Markdown"
+          curl -fL -o hugo.tar.gz "https://github.com/gohugoio/hugo/releases/download/v0.108.0/hugo_0.108.0_Linux-64bit.tar.gz"
           tar -xf hugo.tar.gz
           export PATH="$PWD:$PATH"
+          
           mkdir $GITHUB_WORKSPACE/WORK
+          echo "Building HTML documentation for main branch..."
           cd $GITHUB_WORKSPACE/main/documentation
-          ./publish.sh -o $GITHUB_WORKSPACE/WORK
+          # Generate documentation into $GITHUB_WORKSPACE/WORK using Markdown source in the ./site folder
+          hugo -s site -d "$GITHUB_WORKSPACE/WORK" -b https://oracle.github.io/weblogic-image-tool
+
+          echo "Remove existing documentation files and replace them with newly generated files in branch gh-pages"
           cd $GITHUB_WORKSPACE/gh-pages
           rm -Rf *
           cp -R $GITHUB_WORKSPACE/WORK/* .

.github/workflows/sonar-branch.yml

@@ -16,11 +16,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Setup JDK 11
-        uses: actions/setup-java@v3
+      - name: Setup JDK
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: 11
+          java-version: 17
       - name: Build and Test
         run: |
           mvn -B clean package