Merge branch 'main' into FISH-10036-class-cast-ex-deserializing-valid…

…ation-instance-p6 # Conflicts: # core/pom.xml
payara · Dec 3, 2024 · 9c864fb · 9c864fb
2 parents 37f6784 + e0afc6a
commit 9c864fb
Show file tree

Hide file tree

Showing 22 changed files with 56 additions and 121 deletions.
diff --git a/appserver/concurrent/concurrent-impl/pom.xml b/appserver/concurrent/concurrent-impl/pom.xml
@@ -114,7 +114,7 @@
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>5.4.0</version>
+            <version>5.5.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/appserver/extras/docker-images/tests/pom.xml b/appserver/extras/docker-images/tests/pom.xml
@@ -73,13 +73,13 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.20.3</version>
+            <version>1.20.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>1.20.2</version>
+            <version>1.20.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>org.jboss.shrinkwrap.resolver</groupId>
             <artifactId>shrinkwrap-resolver-impl-maven-archive</artifactId>
-            <version>3.3.1</version>
+            <version>3.3.2</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

diff --git a/appserver/jdbc/jdbc-config/pom.xml b/appserver/jdbc/jdbc-config/pom.xml
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>5.4.0</version>
+            <version>5.5.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/appserver/pom.xml b/appserver/pom.xml
@@ -82,10 +82,10 @@
         <!-- Java API for XML Registries Resource Adapter -->
         <jaxr.version>JAXR_RA_20091012</jaxr.version>
 
-        <nimbus-jose-jwt.version>9.41.2</nimbus-jose-jwt.version>
+        <nimbus-jose-jwt.version>9.47</nimbus-jose-jwt.version>
         <accessors-smart.version>2.5.1</accessors-smart.version>
         <json-smart.version>2.5.1</json-smart.version>
-        <reactor-core.version>3.6.10</reactor-core.version>
+        <reactor-core.version>3.7.0</reactor-core.version>
         <reactive-streams.version>1.0.4</reactive-streams.version>
         <jcip-annotations.version>1.0-1</jcip-annotations.version>
 

diff --git a/appserver/tests/fish372-tests/datagrid-tests/pom.xml b/appserver/tests/fish372-tests/datagrid-tests/pom.xml
@@ -186,7 +186,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
         <executions>
           <execution>
             <id>integration-test</id>

diff --git a/appserver/tests/payara-samples/pom.xml b/appserver/tests/payara-samples/pom.xml
@@ -68,6 +68,12 @@
 
         <!-- Exclude unstable tests by default-->
         <excludedGroups>fish.payara.samples.Unstable</excludedGroups>
+
+        <!-- Repackaged versions -->
+        <http-matchers.version>1.1</http-matchers.version>
+        <smallrye-config.version>3.10.1</smallrye-config.version>
+        <smallrye-common.version>2.8.0</smallrye-common.version>
+        <jacc-provider.version>0.3</jacc-provider.version>
     </properties>
 
     <modules>
@@ -307,7 +313,7 @@
             <dependency>
                 <groupId>org.jboss.shrinkwrap.resolver</groupId>
                 <artifactId>shrinkwrap-resolver-bom</artifactId>
-                <version>3.3.1</version>
+                <version>3.3.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -326,9 +332,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.omnifaces</groupId>
+                <groupId>fish.payara.server.internal.tests</groupId>
                 <artifactId>jacc-provider-repackaged</artifactId>
-                <version>0.3</version>
+                <version>${project.version}</version>
                 <classifier>jakartaee9</classifier>
             </dependency>
             <!-- JSON Web Token implementation -->
@@ -345,9 +351,9 @@
             </dependency>
             <!-- Used to automatically configure microprofile rest client in tests -->
             <dependency>
-                <groupId>io.smallrye.config</groupId>
+                <groupId>fish.payara.server.internal.tests</groupId>
                 <artifactId>smallrye-config-repackaged</artifactId>
-                <version>3.10.0</version>
+                <version>${project.version}</version>
                 <classifier>jakartaee9</classifier>
                 <scope>test</scope>
                 <exclusions>
@@ -393,9 +399,9 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>org.valid4j</groupId>
+                <groupId>fish.payara.server.internal.tests</groupId>
                 <artifactId>http-matchers-repackaged</artifactId>
-                <version>1.1</version>
+                <version>${project.version}</version>
                 <classifier>jakartaee9</classifier>
                 <scope>test</scope>
             </dependency>
