From d45b53b19405b586ef9ca6d1c7cbaf1f78e8f004 Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 11:38:55 +0100
Subject: [PATCH 01/24] Cleanup duplicate dependency

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 MicroProfile-OpenTracing/pom.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/MicroProfile-OpenTracing/pom.xml b/MicroProfile-OpenTracing/pom.xml
index 6f9963e..95537b1 100644
--- a/MicroProfile-OpenTracing/pom.xml
+++ b/MicroProfile-OpenTracing/pom.xml
@@ -2,7 +2,7 @@
 <!--
    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-   Copyright (c) [2017-2021] Payara Foundation and/or its affiliates. All rights reserved.
+   Copyright (c) 2017-2025 Payara Foundation and/or its affiliates. All rights reserved.
 
    The contents of this file are subject to the terms of either the GNU
    General Public License Version 2 only ("GPL") or the Common Development
@@ -95,12 +95,6 @@
             <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.microprofile.opentracing</groupId>
-            <artifactId>microprofile-opentracing-api</artifactId>
-            <version>3.0</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>

From 58f5df9f197c85bbc72370a8c10c4fa5ff402dd4 Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 11:39:51 +0100
Subject: [PATCH 02/24] Update JAR plugin to 3.4.2

Also cleans up warnings about missing versions

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 MicroProfile-Rest-Client/smallrye-config-repackaged/pom.xml | 2 ++
 summarizer/pom.xml                                          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/MicroProfile-Rest-Client/smallrye-config-repackaged/pom.xml b/MicroProfile-Rest-Client/smallrye-config-repackaged/pom.xml
index f4a3ab7..bd0d6c0 100644
--- a/MicroProfile-Rest-Client/smallrye-config-repackaged/pom.xml
+++ b/MicroProfile-Rest-Client/smallrye-config-repackaged/pom.xml
@@ -16,6 +16,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
                 <executions>
                     <execution>
                         <id>default-jar</id>
@@ -149,6 +150,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-jar-plugin</artifactId>
+                        <version>3.4.2</version>
                         <executions>
                             <execution>
                                 <id>create-empty-javadoc-jar</id>
diff --git a/summarizer/pom.xml b/summarizer/pom.xml
index 05bf1d5..dc02342 100644
--- a/summarizer/pom.xml
+++ b/summarizer/pom.xml
@@ -79,7 +79,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.2</version>
                 <configuration>
                     <archive>
                         <manifest>

From 25aec29e43435c97153dbcf73c9ab699e1a52854 Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 11:40:33 +0100
Subject: [PATCH 03/24] Update failsafe plugin to 3.5.4

Also cleans up warnings about missing versions

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 MicroProfile-Rest-Client/smallrye-config-repackaged/pom.xml | 1 +
 pom.xml                                                     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/MicroProfile-Rest-Client/smallrye-config-repackaged/pom.xml b/MicroProfile-Rest-Client/smallrye-config-repackaged/pom.xml
index bd0d6c0..afb8b67 100644
--- a/MicroProfile-Rest-Client/smallrye-config-repackaged/pom.xml
+++ b/MicroProfile-Rest-Client/smallrye-config-repackaged/pom.xml
@@ -69,6 +69,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
+                <version>3.5.4</version>
                 <configuration>
                     <skipTests>true</skipTests>
                 </configuration>
diff --git a/pom.xml b/pom.xml
index 3967e60..00f8bdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -599,7 +599,7 @@
                 <!-- Configure failsafe plugin to run integration tests -->
                 <plugin>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>3.0.0-M5</version>
+                    <version>3.5.4</version>
                     <executions>
                         <execution>
                             <phase>integration-test</phase>

From 7064797ab3eadd0cfa4f33b1d40cd5cf8ac2ecf4 Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 11:40:49 +0100
Subject: [PATCH 04/24] Update copyright

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 00f8bdc..fb2874b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <!--
    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-   Copyright (c) [2018-2021] Payara Foundation and/or its affiliates. All rights reserved.
+   Copyright (c) 2018-2025 Payara Foundation and/or its affiliates. All rights reserved.
 
    The contents of this file are subject to the terms of either the GNU
    General Public License Version 2 only ("GPL") or the Common Development

From 7dead2b45dd3a36bf02f4ec0ff73b435a1d79eac Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 11:41:06 +0100
Subject: [PATCH 05/24] Update jaxb to 4.0.4

Aligns with Payara BOM

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fb2874b..6b2dcc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
         <tyrus.version>2.1.5.payara-p2</tyrus.version>
         <jersey.version>3.1.11.payara-p1</jersey.version>
         <cdi.version>4.0.1</cdi.version>
-        <jaxb.version>4.0.0</jaxb.version>
+        <jaxb.version>4.0.4</jaxb.version>
 
         <!-- Payara Dependencies -->
         <payara.version>6.2025.10-SNAPSHOT</payara.version>

