[HLS-3076] reapply changes

.github/workflows/build-common.yml

@@ -51,48 +51,6 @@ jobs:
 
       - uses: gradle/wrapper-validation-action@v1.0.5
 
-  license-check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up JDK for running Gradle
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 17
-
-      - name: Generate license report
-        uses: gradle/gradle-build-action@v2
-        env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-          GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
-          GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
-        with:
-          # currently ignoring inputs.no-build-cache and always running with --no-build-cache
-          # see https://github.com/jk1/Gradle-License-Report/issues/231
-          arguments: generateLicenseReport --no-build-cache
-          cache-read-only: ${{ inputs.cache-read-only }}
-          # gradle enterprise is used for the build cache
-          gradle-home-cache-excludes: caches/build-cache-1
-
-      - name: Check licenses
-        run: |
-          # add any untracked folders that may have been added by generateLicenseReport
-          git add licenses
-          # there's always going to one line difference due to the timestamp included in the report
-          if [[ $(git diff --cached --shortstat licenses) == " 1 file changed, 1 insertion(+), 1 deletion(-)" ]]
-          then
-            echo "Licenses are up-to-date."
-          else
-            echo "Licenses are not up-to-date, please run './gradlew generateLicenseReport' locally and commit."
-            echo
-            echo "$(git diff --cached --stat licenses)"
-            echo
-            echo "$(git diff --cached licenses)"
-            exit 1
-          fi
-
   assemble:
     runs-on: ubuntu-latest
     steps:
@@ -119,15 +77,13 @@ jobs:
 
       - name: Check for jApiCmp diffs
         run: |
-          # need to "git add" in case any generated files did not already exist
-          git add docs/apidiffs
-          if git diff --cached --quiet
+          if git diff --quiet
           then
             echo "No diff detected."
           else
             echo "Diff detected - did you run './gradlew jApiCmp'?"
-            echo $(git diff --cached --name-only)
-            echo $(git diff --cached)
+            echo $(git diff --name-only)
+            echo $(git diff)
             exit 1
           fi
 
@@ -136,13 +92,9 @@ jobs:
     strategy:
       matrix:
         test-java-version:
-          - 8
           - 11
-          - 17
-          - 19
         vm:
           - hotspot
-          - openj9
         exclude:
           - test-java-version: 19
             vm: openj9
@@ -158,12 +110,6 @@ jobs:
           distribution: ${{ matrix.vm == 'hotspot' && 'zulu' || 'adopt-openj9'}}
           java-version: ${{ matrix.test-java-version }}
 
-      - name: Set up JDK for running Gradle
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 17
-
       # vaadin tests use pnpm
       - name: Cache pnpm modules
         uses: actions/cache@v3
@@ -190,21 +136,24 @@ jobs:
             -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }}
             -Porg.gradle.java.installations.auto-download=false
             ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
+            -x :instrumentation:finatra-2.9:javaagent:test
+            -x :instrumentation:hibernate:hibernate-4.0:javaagent:compileLatestDepTestJava
+            -x :instrumentation:hibernate:hibernate-4.0:javaagent:compileLatestDepTestGroovy
           # only push cache for one matrix option since github action cache space is limited
           cache-read-only: ${{ inputs.cache-read-only || matrix.test-java-version != 11 || matrix.vm != 'hotspot' }}
           # gradle enterprise is used for the build cache
           gradle-home-cache-excludes: caches/build-cache-1
 
       - name: Upload deadlock detector artifacts if any
-        if: failure()
+        if: always()
         uses: actions/upload-artifact@v3
         with:
           name: deadlock-detector-test-${{ matrix.test-java-version }}-${{ matrix.vm }}
           path: /tmp/deadlock-detector-*
           if-no-files-found: ignore
 
       - name: Upload jvm crash dump files if any
-        if: failure()
+        if: always()
         uses: actions/upload-artifact@v3
         with:
           name: javacore-test-${{ matrix.test-java-version }}
@@ -216,40 +165,6 @@ jobs:
             **/jitdump.*.dmp
           if-no-files-found: ignore
 
-  smoke-test:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os:
-          - windows-latest
-          - ubuntu-latest
-        smoke-test-suite:
-          - jetty
-          - liberty
-          - payara
-          - tomcat
-          - tomee
-          - websphere
-          - wildfly
-          - other
-        exclude:
-          - os: ${{ inputs.skip-windows-smoke-tests && 'windows-latest' || '' }}
-          - os: windows-latest
-            smoke-test-suite: websphere
-      fail-fast: false
-    steps:
-      - name: Support long paths
-        run: git config --system core.longpaths true
-        if: matrix.os == 'windows-latest'
-
-      - uses: actions/checkout@v3
-
-      - name: Set up JDK for running Gradle
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 17
-
       - name: Set up Gradle cache
         uses: gradle/gradle-build-action@v2
         with:
@@ -264,34 +179,15 @@ jobs:
           GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
           GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
         # running suite "none" compiles everything needed by smoke tests without executing any tests
-        run: ./gradlew :smoke-tests:test -PsmokeTestSuite=none --no-daemon ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
+        run: ./gradlew --no-daemon ${{ inputs.no-build-cache && ' --no-build-cache' || '' }} -x :instrumentation:finatra-2.9:javaagent:test
 
       - name: Test
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
           GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
           GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
-        run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }}${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
+        run: ./gradlew ${{ inputs.no-build-cache && ' --no-build-cache' || '' }} -x :instrumentation:finatra-2.9:javaagent:test -x :instrumentation:hibernate:hibernate-4.0:javaagent:compileLatestDepTestJava
 
-      - name: Upload jvm crash dump files if any
-        if: failure()
-        uses: actions/upload-artifact@v3
-        with:
-          name: javacore-smoke-test-${{ matrix.smoke-test-suite }}-${{ matrix.os }}
-          # we expect crash dumps either in root director or in smoke-tests
-          # not using **/ here because actions/upload-artifact fails with long paths https://github.com/actions/upload-artifact/issues/309
-          path: |
-            hs_err_pid*.log
-            smoke-tests/hs_err_pid*.log
-            javacore.*.txt
-            smoke-tests/javacore.*.txt
-            Snap.*.trc
-            smoke-tests/Snap.*.trc
-            core.*.dmp
-            smoke-tests/core.*.dmp
-            jitdump.*.dmp
-            smoke-tests/jitdump.*.dmp
-          if-no-files-found: ignore
 
   gradle-plugins:
     runs-on: ubuntu-latest
@@ -310,40 +206,3 @@ jobs:
           arguments: build ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
           build-root-directory: gradle-plugins
           cache-read-only: ${{ inputs.cache-read-only }}
-
-  examples:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up JDK for running Gradle
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 17
-
-      - name: Set up Gradle cache
-        uses: gradle/gradle-build-action@v2
-        with:
-          cache-read-only: ${{ inputs.cache-read-only }}
-
-      - name: Local publish of artifacts
-        # javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
-        run: ./gradlew publishToMavenLocal -x javadoc
-
-      - name: Local publish of gradle plugins
-        # javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
-        run: ./gradlew publishToMavenLocal -x javadoc
-        working-directory: gradle-plugins
-
-      - name: Build distro
-        run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
-        working-directory: examples/distro
-
-      - name: Build extension
-        run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
-        working-directory: examples/extension
-
-      - name: Run muzzle check against extension
-        run: ./gradlew muzzle --init-script ../../.github/scripts/local.init.gradle.kts
-        working-directory: examples/extension