@@ -466,6 +472,7 @@
                         <payara.microJar>${session.executionRootDirectory}/target/payara-micro-${payara.version}.jar</payara.microJar>
                         <payara.clusterEnabled>true</payara.clusterEnabled>
                         <payara.debug>${payara.debug}</payara.debug>
+                        <payara.version>${payara.version}</payara.version>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
@@ -482,6 +489,7 @@
                         <payara.microJar>${session.executionRootDirectory}/target/payara-micro-${payara.version}.jar</payara.microJar>
                         <payara.clusterEnabled>true</payara.clusterEnabled>
                         <payara.debug>${payara.debug}</payara.debug>
+                        <payara.version>${payara.version}</payara.version>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>

diff --git a/appserver/tests/payara-samples/repackaged/http-matchers-repackaged/pom.xml b/appserver/tests/payara-samples/repackaged/http-matchers-repackaged/pom.xml
@@ -45,9 +45,8 @@
         <artifactId>repackaged</artifactId>
         <version>6.2024.12-SNAPSHOT</version>
     </parent>
-    <groupId>org.valid4j</groupId>
     <artifactId>http-matchers-repackaged</artifactId>
-    <version>1.1</version>
+
     <name>Payara Samples - Payara - http-matchers repackaged as a module</name>
 
     <build>
@@ -116,7 +115,7 @@
         <dependency>
             <groupId>org.valid4j</groupId>
             <artifactId>http-matchers</artifactId>
-            <version>${project.version}</version>
+            <version>${http-matchers.version}</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

diff --git a/appserver/tests/payara-samples/repackaged/jacc-provider-repackaged/pom.xml b/appserver/tests/payara-samples/repackaged/jacc-provider-repackaged/pom.xml
@@ -46,9 +46,7 @@
         <artifactId>repackaged</artifactId>
         <version>6.2024.12-SNAPSHOT</version>
     </parent>
-    <groupId>org.omnifaces</groupId>
     <artifactId>jacc-provider-repackaged</artifactId>
-    <version>0.3</version>
     <name>Payara Samples - Payara - jacc-provider repackaged as a module</name>
 
     <build>
@@ -73,7 +71,7 @@
                         <Embed-Dependency>
                             *;scope=compile;inline=true
                         </Embed-Dependency>
-                        <Export-Package>*;version=${http-matchers.version}</Export-Package>
+                        <Export-Package>*;version=${jacc-provider.version}</Export-Package>
                         <Private-Package>!*</Private-Package>
                     </instructions>
                     <unpackBundle>true</unpackBundle>
@@ -117,21 +115,8 @@
         <dependency>
             <groupId>org.omnifaces</groupId>
             <artifactId>jacc-provider</artifactId>
-            <version>${project.version}</version>
+            <version>${jacc-provider.version}</version>
             <optional>true</optional>
         </dependency>
     </dependencies>
-
-    <repositories>
-        <repository>
-            <id>payara-nexus-artifacts</id>
-            <url>https://nexus.dev.payara.fish/repository/payara-artifacts</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
 </project>
diff --git a/appserver/tests/payara-samples/repackaged/pom.xml b/appserver/tests/payara-samples/repackaged/pom.xml
@@ -41,9 +41,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 
     <modelVersion>4.0.0</modelVersion>
 
+    <parent>
+        <groupId>fish.payara.samples</groupId>
+        <artifactId>payara-samples</artifactId>
+        <version>6.2024.12-SNAPSHOT</version>
+    </parent>
+
     <groupId>fish.payara.server.internal.tests</groupId>
     <artifactId>repackaged</artifactId>
-    <version>6.2024.12-SNAPSHOT</version>
     <name>Payara Samples - Payara - repackaged libs as a module</name>
 
     <packaging>pom</packaging>

diff --git a/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml b/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml
@@ -45,15 +45,9 @@
         <artifactId>repackaged</artifactId>
         <version>6.2024.12-SNAPSHOT</version>
     </parent>
-    <groupId>io.smallrye.config</groupId>
     <artifactId>smallrye-config-repackaged</artifactId>
-    <version>3.10.0</version>
     <name>Payara Samples - Payara - smallrye-config repackaged as a module</name>
 
-    <properties>
-        <smallrye-common.version>2.8.0</smallrye-common.version>
-    </properties>
-
     <build>
         <plugins>
             <plugin>
@@ -76,7 +70,7 @@
                         <Embed-Dependency>
                             *;scope=compile;inline=true
                         </Embed-Dependency>
-                        <Export-Package>*;version=${project.version}</Export-Package>
+                        <Export-Package>*;version=${smallrye-config.version}</Export-Package>
                         <Private-Package>!*</Private-Package>
                     </instructions>
                     <unpackBundle>true</unpackBundle>
