Merge pull request #1459 from lprimak/test-payara-jdk21

Dependencies: BouncyCastle 1.78.1 and Payara updates
apache · May 6, 2024 · 81f8a06 · 81f8a06
2 parents ea0f878 + 7440c89
commit 81f8a06
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -38,15 +38,15 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
-          java-version: 21
+          java-version: 11
           distribution: temurin
 
       - name: License Check
         run: mvn apache-rat:check "-Drat.consoleOutput"
 
       - name: Build with Maven
         run: >-
-          mvn verify --show-version --errors --batch-mode --no-transfer-progress -Pdocs,skip_jakarta_ee_tests
+          mvn verify --show-version --errors --batch-mode --no-transfer-progress -Pdocs
           -Dgh_user=${{ github.actor }} -Dgh_token=${{ secrets.GITHUB_TOKEN }}
 
   build-all:
@@ -60,7 +60,7 @@ jobs:
         exclude:
           # was already built
           - os: 'ubuntu-latest'
-            jdk: 21
+            jdk: 11
             dist: 'temurin'
           # exclude temurin on MacOS. zulu (also hotspot) and OpenJ9 are sufficient.
           - os: 'macOS-latest'

diff --git a/integration-tests/jakarta-ee/pom.xml b/integration-tests/jakarta-ee/pom.xml
@@ -41,7 +41,7 @@
         <arquillian.graphene.version>3.0.0-alpha.4</arquillian.graphene.version>
         <webdriver.browser>firefox</webdriver.browser>
 
-        <payara.version>5.2022.5</payara.version>
+        <payara.version>5.2022.5.jdk21</payara.version>
         <payara.start.skip>${skipITs}</payara.start.skip>
         <asadmin.cmd>asadmin</asadmin.cmd>
         <unix-sed-skip>${payara.start.skip}</unix-sed-skip>
@@ -276,7 +276,7 @@
                     <overWriteIfNewer>false</overWriteIfNewer>
                     <artifactItems>
                         <artifactItem>
-                            <groupId>fish.payara.distributions</groupId>
+                            <groupId>com.flowlogix.payara</groupId>
                             <artifactId>payara</artifactId>
                             <version>${payara.version}</version>
                             <type>zip</type>

diff --git a/pom.xml b/pom.xml
@@ -115,7 +115,7 @@
         <guice.version>4.2.3</guice.version>
         <jaxrs.api.version>2.1.6</jaxrs.api.version>
         <htmlunit.version>4.1.0</htmlunit.version>
-        <bouncycastle.version>1.77</bouncycastle.version>
+        <bouncycastle.version>1.78.1</bouncycastle.version>
 
         <!-- Test 3rd-party dependencies: -->
         <easymock.version>5.2.0</easymock.version>