From 4a7d71e281dc651aa1e8447092a3e9c9a8540a0f Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 11:41:36 +0100
Subject: [PATCH 06/24] Update SLF4J to 1.7.36

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6b2dcc3..6d16aea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
-            <version>1.7.30</version>
+            <version>1.7.36</version>
         </dependency>
         <dependency>
             <groupId>jakarta.enterprise</groupId>

From c2f925be37056f5739ea8473a3d3d475e12d27bf Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 11:42:12 +0100
Subject: [PATCH 07/24] Update Payara Arquillian to 3.1

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6d16aea..954a014 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
 
         <!-- Arquillian Dependencies -->
         <version.arquillian>1.7.0.Alpha14</version.arquillian>
-        <payara.arquillian.container.version>3.0.alpha8</payara.arquillian.container.version>
+        <payara.arquillian.container.version>3.1</payara.arquillian.container.version>
 
         <!-- Embedded Dependencies -->
         <tyrus.version>2.1.5.payara-p2</tyrus.version>

From 1a2f2f166854213d04d5ccf3e581df0ce307c0a6 Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 11:43:00 +0100
Subject: [PATCH 08/24] Update Arquillian to 1.7.2.Final

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 954a014..98dd440 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
         <maven.compiler.target>11</maven.compiler.target>
 
         <!-- Arquillian Dependencies -->
-        <version.arquillian>1.7.0.Alpha14</version.arquillian>
+        <version.arquillian>1.7.2.Final</version.arquillian>
         <payara.arquillian.container.version>3.1</payara.arquillian.container.version>
 
         <!-- Embedded Dependencies -->

From cbe62f32f357e5f1689eace3ab6b721b593e483f Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 11:43:11 +0100
Subject: [PATCH 09/24] Remove redundant profile

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 pom.xml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 98dd440..872b052 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,19 +135,6 @@
 
     <!-- Profile specific dependencies -->
     <profiles>
-        <profile>
-            <id>payara5plus</id>
-            <activation>
-                <property>
-                    <name>payara.version</name>
-                    <!-- not payara 4 -->
-                    <value>/(?!4).+/</value>
-                </property>
-            </activation>
-            <modules>
-                <module>MicroProfile-OpenTracing</module>
-            </modules>
-        </profile>
         <profile>
             <id>payara-server-managed</id>
             <activation>

From 50a32e25fdfa16fb3dbfe8ead0a41ebf3731b623 Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 11:51:38 +0100
Subject: [PATCH 10/24] FISH-12300 First stab at Micro Platform Managed profile

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 872b052..8db44f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -239,6 +239,12 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>payara-micro-platform</id>
+            <properties>
+                <payara.micro.distribution.suffix>-platform</payara.micro.distribution.suffix>
+            </properties>
+        </profile>
         <profile>
             <id>payara-micro-remote</id>
             <dependencies>

From f7b5b56eae7394b9db99d10c4d334b9bfb570f5c Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 14:26:45 +0100
Subject: [PATCH 11/24] FISH-12300 Use suffix system instead

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 pom.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8db44f0..7865e87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,9 +68,10 @@
         <jaxb.version>4.0.4</jaxb.version>
 
         <!-- Payara Dependencies -->
-        <payara.version>6.2025.10-SNAPSHOT</payara.version>
+        <payara.version>6.32.0-SNAPSHOT</payara.version>
         <payara.home>${mptck.basedir}/target/payara6</payara.home>
-        <payara.microJar>${mptck.basedir}/target/payara-micro-${payara.version}.jar</payara.microJar>
+        <payara.micro.distribution.suffix></payara.micro.distribution.suffix>
+        <payara.microJar>${mptck.basedir}/target/payara-micro${payara.micro.distribution.suffix}-${payara.version}.jar</payara.microJar>
         <micro.randomPort>true</micro.randomPort>
         <payara_domain>domain1</payara_domain>
     </properties>
@@ -215,12 +216,12 @@
                                     <artifactItems>
                                         <artifactItem>
                                             <groupId>fish.payara.extras</groupId>
-                                            <artifactId>payara-micro</artifactId>
+                                            <artifactId>payara-micro${payara.micro.distribution.suffix}</artifactId>
                                             <version>${payara.version}</version>
                                             <overWrite>false</overWrite>
                                             <type>jar</type>
                                             <outputDirectory>${mptck.basedir}/target/</outputDirectory>
-                                            <destFileName>payara-micro-${payara.version}.jar</destFileName>
+                                            <destFileName>payara-micro${payara.micro.distribution.suffix}-${payara.version}.jar</destFileName>
                                         </artifactItem>
                                     </artifactItems>
                                 </configuration>

From 67c1367918a629e5eb75ee6d415888ded4d3db44 Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 14:32:05 +0100
Subject: [PATCH 12/24] Use XML-Bind API version from BOM

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7865e87..6c1b223 100644
--- a/pom.xml
+++ b/pom.xml
@@ -311,7 +311,6 @@
                 <dependency>
                     <groupId>jakarta.xml.bind</groupId>
                     <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>4.0.0-RC2</version>
                 </dependency>
                 <dependency>
                     <groupId>jakarta.activation</groupId>

From 932c6038f4ae3560b852ef2156a0bd6666f1b84d Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 14:32:19 +0100
Subject: [PATCH 13/24] Use Activation API version from BOM

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6c1b223..b68367a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -315,7 +315,6 @@
                 <dependency>
                     <groupId>jakarta.activation</groupId>
                     <artifactId>jakarta.activation-api</artifactId>
-                    <version>2.1.0-RC1</version>
                 </dependency>
             </dependencies>
         </profile>

From 15dfc525748d2a43609d29a7599caefec6a2816b Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 14:33:21 +0100
Subject: [PATCH 14/24] Use Jersey MP Rest client version from BOM

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 MicroProfile-Rest-Client/tck-runners/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MicroProfile-Rest-Client/tck-runners/pom.xml b/MicroProfile-Rest-Client/tck-runners/pom.xml
index f67b643..11628a8 100644
--- a/MicroProfile-Rest-Client/tck-runners/pom.xml
+++ b/MicroProfile-Rest-Client/tck-runners/pom.xml
@@ -149,7 +149,6 @@
         <dependency>
             <groupId>org.glassfish.jersey.ext.microprofile</groupId>
             <artifactId>jersey-mp-rest-client</artifactId>
-            <version>${jersey.version}</version>
             <scope>test</scope>
         </dependency>
         <!-- TCK needs standalone mp config implementation. Ours works only remotely -->

From d96de43141aae8a23e699d1962f199c374db440d Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 14:38:13 +0100
Subject: [PATCH 15/24] Remove redundant profile and property versions

Use the version from the Payara BOM

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 MicroProfile-Config/pom.xml  |  2 --
 MicroProfile-Metrics/pom.xml |  5 -----
 pom.xml                      | 26 ++++----------------------
 3 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/MicroProfile-Config/pom.xml b/MicroProfile-Config/pom.xml
index 9f700d6..005b8e5 100644
--- a/MicroProfile-Config/pom.xml
+++ b/MicroProfile-Config/pom.xml
@@ -61,7 +61,6 @@
         <micro.randomPort>false</micro.randomPort>
         
     	<!-- Other Test Dependencies -->
-    	<cdi.version>4.0.1</cdi.version>
         <payara.executable>${payara.home}/bin/asadmin</payara.executable>
     </properties>
 
@@ -90,7 +89,6 @@
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <version>${cdi.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/MicroProfile-Metrics/pom.xml b/MicroProfile-Metrics/pom.xml
index 2246166..a460f2b 100644
--- a/MicroProfile-Metrics/pom.xml
+++ b/MicroProfile-Metrics/pom.xml
@@ -58,10 +58,6 @@
         <microprofile.metrics.version>5.1.0.payara-p1</microprofile.metrics.version>
         <microprofile.metrics.tck.version>5.1.0.payara-p1</microprofile.metrics.tck.version>
         <micro.randomPort>false</micro.randomPort>
-
-        <!-- Other Test Dependencies -->
-        <cdi.version>4.0.1</cdi.version>
-        <jaxb.version>4.0.0</jaxb.version>
     </properties>
 
     <dependencies>
@@ -110,7 +106,6 @@
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <version>${cdi.version}</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/pom.xml b/pom.xml
index b68367a..6f67c3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,11 +61,7 @@
         <version.arquillian>1.7.2.Final</version.arquillian>
         <payara.arquillian.container.version>3.1</payara.arquillian.container.version>
 
-        <!-- Embedded Dependencies -->
-        <tyrus.version>2.1.5.payara-p2</tyrus.version>
         <jersey.version>3.1.11.payara-p1</jersey.version>
-        <cdi.version>4.0.1</cdi.version>
-        <jaxb.version>4.0.4</jaxb.version>
 
         <!-- Payara Dependencies -->
         <payara.version>6.32.0-SNAPSHOT</payara.version>
@@ -124,13 +120,15 @@
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <version>${cdi.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>${jaxb.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
         </dependency>
     </dependencies>
 
@@ -302,22 +300,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>jdk11</id>
-            <activation>
-                <jdk>11</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
         <profile>
             <id>parallel</id>
             <properties>

From a29838f75223fe287daa546daa977f784842ddf2 Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 15:06:08 +0100
Subject: [PATCH 16/24] Rework profiles

More closely aligns the config and profiles with that of the more up-to-date JakartaEE-10-TCK-Runners repo.

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 MicroProfile-Config/pom.xml                   |   2 +-
 MicroProfile-OpenAPI/pom.xml                  |   2 +-
 MicroProfile-OpenTracing/pom.xml              |   2 +-
 .../tck-runners/apache-http-client/pom.xml    |   4 +-
 pom.xml                                       | 195 +++++++-----------
 5 files changed, 75 insertions(+), 130 deletions(-)

diff --git a/MicroProfile-Config/pom.xml b/MicroProfile-Config/pom.xml
index 005b8e5..9323a00 100644
--- a/MicroProfile-Config/pom.xml
+++ b/MicroProfile-Config/pom.xml
@@ -148,7 +148,7 @@
                             <target if="payara.server.remote">
                                 <exec executable="${payara.executable}">
                                     <arg value="restart-domain" />
-                                    <arg value="${payara_domain}" />
+                                    <arg value="${payara.domain}" />
                                 </exec>
                             </target>
                         </configuration>
diff --git a/MicroProfile-OpenAPI/pom.xml b/MicroProfile-OpenAPI/pom.xml
index 506263e..f9eae92 100644
--- a/MicroProfile-OpenAPI/pom.xml
+++ b/MicroProfile-OpenAPI/pom.xml
@@ -160,7 +160,7 @@
                             <target if="payara.server.remote">
                                 <exec executable="${payara.executable}">
                                     <arg value="restart-domain" />
-                                    <arg value="${payara_domain}" />
+                                    <arg value="${payara.domain}" />
                                 </exec>
                             </target>
                         </configuration>
diff --git a/MicroProfile-OpenTracing/pom.xml b/MicroProfile-OpenTracing/pom.xml
index 95537b1..432ee49 100644
--- a/MicroProfile-OpenTracing/pom.xml
+++ b/MicroProfile-OpenTracing/pom.xml
@@ -192,7 +192,7 @@
                             <target if="payara.server.remote">
                                 <exec executable="${payara.executable}">
                                     <arg value="restart-domain" />
-                                    <arg value="${payara_domain}" />
+                                    <arg value="${payara.domain}" />
                                 </exec>
                             </target>
                         </configuration>
diff --git a/MicroProfile-Rest-Client/tck-runners/apache-http-client/pom.xml b/MicroProfile-Rest-Client/tck-runners/apache-http-client/pom.xml
index 528819f..ff7a1d9 100644
--- a/MicroProfile-Rest-Client/tck-runners/apache-http-client/pom.xml
+++ b/MicroProfile-Rest-Client/tck-runners/apache-http-client/pom.xml
@@ -155,7 +155,7 @@
                             <target if="payara.server.remote">
                                 <exec executable="${payara.executable}">
                                     <arg value="restart-domain"/>
-                                    <arg value="${payara_domain}"/>
+                                    <arg value="${payara.domain}"/>
                                 </exec>
                             </target>
                         </configuration>
@@ -195,7 +195,7 @@
                             <target if="payara.server.remote">
                                 <exec executable="${payara.executable}">
                                     <arg value="restart-domain"/>
-                                    <arg value="${payara_domain}"/>
+                                    <arg value="${payara.domain}"/>
                                 </exec>
                             </target>
                         </configuration>
diff --git a/pom.xml b/pom.xml
index 6f67c3a..3392eb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,13 +63,20 @@
 
         <jersey.version>3.1.11.payara-p1</jersey.version>
 
-        <!-- Payara Dependencies -->
+        <!-- Payara Properties -->
         <payara.version>6.32.0-SNAPSHOT</payara.version>
-        <payara.home>${mptck.basedir}/target/payara6</payara.home>
-        <payara.micro.distribution.suffix></payara.micro.distribution.suffix>
-        <payara.microJar>${mptck.basedir}/target/payara-micro${payara.micro.distribution.suffix}-${payara.version}.jar</payara.microJar>
+        <payara.home>${maven.multiModuleProjectDirectory}${file.separator}target${file.separator}payara7</payara.home>
+        <payara.server.distribution.suffix></payara.server.distribution.suffix>
+        <payara.micro.distribution.suffix>-platform</payara.micro.distribution.suffix>
+        <payara.embedded.distribution.suffix>-all</payara.embedded.distribution.suffix>
+        <payara.micro.jar>${maven.multiModuleProjectDirectory}${file.separator}target${file.separator}payara-micro${payara.micro.distribution.suffix}-${payara.version}.jar</payara.micro.jar>
         <micro.randomPort>true</micro.randomPort>
-        <payara_domain>domain1</payara_domain>
+        <payara.domain>domain1</payara.domain>
+
+        <!-- Control Properties -->
+        <skipTests>false</skipTests>
+        <skipConfig>${skipTests}</skipConfig>
+        <skipServerStartStop>${skipTests}</skipServerStartStop>
     </properties>
 
     <modules>
@@ -149,6 +156,11 @@
                     <version>${payara.arquillian.container.version}</version>
                     <optional>true</optional>
                 </dependency>
+                <dependency>
+                    <groupId>fish.payara.distributions</groupId>
+                    <artifactId>payara${payara.server.distribution.suffix}</artifactId>
+                    <type>zip</type>
+                </dependency>
             </dependencies>
             <build>
                 <plugins>
@@ -163,6 +175,51 @@
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>unpack-server</id>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <phase>pre-integration-test</phase>
+                                <inherited>false</inherited>
+                                <configuration>
+                                    <skip>${skipConfig}</skip>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>fish.payara.distributions</groupId>
+                                            <artifactId>payara${payara.server.distribution.suffix}</artifactId>
+                                            <version>${payara.version}</version>
+                                            <type>zip</type>
+                                            <overWrite>true</overWrite>
+                                            <outputDirectory>${maven.multiModuleProjectDirectory}${file.separator}target</outputDirectory>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <payara.home>${payara.home}</payara.home>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <payara.home>${payara.home}</payara.home>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
                 </plugins>
             </build>
         </profile>
@@ -218,7 +275,7 @@
                                             <version>${payara.version}</version>
                                             <overWrite>false</overWrite>
                                             <type>jar</type>
-                                            <outputDirectory>${mptck.basedir}/target/</outputDirectory>
+                                            <outputDirectory>${maven.multiModuleProjectDirectory}/target/</outputDirectory>
                                             <destFileName>payara-micro${payara.micro.distribution.suffix}-${payara.version}.jar</destFileName>
                                         </artifactItem>
                                     </artifactItems>
@@ -239,9 +296,11 @@
             </build>
         </profile>
         <profile>
-            <id>payara-micro-platform</id>
+            <id>web</id>
             <properties>
-                <payara.micro.distribution.suffix>-platform</payara.micro.distribution.suffix>
+                <payara.server.distribution.suffix>-web</payara.server.distribution.suffix>
+                <payara.micro.distribution.suffix></payara.micro.distribution.suffix>
+                <payara.embedded.distribution.suffix>-web</payara.embedded.distribution.suffix>
             </properties>
         </profile>
         <profile>
@@ -274,7 +333,7 @@
                 </dependency>
                 <dependency>
                     <groupId>fish.payara.extras</groupId>
-                    <artifactId>payara-embedded-all</artifactId>
+                    <artifactId>payara-embedded${payara.embedded.distribution.suffix}</artifactId>
                     <version>${payara.version}</version>
                     <scope>test</scope>
                 </dependency>
@@ -347,79 +406,6 @@
                 </pluginManagement>
             </build>
         </profile>
-        <profile>
-            <id>full-distribution</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <!-- Copy the Payara artifact into the target directory -->
-                        <plugin>
-                            <artifactId>maven-dependency-plugin</artifactId>
-                            <executions>
-                                <execution>
-                                    <phase>process-test-resources</phase>
-                                    <goals>
-                                        <goal>unpack</goal>
-                                    </goals>
-                                    <configuration>
-                                        <outputDirectory>${mptck.basedir}/target</outputDirectory>
-                                        <markersDirectory>${mptck.basedir}/target/dependency-maven-plugin-markers</markersDirectory>
-                                        <artifactItems>
-                                            <artifactItem>
-                                                <groupId>fish.payara.distributions</groupId>
-                                                <artifactId>payara</artifactId>
-                                                <version>${payara.version}</version>
-                                                <type>zip</type>
-                                                <overWrite>false</overWrite>
-                                                <outputDirectory>${mptck.basedir}/target</outputDirectory>
-                                            </artifactItem>
-                                        </artifactItems>
-                                    </configuration>
-                                </execution>
-                            </executions>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-        <profile>
-            <id>web-distribution</id>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <!-- Copy the Payara artifact into the target directory -->
-                        <plugin>
-                            <artifactId>maven-dependency-plugin</artifactId>
-                            <executions>
-                                <execution>
-                                    <phase>process-test-resources</phase>
-                                    <goals>
-                                        <goal>unpack</goal>
-                                    </goals>
-                                    <configuration>
-                                        <outputDirectory>${mptck.basedir}/target</outputDirectory>
-                                        <markersDirectory>${mptck.basedir}/target/dependency-maven-plugin-markers</markersDirectory>
-                                        <artifactItems>
-                                            <artifactItem>
-                                                <groupId>fish.payara.distributions</groupId>
-                                                <artifactId>payara-web</artifactId>
-                                                <version>${payara.version}</version>
-                                                <type>zip</type>
-                                                <overWrite>false</overWrite>
-                                                <outputDirectory>${mptck.basedir}/target</outputDirectory>
-                                            </artifactItem>
-                                        </artifactItems>
-                                    </configuration>
-                                </execution>
-                            </executions>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
     </profiles>
 
     <dependencyManagement>
@@ -525,47 +511,6 @@
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.commonjava.maven.plugins</groupId>
-                <artifactId>directory-maven-plugin</artifactId>
-                <version>0.3.1</version>
-                <executions>
-                    <execution>
-                        <id>directories</id>
-                        <goals>
-                            <goal>directory-of</goal>
-                        </goals>
-                        <phase>validate</phase>
-                        <configuration>
-                            <property>mptck.basedir</property>
-                            <project>
-                                <groupId>fish.payara.microprofile</groupId>
-                                <artifactId>tck-suite-parent</artifactId>
-                            </project>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.2.0</version>
-                <executions>
-                    <execution>
-                        <id>selectively-disable-tests</id>
-                        <goals>
-                            <goal>regex-property</goal>
-                        </goals>
-                        <configuration>
-                            <name>skipITs</name>
-                            <value>${project.artifactId}</value>
-                            <regex>(tck-suite-parent)|(parent)|(tck-arquillian-extension)</regex>
-                            <replacement>true</replacement>
-                            <failIfNoMatch>false</failIfNoMatch>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
 
         <pluginManagement>
@@ -592,8 +537,8 @@
                     <configuration>
                         <systemPropertyVariables>
                             <payara.home>${payara.home}</payara.home>
-                            <payara.microJar>${payara.microJar}</payara.microJar>
-                            <arquillian.xml>${mptck.basedir}/src/test/resources/arquillian.xml</arquillian.xml>
+                            <payara.microJar>${payara.micro.jar}</payara.microJar>
+                            <arquillian.xml>${maven.multiModuleProjectDirectory}/src/test/resources/arquillian.xml</arquillian.xml>
                         </systemPropertyVariables>
                         <suiteXmlFiles>
                             <file>${mptck.suite}</file>

From 152c8f04d33b94c4e236e4e4bc8e899eac88ee4c Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 15:07:14 +0100
Subject: [PATCH 17/24] Don't change payara version

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3392eb7..048b747 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <jersey.version>3.1.11.payara-p1</jersey.version>
 
         <!-- Payara Properties -->
-        <payara.version>6.32.0-SNAPSHOT</payara.version>
+        <payara.version>6.2025.10-SNAPSHOT</payara.version>
         <payara.home>${maven.multiModuleProjectDirectory}${file.separator}target${file.separator}payara7</payara.home>
         <payara.server.distribution.suffix></payara.server.distribution.suffix>
         <payara.micro.distribution.suffix>-platform</payara.micro.distribution.suffix>

From 0b594c8f9787c0e54c4046615f8ed6c7719d73da Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 15:15:32 +0100
Subject: [PATCH 18/24] Cleanup copy-paste errors

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 pom.xml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 048b747..57583ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <jersey.version>3.1.11.payara-p1</jersey.version>
 
         <!-- Payara Properties -->
-        <payara.version>6.2025.10-SNAPSHOT</payara.version>
+        <payara.version>6.32.0-SNAPSHOT</payara.version>
         <payara.home>${maven.multiModuleProjectDirectory}${file.separator}target${file.separator}payara7</payara.home>
         <payara.server.distribution.suffix></payara.server.distribution.suffix>
         <payara.micro.distribution.suffix>-platform</payara.micro.distribution.suffix>
@@ -164,14 +164,12 @@
             </dependencies>
             <build>
                 <plugins>
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                    </plugin>
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <configuration>
                             <systemPropertyVariables>
                                 <arquillian.launch>payara-server-managed</arquillian.launch>
+                                <payara.home>${payara.home}</payara.home>
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>
@@ -206,14 +204,7 @@
 
                     <plugin>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <payara.home>${payara.home}</payara.home>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>3.5.4</version>
                         <configuration>
                             <systemPropertyVariables>
                                 <payara.home>${payara.home}</payara.home>

From 992bce0deb642c2966ed22d72d0136a0bf59c523 Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 15:19:18 +0100
Subject: [PATCH 19/24] Remove old unused dependency

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 pom.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 57583ad..bbd3975 100644
--- a/pom.xml
+++ b/pom.xml
@@ -433,18 +433,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>fish.payara.arquillian</groupId>
-                <artifactId>payara-client-ee7</artifactId>
-                <version>${payara.arquillian.container.version}</version>
-                <scope>test</scope>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.eclipse</groupId>
-                        <artifactId>yasson</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>fish.payara.arquillian</groupId>
                 <artifactId>environment-setup</artifactId>

From dc10ecf541446872c3fe40c8497de4ada0d6094c Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 15:25:52 +0100
Subject: [PATCH 20/24] Reintroduce build helper, and fix payara.home

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 pom.xml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bbd3975..b394c8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
 
         <!-- Payara Properties -->
         <payara.version>6.32.0-SNAPSHOT</payara.version>
-        <payara.home>${maven.multiModuleProjectDirectory}${file.separator}target${file.separator}payara7</payara.home>
+        <payara.home>${maven.multiModuleProjectDirectory}${file.separator}target${file.separator}payara6</payara.home>
         <payara.server.distribution.suffix></payara.server.distribution.suffix>
         <payara.micro.distribution.suffix>-platform</payara.micro.distribution.suffix>
         <payara.embedded.distribution.suffix>-all</payara.embedded.distribution.suffix>
@@ -490,6 +490,26 @@
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>selectively-disable-tests</id>
+                        <goals>
+                            <goal>regex-property</goal>
+                        </goals>
+                        <configuration>
+                            <name>skipITs</name>
+                            <value>${project.artifactId}</value>
+                            <regex>(tck-suite-parent)|(parent)|(tck-arquillian-extension)</regex>
+                            <replacement>true</replacement>
+                            <failIfNoMatch>false</failIfNoMatch>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
 
         <pluginManagement>

From a39e794777883cd9ae9dbe2de07206a727a706a8 Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 15:27:19 +0100
Subject: [PATCH 21/24] Don't change payara.version

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b394c8a..a11cb6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <jersey.version>3.1.11.payara-p1</jersey.version>
 
         <!-- Payara Properties -->
-        <payara.version>6.32.0-SNAPSHOT</payara.version>
+        <payara.version>6.2025.10-SNAPSHOT</payara.version>
         <payara.home>${maven.multiModuleProjectDirectory}${file.separator}target${file.separator}payara6</payara.home>
         <payara.server.distribution.suffix></payara.server.distribution.suffix>
         <payara.micro.distribution.suffix>-platform</payara.micro.distribution.suffix>

From 2f4cae545f1eff1610e349dab0dc1ae7f83063f1 Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 15:33:17 +0100
Subject: [PATCH 22/24] Fix dependency groupId

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a11cb6b..1ce2152 100644
--- a/pom.xml
+++ b/pom.xml
@@ -329,7 +329,7 @@
                     <scope>test</scope>
                 </dependency>
                 <dependency>
-                    <groupId>org.glassfish</groupId>
+                    <groupId>org.eclipse.parsson</groupId>
                     <artifactId>jakarta.json</artifactId>
                     <scope>test</scope>
                 </dependency>

From 89d352acfb8fb3ff12e6e4b493c973c1376f8fa3 Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 15:36:51 +0100
Subject: [PATCH 23/24] Align repositories with main Payara codebase

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 pom.xml | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 133 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1ce2152..3da440b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,9 @@
         <skipTests>false</skipTests>
         <skipConfig>${skipTests}</skipConfig>
         <skipServerStartStop>${skipTests}</skipServerStartStop>
+
+        <payara-nexus-staging.repo.releases.enabled>false</payara-nexus-staging.repo.releases.enabled>
+        <payara-nexus-staging.repo.snapshots.enabled>false</payara-nexus-staging.repo.snapshots.enabled>
     </properties>
 
     <modules>
@@ -557,10 +560,33 @@
         </pluginManagement>
     </build>
 
+
     <repositories>
+        <!-- Try Maven central first, not last, which happens when omitted here -->
+        <repository>
+            <id>central</id>
+            <name>Central Repository</name>
+            <url>https://repo.maven.apache.org/maven2</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>ossrh-snapshots</id>
+            <name>Sonatype OSSRH Snapshot Repository</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
         <repository>
             <id>payara-nexus-artifacts</id>
-            <name>Payara Nexus Artifacts</name>
             <url>https://nexus.dev.payara.fish/repository/payara-artifacts</url>
             <releases>
                 <enabled>true</enabled>
@@ -569,5 +595,111 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>payara-nexus-enterprise-artifacts</id>
+            <url>https://nexus.dev.payara.fish/repository/payara-enterprise-artifacts-private</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>payara-nexus-enterprise-distributions</id>
+            <url>https://nexus.dev.payara.fish/repository/payara-enterprise</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>payara-nexus-enterprise-snapshots</id>
+            <url>https://nexus.dev.payara.fish/repository/payara-enterprise-snapshots-private</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>payara-nexus-snapshots</id>
+            <url>https://nexus.dev.payara.fish/repository/payara-snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>payara-nexus-staging</id>
+            <url>https://nexus.dev.payara.fish/repository/payara-staging</url>
+            <releases>
+                <enabled>${payara-nexus-staging.repo.releases.enabled}</enabled>
+            </releases>
+            <snapshots>
+                <enabled>${payara-nexus-staging.repo.snapshots.enabled}</enabled>
+            </snapshots>
+        </repository>
     </repositories>
+
+    <pluginRepositories>
+        <!-- Try Maven central first, not last, which happens when omitted here -->
+        <pluginRepository>
+            <id>central</id>
+            <name>Central Repository</name>
+            <url>https://repo.maven.apache.org/maven2</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>ossrh-snapshots</id>
+            <name>Sonatype OSSRH Snapshot Repository</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <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>
+        </pluginRepository>
+        <pluginRepository>
+            <id>payara-nexus-snapshots</id>
+            <url>https://nexus.dev.payara.fish/repository/payara-snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>payara-nexus-staging</id>
+            <url>https://nexus.dev.payara.fish/repository/payara-staging</url>
+            <releases>
+                <enabled>${payara-nexus-staging.repo.releases.enabled}</enabled>
+            </releases>
+            <snapshots>
+                <enabled>${payara-nexus-staging.repo.snapshots.enabled}</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
 </project>

From 017ec389182d8d9ccc2dac7337899e6baa58d8ec Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 16 Oct 2025 17:13:32 +0100
Subject: [PATCH 24/24] Rename micro.randomPort and only activate when using
 parallel profile

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 MicroProfile-Config/pom.xml                  | 2 +-
 MicroProfile-JWT-Auth/tck-runner/pom.xml     | 2 +-
 MicroProfile-Metrics/pom.xml                 | 2 +-
 MicroProfile-Rest-Client/tck-runners/pom.xml | 2 +-
 pom.xml                                      | 5 +++--
 src/test/resources/arquillian.xml            | 4 ++--
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/MicroProfile-Config/pom.xml b/MicroProfile-Config/pom.xml
index 9323a00..cd39741 100644
--- a/MicroProfile-Config/pom.xml
+++ b/MicroProfile-Config/pom.xml
@@ -58,7 +58,7 @@
         <microprofile.config.version>3.1</microprofile.config.version>
         <microprofile.config.tck.version>3.1</microprofile.config.tck.version>
         <mptck.suite>${basedir}/src/test/resources/tck-suite.xml</mptck.suite>
-        <micro.randomPort>false</micro.randomPort>
+        <micro.random.port>false</micro.random.port>
         
     	<!-- Other Test Dependencies -->
         <payara.executable>${payara.home}/bin/asadmin</payara.executable>
diff --git a/MicroProfile-JWT-Auth/tck-runner/pom.xml b/MicroProfile-JWT-Auth/tck-runner/pom.xml
index 7192935..b92bfe0 100644
--- a/MicroProfile-JWT-Auth/tck-runner/pom.xml
+++ b/MicroProfile-JWT-Auth/tck-runner/pom.xml
@@ -53,7 +53,7 @@
 
     <properties>
         <mptck.suite>${basedir}/src/test/resources/base-tck-suite.xml</mptck.suite>
-        <micro.randomPort>false</micro.randomPort>
+        <micro.random.port>false</micro.random.port>
     </properties>
 
     <dependencies>
diff --git a/MicroProfile-Metrics/pom.xml b/MicroProfile-Metrics/pom.xml
index a460f2b..5359cce 100644
--- a/MicroProfile-Metrics/pom.xml
+++ b/MicroProfile-Metrics/pom.xml
@@ -57,7 +57,7 @@
         <!-- Metrics Dependencies -->
         <microprofile.metrics.version>5.1.0.payara-p1</microprofile.metrics.version>
         <microprofile.metrics.tck.version>5.1.0.payara-p1</microprofile.metrics.tck.version>
-        <micro.randomPort>false</micro.randomPort>
+        <micro.random.port>false</micro.random.port>
     </properties>
 
     <dependencies>
diff --git a/MicroProfile-Rest-Client/tck-runners/pom.xml b/MicroProfile-Rest-Client/tck-runners/pom.xml
index 11628a8..695db4b 100644
--- a/MicroProfile-Rest-Client/tck-runners/pom.xml
+++ b/MicroProfile-Rest-Client/tck-runners/pom.xml
@@ -55,7 +55,7 @@
     <name>MicroProfile Rest Client TCK Runners - Parent</name>
 
     <properties>
-        <micro.randomPort>false</micro.randomPort>
+        <micro.random.port>false</micro.random.port>
         <smallrye-config.version>2.7.0</smallrye-config.version>
     </properties>
 
diff --git a/pom.xml b/pom.xml
index 3da440b..5c80850 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
         <payara.micro.distribution.suffix>-platform</payara.micro.distribution.suffix>
         <payara.embedded.distribution.suffix>-all</payara.embedded.distribution.suffix>
         <payara.micro.jar>${maven.multiModuleProjectDirectory}${file.separator}target${file.separator}payara-micro${payara.micro.distribution.suffix}-${payara.version}.jar</payara.micro.jar>
-        <micro.randomPort>true</micro.randomPort>
+        <micro.random.port>false</micro.random.port>
         <payara.domain>domain1</payara.domain>
 
         <!-- Control Properties -->
@@ -282,7 +282,7 @@
                         <configuration>
                             <systemPropertyVariables>
                                 <arquillian.launch>payara-micro-managed</arquillian.launch>
-                                <micro.randomPort>${micro.randomPort}</micro.randomPort>
+                                <micro.random.port>${micro.random.port}</micro.random.port>
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>
@@ -357,6 +357,7 @@
             <id>parallel</id>
             <properties>
                 <thread.count>4</thread.count>
+                <micro.random.port>true</micro.random.port>
             </properties>
             <build>
                 <pluginManagement>
diff --git a/src/test/resources/arquillian.xml b/src/test/resources/arquillian.xml
index a0df545..dcb7002 100644
--- a/src/test/resources/arquillian.xml
+++ b/src/test/resources/arquillian.xml
@@ -6,8 +6,8 @@
 
     <container qualifier="payara-micro-managed">
         <configuration>
-            <property name="randomHttpPort">${micro.randomPort}</property>
-            <property name="autoBindHttp">${micro.randomPort}</property>
+            <property name="randomHttpPort">${micro.random.port}</property>
+            <property name="autoBindHttp">${micro.random.port}</property>
             <!-- Required for MP-Config / DefaultConfigSourceOrdinalTest -->
             <property name="cmdOptions">
                 -Dconfig_ordinal=120