@@ -120,19 +114,19 @@
         <dependency>
             <groupId>io.smallrye.config</groupId>
             <artifactId>smallrye-config</artifactId>
-            <version>${project.version}</version>
+            <version>${smallrye-config.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.smallrye.config</groupId>
             <artifactId>smallrye-config-core</artifactId>
-            <version>${project.version}</version>
+            <version>${smallrye-config.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.smallrye.config</groupId>
             <artifactId>smallrye-config-common</artifactId>
-            <version>${project.version}</version>
+            <version>${smallrye-config.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>

diff --git a/appserver/tests/payara-samples/samples/cleanboot/pom.xml b/appserver/tests/payara-samples/samples/cleanboot/pom.xml
@@ -41,7 +41,7 @@
     </parent>
 
     <properties>
-      <playwright.version>1.48.0</playwright.version>
+      <playwright.version>1.49.0</playwright.version>
     </properties>
 
 

diff --git a/appserver/tests/payara-samples/samples/dynamic-roles/pom.xml b/appserver/tests/payara-samples/samples/dynamic-roles/pom.xml
@@ -53,7 +53,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.smallrye.config</groupId>
+            <groupId>fish.payara.server.internal.tests</groupId>
             <artifactId>smallrye-config-repackaged</artifactId>
             <classifier>jakartaee9</classifier>
         </dependency>
@@ -100,7 +100,7 @@
             <artifactId>samples-test-utils</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.valid4j</groupId>
+            <groupId>fish.payara.server.internal.tests</groupId>
             <artifactId>http-matchers-repackaged</artifactId>
             <classifier>jakartaee9</classifier>
             <scope>test</scope>

diff --git a/appserver/tests/payara-samples/samples/jacc-per-app/pom.xml b/appserver/tests/payara-samples/samples/jacc-per-app/pom.xml
@@ -55,7 +55,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.omnifaces</groupId>
+            <groupId>fish.payara.server.internal.tests</groupId>
             <artifactId>jacc-provider-repackaged</artifactId>
             <classifier>jakartaee9</classifier>
             <scope>compile</scope>

diff --git a/...es/jacc-per-app/src/test/java/fish/payara/samples/jaccperapp/InstallJaccProviderTest.java b/...es/jacc-per-app/src/test/java/fish/payara/samples/jaccperapp/InstallJaccProviderTest.java
@@ -83,7 +83,7 @@ public static WebArchive createDeployment() {
         assertNotNull("System property pomPath", pomPath);
         MavenResolvedArtifact jaccLibrary = Maven.resolver()
              .loadPomFromFile(pomPath)
-             .resolve("org.omnifaces:jacc-provider-repackaged:jar:jakartaee9:0.3")
+             .resolve("fish.payara.server.internal.tests:jacc-provider-repackaged:jar:jakartaee9:" + System.getProperty("payara.version"))
              .withTransitivity()
              .asSingleResolvedArtifact();
         WebArchive archive =

diff --git a/appserver/tests/payara-samples/samples/jakartaee-namespace-transformer/pom.xml b/appserver/tests/payara-samples/samples/jakartaee-namespace-transformer/pom.xml
@@ -71,7 +71,7 @@
             <artifactId>htmlunit</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.valid4j</groupId>
+            <groupId>fish.payara.server.internal.tests</groupId>
             <artifactId>http-matchers-repackaged</artifactId>
             <classifier>jakartaee9</classifier>
             <scope>test</scope>

diff --git a/appserver/tests/payara-samples/samples/realm-identity-stores/pom.xml b/appserver/tests/payara-samples/samples/realm-identity-stores/pom.xml
@@ -57,7 +57,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.smallrye.config</groupId>
+            <groupId>fish.payara.server.internal.tests</groupId>
             <artifactId>smallrye-config-repackaged</artifactId>
             <classifier>jakartaee9</classifier>
         </dependency>
@@ -109,7 +109,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.valid4j</groupId>
+            <groupId>fish.payara.server.internal.tests</groupId>
             <artifactId>http-matchers-repackaged</artifactId>
             <classifier>jakartaee9</classifier>
             <scope>test</scope>

diff --git a/appserver/tests/payara-samples/samples/use-bundled-jsf-primefaces/pom.xml b/appserver/tests/payara-samples/samples/use-bundled-jsf-primefaces/pom.xml
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.primefaces</groupId>
             <artifactId>primefaces</artifactId>
-            <version>14.0.6</version>
+            <version>14.0.8</version>
             <classifier>jakarta</classifier>
         </dependency>