Merge branch 'main' into include-anonymous

hub4j · Nov 13, 2024 · 560779a · 560779a
2 parents 14643e3 + e4ef482
commit 560779a
Show file tree

Hide file tree

Showing 275 changed files with 3,758 additions and 8,459 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -42,7 +42,7 @@ jobs:
 
     steps:
     - name: Set up JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: 17

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -57,7 +57,9 @@ jobs:
     - name: Maven Site
       env:
         MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
-      run: mvn -B clean site -D enable-ci --file pom.xml
+      # running install site seems to more closely imitate real site deployment,
+      # more likely to prevent failed deployment
+      run: mvn -B clean install site -DskipTests --file pom.xml
   test:
     name: test (${{ matrix.os }}, Java ${{ matrix.java }})
     # Does not require build output, but orders execution to prevent launching test workflows when simple build fails 
@@ -105,32 +107,13 @@ jobs:
         name: maven-test-target-directory
         path: target
     - name: Codecov Report
-      uses: codecov/codecov-action@v4.5.0
+      uses: codecov/codecov-action@v4.6.0
       with:
         # Codecov token from https://app.codecov.io/gh/hub4j/github-api/settings
         token: ${{ secrets.CODECOV_TOKEN }}
         fail_ci_if_error: true
         verbose: true
 
-  test-java-8:
-    name: test Java 8 (no-build)
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
-      with:
-        name: maven-target-directory
-        path: target
-    - name: Set up JDK
-      uses: actions/setup-java@v4
-      with:
-        java-version: 8
-        distribution: 'temurin'
-        cache: 'maven'
-    - name: Maven Test (no build) Java 8
-      run: mvn -B surefire:test -DfailIfNoTests -Dsurefire.excludesFile=src/test/resources/slow-or-flaky-tests.txt
-
   test-java-11:
     name: test Java 11 (no-build)
     needs: build
@@ -144,7 +127,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v4
       with:
-        java-version: 8
+        java-version: 11
         distribution: 'temurin'
         cache: 'maven'
     - name: Maven Test (no build) Java 11

diff --git a/.github/workflows/publish_release_branch.yml b/.github/workflows/publish_release_branch.yml
@@ -59,7 +59,7 @@ jobs:
   publish_gh_pages:
     runs-on: ubuntu-latest
     needs: build
-    if:  ${{ github.ref == 'refs/heads/release/v1.x' }}
+    if:  ${{ github.ref == 'refs/heads/release/v2.x' }}
     steps:
       - uses: actions/checkout@v4
         with: