diff --git a/MicroProfile-Config/pom.xml b/MicroProfile-Config/pom.xml index 9f700d6..cd39741 100644 --- a/MicroProfile-Config/pom.xml +++ b/MicroProfile-Config/pom.xml @@ -58,10 +58,9 @@ 3.1 3.1 ${basedir}/src/test/resources/tck-suite.xml - false + false - 4.0.1 ${payara.home}/bin/asadmin @@ -90,7 +89,6 @@ jakarta.enterprise jakarta.enterprise.cdi-api - ${cdi.version} test @@ -150,7 +148,7 @@ - + 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 @@ ${basedir}/src/test/resources/base-tck-suite.xml - false + false diff --git a/MicroProfile-Metrics/pom.xml b/MicroProfile-Metrics/pom.xml index 2246166..5359cce 100644 --- a/MicroProfile-Metrics/pom.xml +++ b/MicroProfile-Metrics/pom.xml @@ -57,11 +57,7 @@ 5.1.0.payara-p1 5.1.0.payara-p1 - false - - - 4.0.1 - 4.0.0 + false @@ -110,7 +106,6 @@ jakarta.enterprise jakarta.enterprise.cdi-api - ${cdi.version} provided 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 @@ - + diff --git a/MicroProfile-OpenTracing/pom.xml b/MicroProfile-OpenTracing/pom.xml index 6f9963e..432ee49 100644 --- a/MicroProfile-OpenTracing/pom.xml +++ b/MicroProfile-OpenTracing/pom.xml @@ -2,7 +2,7 @@ diff --git a/pom.xml b/pom.xml index 3967e60..5c80850 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ - 1.7.0.Alpha14 - 3.0.alpha8 + 1.7.2.Final + 3.1 - - 2.1.5.payara-p2 3.1.11.payara-p1 - 4.0.1 - 4.0.0 - + 6.2025.10-SNAPSHOT - ${mptck.basedir}/target/payara6 - ${mptck.basedir}/target/payara-micro-${payara.version}.jar - true - domain1 + ${maven.multiModuleProjectDirectory}${file.separator}target${file.separator}payara6 + + -platform + -all + ${maven.multiModuleProjectDirectory}${file.separator}target${file.separator}payara-micro${payara.micro.distribution.suffix}-${payara.version}.jar + false + domain1 + + + false + ${skipTests} + ${skipTests} + + false + false @@ -118,36 +125,25 @@ org.slf4j slf4j-jdk14 - 1.7.30 + 1.7.36 jakarta.enterprise jakarta.enterprise.cdi-api - ${cdi.version} provided jakarta.xml.bind jakarta.xml.bind-api - ${jaxb.version} + + + jakarta.activation + jakarta.activation-api - - payara5plus - - - payara.version - - /(?!4).+/ - - - - MicroProfile-OpenTracing - - payara-server-managed @@ -163,17 +159,58 @@ ${payara.arquillian.container.version} true + + fish.payara.distributions + payara${payara.server.distribution.suffix} + zip + + maven-failsafe-plugin + + + payara-server-managed + ${payara.home} + + + + + + org.apache.maven.plugins maven-dependency-plugin + + + unpack-server + + unpack + + pre-integration-test + false + + ${skipConfig} + + + fish.payara.distributions + payara${payara.server.distribution.suffix} + ${payara.version} + zip + true + ${maven.multiModuleProjectDirectory}${file.separator}target + + + + + + - maven-failsafe-plugin + maven-surefire-plugin + 3.5.4 - payara-server-managed + ${payara.home} @@ -228,12 +265,12 @@ fish.payara.extras - payara-micro + payara-micro${payara.micro.distribution.suffix} ${payara.version} false jar - ${mptck.basedir}/target/ - payara-micro-${payara.version}.jar + ${maven.multiModuleProjectDirectory}/target/ + payara-micro${payara.micro.distribution.suffix}-${payara.version}.jar @@ -245,13 +282,21 @@ payara-micro-managed - ${micro.randomPort} + ${micro.random.port} + + web + + -web + + -web + + payara-micro-remote @@ -282,12 +327,12 @@ fish.payara.extras - payara-embedded-all + payara-embedded${payara.embedded.distribution.suffix} ${payara.version} test - org.glassfish + org.eclipse.parsson jakarta.json test @@ -308,28 +353,11 @@ - - jdk11 - - 11 - - - - jakarta.xml.bind - jakarta.xml.bind-api - 4.0.0-RC2 - - - jakarta.activation - jakarta.activation-api - 2.1.0-RC1 - - - parallel 4 + true @@ -373,79 +401,6 @@ - - full-distribution - - true - - - - - - - maven-dependency-plugin - - - process-test-resources - - unpack - - - ${mptck.basedir}/target - ${mptck.basedir}/target/dependency-maven-plugin-markers - - - fish.payara.distributions - payara - ${payara.version} - zip - false - ${mptck.basedir}/target - - - - - - - - - - - - web-distribution - - - - - - maven-dependency-plugin - - - process-test-resources - - unpack - - - ${mptck.basedir}/target - ${mptck.basedir}/target/dependency-maven-plugin-markers - - - fish.payara.distributions - payara-web - ${payara.version} - zip - false - ${mptck.basedir}/target - - - - - - - - - - @@ -482,18 +437,6 @@ - - fish.payara.arquillian - payara-client-ee7 - ${payara.arquillian.container.version} - test - - - org.eclipse - yasson - - - fish.payara.arquillian environment-setup @@ -551,27 +494,6 @@ maven-failsafe-plugin - - org.commonjava.maven.plugins - directory-maven-plugin - 0.3.1 - - - directories - - directory-of - - validate - - mptck.basedir - - fish.payara.microprofile - tck-suite-parent - - - - - org.codehaus.mojo build-helper-maven-plugin @@ -599,7 +521,7 @@ maven-failsafe-plugin - 3.0.0-M5 + 3.5.4 integration-test @@ -618,8 +540,8 @@ ${payara.home} - ${payara.microJar} - ${mptck.basedir}/src/test/resources/arquillian.xml + ${payara.micro.jar} + ${maven.multiModuleProjectDirectory}/src/test/resources/arquillian.xml ${mptck.suite} @@ -639,10 +561,33 @@ + + + + central + Central Repository + https://repo.maven.apache.org/maven2 + + true + + + false + + + + ossrh-snapshots + Sonatype OSSRH Snapshot Repository + https://oss.sonatype.org/content/repositories/snapshots + + false + + + true + + payara-nexus-artifacts - Payara Nexus Artifacts https://nexus.dev.payara.fish/repository/payara-artifacts true @@ -651,5 +596,111 @@ false + + payara-nexus-enterprise-artifacts + https://nexus.dev.payara.fish/repository/payara-enterprise-artifacts-private + + true + + + false + + + + payara-nexus-enterprise-distributions + https://nexus.dev.payara.fish/repository/payara-enterprise + + true + + + false + + + + payara-nexus-enterprise-snapshots + https://nexus.dev.payara.fish/repository/payara-enterprise-snapshots-private + + false + + + true + + + + payara-nexus-snapshots + https://nexus.dev.payara.fish/repository/payara-snapshots + + false + + + true + + + + payara-nexus-staging + https://nexus.dev.payara.fish/repository/payara-staging + + ${payara-nexus-staging.repo.releases.enabled} + + + ${payara-nexus-staging.repo.snapshots.enabled} + + + + + + + central + Central Repository + https://repo.maven.apache.org/maven2 + + true + + + false + + + + ossrh-snapshots + Sonatype OSSRH Snapshot Repository + https://oss.sonatype.org/content/repositories/snapshots + + false + + + true + + + + payara-nexus-artifacts + https://nexus.dev.payara.fish/repository/payara-artifacts + + true + + + false + + + + payara-nexus-snapshots + https://nexus.dev.payara.fish/repository/payara-snapshots + + false + + + true + + + + payara-nexus-staging + https://nexus.dev.payara.fish/repository/payara-staging + + ${payara-nexus-staging.repo.releases.enabled} + + + ${payara-nexus-staging.repo.snapshots.enabled} + + + 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 @@ - ${micro.randomPort} - ${micro.randomPort} + ${micro.random.port} + ${micro.random.port} -Dconfig_ordinal=120 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 @@ org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.2