From 86afcc8c7370fce732023810dfaced0186684999 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 25 Oct 2024 12:50:45 +0100 Subject: [PATCH 1/9] FISH-10024 Squash branch Pandrex247/FISH-10024-Use-Zips-EE11-Convert-to-EE10 onto Payara/main Signed-off-by: Andrew Pielage --- .gitmodules | 3 + README.md | 14 +- authorization-tck/README.md | 24 + authorization-tck/payara-pom.xml | 414 ++++++ authorization-tck/pom.xml | 134 +- batch-tck/apitests/pom.xml | 60 +- batch-tck/pom.xml | 162 +-- batch-tck/sigtests/pom.xml | 9 +- cdi-langmodel-tck/pom.xml | 46 +- cdi-tck/README.md | 34 +- cdi-tck/pom.xml | 28 +- concurrent-tck/README.md | 48 +- concurrent-tck/default-web.xml | 1202 ----------------- concurrent-tck/pom.xml | 222 ++- .../src/test/resources/tck-suite-web.xml | 2 +- .../src/test/resources/tck-suite.xml | 2 +- core-tck/README.md | 19 +- core-tck/bundles/.gitkeep | 0 core-tck/download.sh | 8 - core-tck/install.sh | 22 - core-tck/pom.xml | 47 +- faces-tck/pom.xml-old-tck-run | 125 +- faces-tck/pom.xml-tck | 2 +- faces-tck/run-tck.sh | 18 +- inject-tck/pom.xml | 7 - jsonb-tck/README.md | 19 +- jsonb-tck/pom.xml | 145 +- jsonp-tck/README.md | 16 + .../glassfish-runner-pluggability/pom.xml | 46 +- jsonp-tck/glassfish-runner/pom.xml | 45 +- jsonp-tck/payara-runner/pom.xml | 52 +- jsonp-tck/pom.xml | 20 +- pages-tck/README.md | 13 + pages-tck/pom.xml | 90 +- pom.xml | 316 ++++- rest-tck/README.MD | 16 +- rest-tck/payara-server-remote-tests/pom.xml | 63 +- rest-tck/pom.xml | 6 - rest-tck/se-tests/pom.xml | 14 +- servlet-tck/README.md | 13 + servlet-tck/pom.xml | 113 +- soap-tck/run-tck.sh | 8 +- summarizer/pom.xml | 10 +- tags-tck/README.md | 14 + tags-tck/pom.xml | 29 +- .../jakarta-authorization-tck/pom.xml | 10 +- tck-download/jakarta-batch-tck/pom.xml | 81 ++ tck-download/jakarta-cdi-tck/pom.xml | 184 +++ tck-download/jakarta-concurrency-tck/pom.xml | 77 ++ tck-download/jakarta-core-profile-tck/pom.xml | 156 +++ tck-download/jakarta-inject-tck/pom.xml | 65 + tck-download/jakarta-jsonb-tck/pom.xml | 65 + tck-download/jakarta-jsonp-tck/pom.xml | 111 ++ tck-download/jakarta-pages-tck/pom.xml | 11 +- tck-download/jakarta-rest-tck/pom.xml | 16 +- tck-download/jakarta-servlet-tck/pom.xml | 46 +- tck-download/jakarta-tags-tck/pom.xml | 10 +- tck-download/jakarta-websocket-tck/pom.xml | 21 +- tck-download/pom.xml | 13 +- websocket-tck/README.md | 13 + websocket-tck/pom.xml | 71 +- 61 files changed, 2293 insertions(+), 2357 deletions(-) create mode 100644 authorization-tck/README.md create mode 100644 authorization-tck/payara-pom.xml delete mode 100644 concurrent-tck/default-web.xml delete mode 100644 core-tck/bundles/.gitkeep delete mode 100644 core-tck/download.sh delete mode 100644 core-tck/install.sh create mode 100644 jsonp-tck/README.md create mode 100644 pages-tck/README.md create mode 100644 servlet-tck/README.md create mode 100644 tags-tck/README.md create mode 100644 tck-download/jakarta-batch-tck/pom.xml create mode 100644 tck-download/jakarta-cdi-tck/pom.xml create mode 100644 tck-download/jakarta-concurrency-tck/pom.xml create mode 100644 tck-download/jakarta-core-profile-tck/pom.xml create mode 100644 tck-download/jakarta-inject-tck/pom.xml create mode 100644 tck-download/jakarta-jsonb-tck/pom.xml create mode 100644 tck-download/jakarta-jsonp-tck/pom.xml create mode 100644 websocket-tck/README.md diff --git a/.gitmodules b/.gitmodules index 6dcee87..8cc887d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,3 +6,6 @@ path = cdi-tck/cditck-porting url = https://github.com/payara/cditck-porting branch = EE10 +[submodule "cdi-tck/glassfish-cdi-porting-tck"] + path = cdi-tck/glassfish-cdi-porting-tck + url = https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck diff --git a/README.md b/README.md index 0c449f9..089b522 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,6 @@ # jakartaee-10-tck-runners -## Jakarta JSON Processing +Payara runners for the standalone Jakarta EE TCKs. +See individual module READMEs for details, but general usage is: -### Prerequisites -To be able to run the TCK test, you need to setup remote Payara Server in order to run the Arquillian against the container - -### Test Executions -**(Make sure the Payara server up and running)** - -Run maven test from jsonp-tck module - - cd jsonp-tck - mvn test +`mvn clean verify -Dpayara.version=${payaraVersion} -Ppayara-server-managed -pl . -pl tck-download -pl tck-download/${tckToRun} -pl ${tckToRun}` \ No newline at end of file diff --git a/authorization-tck/README.md b/authorization-tck/README.md new file mode 100644 index 0000000..9c10c4b --- /dev/null +++ b/authorization-tck/README.md @@ -0,0 +1,24 @@ +# Jakarta Authorization TCK Runner + +## Prerequisite + +Download and install the TCK into your local Maven repo. +From the top-level directory: `mvn clean install -pl . -pl tck-download -pl tck-download/jakarta-authorization-tck -Pjakarta-staging` + +## Test Execution + +To execute the full TCK against a managed Payara Server + +``` +mvn clean verify +``` + +### Debugging + +Utilise the `payara-server-remote` profile. +This profile expects that the TCK has been run in its entirety at least once to perform the necessary setup. + +* Move into the TCK for the rerun: `cd authorization-tck/target/authorization-tck-3.0.0/tck` +* Install the common TCK module (make sure you don't clean!): `mvn install -Ppayara-server-remote,jakarta-staging -pl . -pl common -DskipTests` +* Start the configured Payara Server found at `authorization-tck/target/authorization-tck-3.0.0/tck/target/payara7` and attach your debugger +* Run your specific TCK module test (make sure you don't clean!), for example: `mvn verify -Ppayara-server-remote,jakarta-staging -f app-custom-policy2 -Dit.test=AppCustomPolicy2IT#testAuthenticatedSpecial` diff --git a/authorization-tck/payara-pom.xml b/authorization-tck/payara-pom.xml new file mode 100644 index 0000000..e052491 --- /dev/null +++ b/authorization-tck/payara-pom.xml @@ -0,0 +1,414 @@ + + payara-server-managed + + + 7.2024.1.Alpha2-SNAPSHOT + false + ${maven.multiModuleProjectDirectory}/target + ${payara.root}${file.separator}payara7 + ${payara.home}/glassfish/bin/asadmin + ${payara.home}${file.separator}glassfish${file.separator}domains${file.separator}domain1${file.separator}logs + + 1.9.1.Final + 4.0.alpha1 + + 5.10.3 + + jakarta.authorization + jakarta.authorization-vendor-api + ${payara.version} + + 3.1.2 + 3.3.0 + 3.7.1 + 3.1.0 + + + + + + org.junit + junit-bom + ${junit.version} + pom + import + + + org.jboss.arquillian + arquillian-bom + ${arquillian.version} + pom + import + + + + fish.payara.api + payara-bom + ${payara.version} + pom + import + + + + junit + junit + 4.13.2 + + + + + + + fish.payara.distributions + ${payara.artifact} + zip + test + + + fish.payara.arquillian + arquillian-payara-server-managed + ${payara.arquillian.version} + test + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin.version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-failsafe-plugin.version} + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin.version} + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-server + + unpack + + pre-integration-test + + ${skipTests} + ${payara.root} + ${payara.root}/dependency-maven-plugin-markers + + + fish.payara.distributions + ${payara.artifact} + ${payara.version} + zip + false + ${payara.root} + + + + + + + + + + org.apache.maven.plugins + maven-install-plugin + + + unpack + pre-integration-test + + install-file + + + ${payara.home}/glassfish/modules/jakarta.authorization-api.jar + ${sigtest.api.groupId} + ${sigtest.api.artifactId} + ${sigtest.api.version} + jar + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + false + + ${skipTests} + + + + start-payara-server + pre-integration-test + + run + + + + + + + + + + + prepare-payara-server + pre-integration-test + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + stop-payara-server + pre-integration-test + + run + + + + + + + + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + ${payara.home} + ${log.file.location} + + + + + + + + jakarta-staging + + + jakarta-releases + https://jakarta.oss.sonatype.org/content/groups/staging/ + + true + + + false + + + + + + windows + + + Windows + + + + ${payara.home}/glassfish/bin/asadmin.bat + + + + + payara-server-remote + + 7.2024.1.Alpha2-SNAPSHOT + false + ${maven.multiModuleProjectDirectory}/target + ${payara.root}${file.separator}payara7 + ${payara.home}/glassfish/bin/asadmin + ${payara.home}${file.separator}glassfish${file.separator}domains${file.separator}domain1${file.separator}logs + + 1.9.1.Final + 4.0.alpha1 + + 5.10.3 + + jakarta.authorization + jakarta.authorization-vendor-api + ${payara.version} + + 3.1.2 + 3.3.0 + 3.7.1 + 3.1.0 + + + + + + org.junit + junit-bom + ${junit.version} + pom + import + + + org.jboss.arquillian + arquillian-bom + ${arquillian.version} + pom + import + + + + fish.payara.api + payara-bom + ${payara.version} + pom + import + + + + junit + junit + 4.13.2 + + + + + + + fish.payara.arquillian + arquillian-payara-server-remote + ${payara.arquillian.version} + test + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin.version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-failsafe-plugin.version} + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin.version} + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + + + + + + org.apache.maven.plugins + maven-install-plugin + + + unpack + pre-integration-test + + install-file + + + ${payara.home}/glassfish/modules/jakarta.authorization-api.jar + ${sigtest.api.groupId} + ${sigtest.api.artifactId} + ${sigtest.api.version} + jar + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + ${payara.home} + ${log.file.location} + + + + + + + + \ No newline at end of file diff --git a/authorization-tck/pom.xml b/authorization-tck/pom.xml index 12390a1..091b990 100644 --- a/authorization-tck/pom.xml +++ b/authorization-tck/pom.xml @@ -36,7 +36,7 @@ ${tck.home}/src/com/sun/ts/tests org/glassfish/**\:com/sun/enterprise/** - + 4848 11527 18080 @@ -48,14 +48,8 @@ 13820 12000 - + - - fish.payara.distributions - payara - ${payara.version} - zip - fish.payara.jakarta.tests.tck jakarta-authorization-tck @@ -70,41 +64,28 @@ com.googlecode.maven-download-plugin download-maven-plugin - 1.6.8 - download-authorization-tck + download-ant generate-resources wget + + ${skipTests} + ${ant.zip.url} + true + - - ${skipITs} - ${ant.zip.url} - true - ${project.build.directory} - maven-dependency-plugin - ${skipITs} + ${skipTests} - - unpack-payara - pre-integration-test - - unpack-dependencies - - - payara - ${project.build.directory} - - unpack-tck pre-integration-test @@ -122,7 +103,6 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 org.apache.ant @@ -142,7 +122,7 @@ - ${skipITs} + ${skipTests} @@ -155,57 +135,57 @@ - + match="com.sun.enterprise.security.jacc.provider.SimplePolicyProvider" + replace="org.glassfish.exousia.modules.locked.SimplePolicyProvider" /> + + match="com.sun.enterprise.security.jacc.provider.SimplePolicyConfigurationFactory" + replace="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" /> + match="s1as\.admin\.port=.*" + replace="s1as\.admin\.port=${port.admin}" /> + match="orb\.port=.*" + replace="orb\.port=${port.orb}" /> + match="database\.port=.*" + replace="database\.port=${port.derby}" /> + match="webServerPort=.*" + replace="webServerPort=${port.http}" /> + match="securedWebServicePort=.*" + replace="securedWebServicePort=${port.https}" /> + match="harness\.log\.port=.*" + replace="harness\.log\.port=${port.harness.log}" /> + match="javaee\.level=.*" + replace="javaee\.level=full" /> + match="jacc\.home=.*" + replace="jacc\.home=${payara.home}/glassfish" /> + match="report\.dir=.*" + replace="report\.dir=${tck.home}/jacctckreport/jacctck" /> + match="work\.dir=.*" + replace="work\.dir=${tck.home}/jacctckwork/jacctck" /> + match="work\.dir=.*" + replace="work\.dir=${tck.home}/jacctckwork/jacctck" /> + match=" -Djavax\.net\.ssl\.trustStore=.*" + replace=" -Djavax\.net\.ssl\.trustStore=$\\{jacc.home\\}/domains/domain1/config/cacerts\.p12 -Djavax\.net\.ssl\.trustStorePassword=changeit \\\\" /> + match="</project>" + replace="<property name="all.test.dir" value="com/sun/ts/tests/jacc/,com/sun/ts/tests/signaturetest/jacc,com/sun/ts/tests/common/vehicle/" /> </project>" /> @@ -246,16 +226,16 @@ - + - ]]> - + ]]> + ]]> - + - ]]> - + ]]> + ]]> @@ -280,20 +260,20 @@ - + - + - + - - - - + + + + @@ -303,7 +283,7 @@ - + run-tck-tests integration-test @@ -315,7 +295,7 @@ classpathref="maven.plugin.classpath" /> - + @@ -337,7 +317,7 @@ - + diff --git a/batch-tck/apitests/pom.xml b/batch-tck/apitests/pom.xml index e455182..4a3a6a1 100644 --- a/batch-tck/apitests/pom.xml +++ b/batch-tck/apitests/pom.xml @@ -39,9 +39,8 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation - ${payara.home}${file.separator}glassfish${file.separator}bin${file.separator}asadmin${script.ext} - 1.7.30 + 2.0.16 @@ -51,24 +50,24 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation jakarta.batch com.ibm.jbatch.tck test - ${jakarta.batch.version} + ${jakarta.tck.batch.version} jakarta.batch com.ibm.jbatch.tck.appbean test - ${jakarta.batch.version} + ${jakarta.tck.batch.version} jakarta.batch com.ibm.jbatch.tck.spi test - ${jakarta.batch.version} + ${jakarta.tck.batch.version} jakarta.batch jakarta.batch.arquillian.extension - ${jakarta.batch.version} + ${jakarta.tck.batch.version} org.jboss.arquillian.container @@ -88,7 +87,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation jakarta.batch jakarta.batch.reporting test - ${jakarta.batch.version} + ${jakarta.tck.batch.version} org.slf4j @@ -124,7 +123,6 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation com.googlecode.maven-download-plugin download-maven-plugin - ${download.maven.plugin.version} download-derby @@ -133,7 +131,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation wget - ${skipITs} + ${skipTests} ${derby.zip.url} true ${project.build.directory} @@ -145,7 +143,6 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation org.apache.maven.plugins maven-antrun-plugin - ${maven.antrun.plugin.version} copy-arquillian-config @@ -154,7 +151,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation run - ${skipITs} + ${skipTests} run - ${skipITs} + ${skipTests} @@ -189,9 +186,9 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation run - ${skipITs} + ${skipTests} - + @@ -205,7 +202,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation run - ${skipITs} + ${skipTests} @@ -221,7 +218,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation run - ${skipITs} + ${skipTests} @@ -237,9 +234,9 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation run - ${skipITs} + ${skipTests} - + @@ -257,9 +254,9 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation run - ${skipITs} + ${skipTests} - + @@ -275,9 +272,9 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation run - ${skipITs} + ${skipTests} - + @@ -290,9 +287,9 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation run - ${skipITs} + ${skipTests} - + @@ -306,7 +303,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation run - ${skipITs} + ${skipTests} @@ -318,7 +315,6 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation org.apache.maven.plugins maven-dependency-plugin - ${maven.dependency.plugin.version} unpack-tck @@ -342,7 +338,6 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation org.apache.maven.plugins maven-failsafe-plugin - ${maven.failsafe.plugin.version} false @@ -372,7 +367,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation - + ee-core-suite-web integration-test @@ -407,7 +402,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation - + appjoboperator-suite-web integration-test @@ -424,6 +419,13 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation + + verify + verify + + verify + + diff --git a/batch-tck/pom.xml b/batch-tck/pom.xml index 4ad8920..d59ede4 100644 --- a/batch-tck/pom.xml +++ b/batch-tck/pom.xml @@ -22,85 +22,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - fish.payara.jakarta.tests.tck + + fish.payara.jakarta.tests.tck + tck + 1.0-SNAPSHOT + + batch-tck - 1.0-SNAPSHOT pom Jakarta Batch TCK Runner for Payara - - 2.1.1 - - - - - payara - ${project.build.directory}${file.separator}payara6 - - 3.0.alpha6 - 1.7.0.Alpha10 - 5.8.2 - - 1.6.8 - 3.3.0 - 3.0.0-M7 - 3.1.0 - - sigtests apitests - - - central - https://repo1.maven.org/maven2 - - - jboss - https://repository.jboss.org/nexus/content/repositories/releases/ - - - - - payara-nexus-artifacts - https://nexus.payara.fish/repository/payara-artifacts - - - payara-nexus-snapshots - https://nexus.payara.fish/repository/payara-snapshots - - - - - payara-nexus-enterprise-distributions - https://nexus.payara.fish/repository/payara-enterprise - - - payara-nexus-enterprise-artifacts - https://nexus.payara.fish/repository/payara-enterprise-artifacts-private - - - payara-nexus-enterprise-snapshots - https://nexus.payara.fish/repository/payara-enterprise-snapshots-private - - - - - payara-nexus-staging - https://nexus.payara.fish/repository/payara-staging - - - - - - payara-nexus-artifacts - https://nexus.payara.fish/repository/payara-artifacts - - - @@ -110,94 +47,7 @@ pom import - - - org.jboss.arquillian - arquillian-bom - ${arquillian.version} - pom - import - - - - org.junit - junit-bom - ${junit.version} - pom - import - - - - payara-server-remote - - - - - - - - fish.payara.arquillian - arquillian-payara-server-remote - ${payara.arquillian.version} - test - - - - - - payara-server-managed - - - !payara.server.remote - - - - - - - - - - fish.payara.arquillian - arquillian-payara-server-managed - ${payara.arquillian.version} - test - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-payara - generate-test-resources - - unpack - - - !${skipITs} - - - fish.payara.distributions - ${payara.artifact} - ${payara.version} - zip - false - ${project.build.directory} - - - - - - - - - - diff --git a/batch-tck/sigtests/pom.xml b/batch-tck/sigtests/pom.xml index 48116df..bd8b9c1 100644 --- a/batch-tck/sigtests/pom.xml +++ b/batch-tck/sigtests/pom.xml @@ -10,16 +10,11 @@ batch-tck.sig-tests - - 1.6 - - org.apache.maven.plugins maven-dependency-plugin - ${maven.dependency.plugin.version} unpack-sigfiles @@ -32,7 +27,7 @@ jakarta.batch com.ibm.jbatch.tck - ${jakarta.batch.version} + ${jakarta.tck.batch.version} sigtest/* @@ -43,7 +38,6 @@ maven-antrun-plugin - ${maven.antrun.plugin.version} expand-payara-modules @@ -66,7 +60,6 @@ org.netbeans.tools sigtest-maven-plugin - ${sigtest.maven.plugin.version} sigtest diff --git a/cdi-langmodel-tck/pom.xml b/cdi-langmodel-tck/pom.xml index 7ac28f9..3e98f4d 100644 --- a/cdi-langmodel-tck/pom.xml +++ b/cdi-langmodel-tck/pom.xml @@ -14,14 +14,7 @@ This pom runs the JakartaEE CDI langmodel TCK. - 11 - 11 - 11 - 4.0.6 - 4.0.1 - 5.0.0.SP2 - 1.7.0.Alpha10 - 3.0.alpha6 + 5.0.1.Final @@ -33,7 +26,7 @@ jakarta.enterprise cdi-tck-lang-model - ${cdi.tck.version} + ${jakarta.tck.cdi.version} test @@ -54,15 +47,9 @@ ${arquillian.version} test - - fish.payara.arquillian - arquillian-payara-server-managed - ${payara.arquillian.version} - test - org.jboss.arquillian.protocol - arquillian-protocol-servlet-jakarta + arquillian-protocol-servlet ${arquillian.version} test @@ -73,7 +60,6 @@ org.apache.maven.plugins maven-dependency-plugin - 3.3.0 copy @@ -98,23 +84,11 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 org.apache.ant ant - 1.10.12 - - - ant-contrib - ant-contrib - 1.0b3 - - - ant - ant - - + ${ant.version} @@ -122,7 +96,7 @@ generate-test-resources - + ]]> @@ -136,6 +110,16 @@ + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${payara.home} + + + \ No newline at end of file diff --git a/cdi-tck/README.md b/cdi-tck/README.md index 6bff9ff..13c1952 100644 --- a/cdi-tck/README.md +++ b/cdi-tck/README.md @@ -1,8 +1,26 @@ -# How to Run -1. Build https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck -2. Ensure that `payara.home` is set - Maven will add the "${payara.home}/glassfish" for you so don't include that final bit. -3. Make sure M2_HOME is set. -4. Make sure MAVEN_HOME is set. -5. Make sure ANT_HOME is set. -6. Decide which level of TCK you want to run by defining javaee.level as 'core', 'web', or 'full' (default is full). -6. Run `mvn clean verify -Dpayara.home=x -Djavaee.level=y` +# Jakarta CDI TCK + +## Prerequisite +Download and install the TCK from the tck-downloads module. From the top-level directory: + +`mvn clean install -pl . -pl tck-download -pl tck-download/jakarta-cdi-tck -Dpayara.version=...` + +Ensure the `M2_HOME`, `MAVEN_HOME`, and `ANT_HOME` environment variables are set. + +Initialise the porting submodules: + +`git submodule update --init` + +Build the glassfish porting: + +`mvn clean install -f cdi-tck/glassfish-cdi-porting-tck` + +## Test Execution + +Run maven test from the module directory using managed arquillian profile + +``` +mvn clean verify -Ppayara-server-managed -Dpayara.version=... -pl . -pl cdi-tck +``` + +To run only the Core Profile parts, add `-Djavaee.level=core` to the above command. diff --git a/cdi-tck/pom.xml b/cdi-tck/pom.xml index 949606e..61651a2 100644 --- a/cdi-tck/pom.xml +++ b/cdi-tck/pom.xml @@ -12,11 +12,7 @@ cdi-tck - 11 - 11 - - ${basedir}/cditck-porting - full + ${basedir}${file.separator}cditck-porting @@ -24,7 +20,6 @@ org.apache.maven.plugins maven-antrun-plugin - 3.0.0 run-tck @@ -34,30 +29,17 @@ - - glassfish.home set to ${payara.home}/glassfish - + + glassfish.home set to ${payara.home}${file.separator}glassfish + porting.home set to ${porting.home} - + javaee.level set to ${javaee.level} - - - ant-contrib - ant-contrib - 1.0b3 - - - ant - ant - - - - diff --git a/concurrent-tck/README.md b/concurrent-tck/README.md index d0b078b..0db2b8f 100644 --- a/concurrent-tck/README.md +++ b/concurrent-tck/README.md @@ -1,48 +1,14 @@ # Concurrent 3.0 -### Prerequisities +## Running -run +Run from the top-level directory: - mvn clean dependency:copy - mvn dependency:copy-dependencies - -* it downloads all server dependencies to target/server-dependencies - -Copy the files to Payara: - - cp target/server-dependencies/* ${PAYARA}/glassfish/domains/domain1/lib - -Prepare password file for account javajoe/javajoe/role=Manager. File`prepare-server-password` contains row: - - AS_ADMIN_USERPASSWORD=javajoe - -Go to Payara and start the server - - ./asadmin start-domain - -Create required resources: - - echo "Setting file user javajoe" - ./asadmin --passwordfile=prepare-server-password create-file-user --groups=Manager --authrealmname=file javajoe - echo "Setting system property jimage.dir", needed for SignatureTestServlet - ./asadmin create-system-properties jimage.dir=/tmp - echo "Setting allow setAccessible, needed for SignatureTestServlet" - ./asadmin create-jvm-options "--add-exports=java.base/jdk.internal.vm.annotation=ALL-UNNAMED" - ./asadmin create-jvm-options "--add-opens=java.base/jdk.internal.vm.annotation=ALL-UNNAMED" - echo "Setup phase done, stopping Payara" - ./asadmin stop-domain - -Temporal fix for unknown tag 18: copy default-web.xml to domains/domain1/config -This sets suppressSmap to false, e.g. smap is not generated. Once Payara will use newer Tomcat, it will be fixed -and this temporal fix can be removed. - -### Running - -Run maven test in the TCK Runner directory - - mvn test +`mvn clean verify -Ppayara-server-managed -Dpayara.version=... -pl . -pl tck-download -pl tck-download/jakarta-concurrency-tck -pl concurrent-tck` For running against Payara Web Profile, activate the `web` profile - mvn test -Pweb +If intending to run against a remote server (`-Ppayara-server-remote`), then you must provide the `-Dpayara.home` property. + +To skip server startup and shutdown, set `-DskipServerStartStop` to true. Defaults to true for remote profile, false otherwise. +To skip server configuration, set to `-DskipConfig` to true. Defaults to false. \ No newline at end of file diff --git a/concurrent-tck/default-web.xml b/concurrent-tck/default-web.xml deleted file mode 100644 index 095395b..0000000 --- a/concurrent-tck/default-web.xml +++ /dev/null @@ -1,1202 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - com.sun.faces.forceLoadConfiguration - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - default - org.apache.catalina.servlets.DefaultServlet - - debug - 0 - - - listings - false - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - jsp - org.glassfish.wasp.servlet.JspServlet - - suppressSmap - true - - - xpoweredBy - false - - - httpMethods - GET,POST,HEAD - - - compilerSourceVM - 1.8 - - - compilerTargetVM - 1.8 - - - system-jar-includes - - /lib/ - \lib\ - expressly.jar - jakarta.servlet-api.jar - jakarta.servlet.jsp-api.jar - jakarta.servlet.jsp.jstl-api.jar - jakarta.servlet.jsp.jstl.jar - jakarta.jms-api.jar - jakarta.faces.jar - wasp.jar - jspcaching-connector.jar - web-glue.jar - hibernate-validator.jar - jakarta.ejb-api.jar - jakarta.enterprise.deploy-api.jar - jakarta.activation-api.jar - angus-activation.jar - jakarta.mail-api.jar - angus-mail.jar - jakarta.persistence.jar - jakarta.resource-api.jar - jakarta.security.auth.message-api.jar - jakarta.security.jacc-api.jar - jakarta.transaction-api.jar - webservices-osgi.jar - weld-osgi-bundle.jar - jersey-mvc-jsp.jar - - - 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - default - / - - - - - jsp - *.jsp - *.jspx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 30 - - - - - - - - - - - - - - abs - audio/x-mpeg - - - ai - application/postscript - - - aif - audio/x-aiff - - - aifc - audio/x-aiff - - - aiff - audio/x-aiff - - - aim - application/x-aim - - - art - image/x-jg - - - asf - video/x-ms-asf - - - asx - video/x-ms-asf - - - au - audio/basic - - - avi - video/x-msvideo - - - avx - video/x-rad-screenplay - - - bcpio - application/x-bcpio - - - bin - application/octet-stream - - - bmp - image/bmp - - - body - text/html - - - cdf - application/x-cdf - - - cer - application/x-x509-ca-cert - - - class - application/java - - - cpio - application/x-cpio - - - csh - application/x-csh - - - css - text/css - - - dib - image/bmp - - - doc - application/msword - - - dtd - application/xml-dtd - - - dv - video/x-dv - - - dvi - application/x-dvi - - - eps - application/postscript - - - etx - text/x-setext - - - exe - application/octet-stream - - - gif - image/gif - - - gk - application/octet-stream - - - gtar - application/x-gtar - - - gz - application/x-gzip - - - hdf - application/x-hdf - - - hqx - application/mac-binhex40 - - - htc - text/x-component - - - htm - text/html - - - html - text/html - - - hqx - application/mac-binhex40 - - - ico - image/x-icon - - - ief - image/ief - - - jad - text/vnd.sun.j2me.app-descriptor - - - jar - application/java-archive - - - java - text/plain - - - jnlp - application/x-java-jnlp-file - - - jpe - image/jpeg - - - jpeg - image/jpeg - - - jpg - image/jpeg - - - js - text/javascript - - - json - application/json - - - kar - audio/x-midi - - - latex - application/x-latex - - - m3u - audio/x-mpegurl - - - mac - image/x-macpaint - - - man - application/x-troff-man - - - mathml - application/mathml+xml - - - me - application/x-troff-me - - - mid - audio/x-midi - - - midi - audio/x-midi - - - mif - application/x-mif - - - mov - video/quicktime - - - movie - video/x-sgi-movie - - - mp1 - audio/x-mpeg - - - mp2 - audio/x-mpeg - - - mp3 - audio/x-mpeg - - - mpa - audio/x-mpeg - - - mpe - video/mpeg - - - mpeg - video/mpeg - - - mpega - audio/x-mpeg - - - mpg - video/mpeg - - - mpv2 - video/mpeg2 - - - ms - application/x-wais-source - - - nc - application/x-netcdf - - - oda - application/oda - - - odg - application/x-vnd.oasis.opendocument.graphics - - - odp - application/x-vnd.oasis.opendocument.presentation - - - ods - application/x-vnd.oasis.opendocument.spreadsheet - - - odt - application/x-vnd.oasis.opendocument.text - - - ogg - application/ogg - - - pbm - image/x-portable-bitmap - - - pct - image/pict - - - pdf - application/pdf - - - pgm - image/x-portable-graymap - - - pic - image/pict - - - pict - image/pict - - - pls - audio/x-scpls - - - png - image/png - - - pnm - image/x-portable-anymap - - - pnt - image/x-macpaint - - - ppm - image/x-portable-pixmap - - - ppt - application/powerpoint - - - ps - application/postscript - - - psd - image/x-photoshop - - - qt - video/quicktime - - - qti - image/x-quicktime - - - qtif - image/x-quicktime - - - ras - image/x-cmu-raster - - - rdf - application/rdf+xml - - - rgb - image/x-rgb - - - rm - application/vnd.rn-realmedia - - - roff - application/x-troff - - - rtf - application/rtf - - - rtx - text/richtext - - - sh - application/x-sh - - - shar - application/x-shar - - - - sit - application/x-stuffit - - - smf - audio/x-midi - - - snd - audio/basic - - - src - application/x-wais-source - - - sv4cpio - application/x-sv4cpio - - - sv4crc - application/x-sv4crc - - - svg - image/svg+xml - - - svgz - image/svg+xml - - - swf - application/x-shockwave-flash - - - t - application/x-troff - - - tar - application/x-tar - - - tcl - application/x-tcl - - - tex - application/x-tex - - - texi - application/x-texinfo - - - texinfo - application/x-texinfo - - - tif - image/tiff - - - tiff - image/tiff - - - tr - application/x-troff - - - tsv - text/tab-separated-values - - - txt - text/plain - - - ulw - audio/basic - - - ustar - application/x-ustar - - - xbm - image/x-xbitmap - - - xml - application/xml - - - xpm - image/x-xpixmap - - - xsl - application/xml - - - xslt - application/xslt+xml - - - xwd - image/x-xwindowdump - - - vsd - application/x-visio - - - vxml - application/voicexml+xml - - - wav - audio/x-wav - - - wbmp - image/vnd.wap.wbmp - - - wml - text/vnd.wap.wml - - - wmlc - application/vnd.wap.wmlc - - - wmls - text/vnd.wap.wmls - - - wmlscriptc - application/vnd.wap.wmlscriptc - - - wrl - x-world/x-vrml - - - xht - application/xhtml+xml - - - xhtml - application/xhtml+xml - - - xls - application/vnd.ms-excel - - - xul - application/vnd.mozilla.xul+xml - - - z - application/x-compress - - - zip - application/zip - - - - - - - - - - - - - - - - - - - index.html - index.htm - index.jsp - - - - BASIC - - - - diff --git a/concurrent-tck/pom.xml b/concurrent-tck/pom.xml index 91cdb9e..fd7ce60 100644 --- a/concurrent-tck/pom.xml +++ b/concurrent-tck/pom.xml @@ -1,23 +1,59 @@ + + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - fish.payara.jakarta.concurrent.tck concurrent-tck-runner 1.0-SNAPSHOT Jakarta Concurrency TCK Runner This pom runs the JakartaEE Concurrent TCK. + + fish.payara.jakarta.tests.tck + tck + 1.0-SNAPSHOT + + - UTF-8 - 11 - 11 - - - 3.0.alpha6 - 1.82 - src${file.separator}test${file.separator}resources${file.separator}tck-suite.xml @@ -25,11 +61,17 @@ - org.jboss.arquillian - arquillian-bom - 1.6.0.Final - import + fish.payara.api + payara-bom + ${payara.version} pom + import + + + jakarta.tck + sigtest-maven-plugin + ${jakarta.tck.sigtest-maven-plugin.version} + test @@ -39,30 +81,27 @@ jakarta.enterprise.concurrent jakarta.enterprise.concurrent-tck - 3.0.2 + ${jakarta.tck.concurrency.version} + test jakarta.enterprise.concurrent jakarta.enterprise.concurrent-api - 3.0.2 jakarta.servlet jakarta.servlet-api - 6.0.0 org.testng testng 6.14.3 - org.jboss.arquillian.testng arquillian-testng-container - com.beust @@ -70,30 +109,20 @@ ${com.beust-jcommander.version} - - - fish.payara.arquillian - arquillian-payara-server-remote - ${payara.arquillian.container.version} - test - fish.payara.arquillian payara-client-ee9 test - ${payara.arquillian.container.version} jakarta.xml.bind jakarta.xml.bind-api - 4.0.0 jakarta.activation jakarta.activation-api - 2.1.0 @@ -102,24 +131,26 @@ org.apache.maven.plugins maven-dependency-plugin - 3.2.0 copy - package + pre-integration-test copy copy-dependency - package + pre-integration-test copy-dependencies + + jakarta.enterprise.concurrent-tck + org.apache.derby @@ -137,26 +168,122 @@ 10.15.2.0 - org.netbeans.tools - sigtest-maven-plugin - 1.6 + org.netbeans.tools + sigtest-maven-plugin + ${sigtest-maven-plugin.version} - ${project.build.directory}/server-dependencies + ${payara.home}${file.separator}glassfish${file.separator}domains${file.separator}domain1${file.separator}lib - + + + org.codehaus.mojo + exec-maven-plugin + + + start-payara-server-for-config + pre-integration-test + + exec + + + ${skipServerStartStop} + ${payara.asadmin} + + start-domain + + + + + create-jvm-options + pre-integration-test + + exec + + + ${skipConfig} + ${payara.asadmin} + + create-jvm-options + --add-opens=java.base/jdk.internal.vm.annotation=ALL-UNNAMED + + + + + set-jimage-dir-property + pre-integration-test + + exec + + + ${skipConfig} + ${payara.asadmin} + + create-system-properties + jimage.dir=${jimage.dir} + + + + + create-javajoe-user + pre-integration-test + + exec + + + ${skipConfig} + ${payara.asadmin} + + --passwordfile=${project.basedir}${file.separator}prepare-server-password + create-file-user + --groups=Manager + --authrealmname=file + javajoe + + + + + stop-payara-server-after-config + pre-integration-test + + exec + + + ${skipServerStartStop} + ${payara.asadmin} + + stop-domain + + + + + org.apache.maven.plugins maven-surefire-plugin - 2.22.2 - - - - - ${tck-suite.xml} - - ${basedir}${file.separarator}src${file.separarator}main${file.separarator}java${file.separarator} - + + + + default-test + none + + + run-concurrency-tck + integration-test + + test + + + + ${payara.home} + + + ${tck-suite.xml} + + ${project.basedir}${file.separarator}src${file.separarator}main${file.separarator}java${file.separarator} + + + @@ -174,7 +301,8 @@ src${file.separator}test${file.separator}resources${file.separator}tck-suite-web.xml + web - \ No newline at end of file + diff --git a/concurrent-tck/src/test/resources/tck-suite-web.xml b/concurrent-tck/src/test/resources/tck-suite-web.xml index 44fc210..43a372d 100644 --- a/concurrent-tck/src/test/resources/tck-suite-web.xml +++ b/concurrent-tck/src/test/resources/tck-suite-web.xml @@ -27,4 +27,4 @@ - + \ No newline at end of file diff --git a/concurrent-tck/src/test/resources/tck-suite.xml b/concurrent-tck/src/test/resources/tck-suite.xml index 61a1aeb..c1b654a 100644 --- a/concurrent-tck/src/test/resources/tck-suite.xml +++ b/concurrent-tck/src/test/resources/tck-suite.xml @@ -22,4 +22,4 @@ - + \ No newline at end of file diff --git a/core-tck/README.md b/core-tck/README.md index 8100ed9..6ccd8d4 100644 --- a/core-tck/README.md +++ b/core-tck/README.md @@ -1,23 +1,12 @@ # Jakarta Core Profile TCK ## Prerequisite -To be able to download and install the Core Profile TCK dependencies, since they're not published to Maven +Install the Core Profile TCK dependencies, along with the other TCKs which make up the Core Profile, via tck-download modules, since the ones published to Maven Central are not allowed to be used for certification. -1. Run the `download.sh` script -2. Run the `install.sh` script - -If on Windows: - -1. Download https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/staged/eftl/jakarta-core-profile-tck-10.0.0.zip -2. Unzip it -3. Install the dependencies with `mvn install -f core-profile-tck-10.0.0\artifacts\pom.xml` +`mvn clean install -pl . -pl tck-download -pl tck-download/jakarta-jsonp-tck -pl tck-download/jakarta-jsonb-tck -pl tck-download/jakarta-rest-tck -pl tck-download/jakarta-cdi-tck -pl tck-download/jakarta-inject-tck -pl tck-download/jakarta-core-profile-tck` ## Test Execution -Required property to be able to execute test - -`payara.home` : path to payara installation - -Execute maven test with verify: +Execute maven test with verify from the top-level directory: -`mvn verify -Dpayara.home=[path to payara installation]` \ No newline at end of file +`mvn clean verify -Dpayara.home=[path to payara installation] -Ppayara-server-managed -pl . -pl core-tck` \ No newline at end of file diff --git a/core-tck/bundles/.gitkeep b/core-tck/bundles/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/core-tck/download.sh b/core-tck/download.sh deleted file mode 100644 index 5950e3a..0000000 --- a/core-tck/download.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -x - -SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" -BUNDLES=${SCRIPTPATH}/bundles - -if [ ! -f ${BUNDLES}/jakarta-core-profile-tck-10.0.0.zip ]; then - wget https://download.eclipse.org/jakartaee/coreprofile/10.0/jakarta-core-profile-tck-10.0.0.zip -O $BUNDLES/jakarta-core-profile-tck-10.0.0.zip -fi \ No newline at end of file diff --git a/core-tck/install.sh b/core-tck/install.sh deleted file mode 100644 index 6ee2910..0000000 --- a/core-tck/install.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -x - -SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" -BUNDLES=${SCRIPTPATH}/bundles - -if [ ! -d ${BUNDLES} ]; then - echo "bundles directory appears to be missing: panic and exit!" - exit 1 -fi - -if [ ! -f ${BUNDLES}/jakarta-core-profile-tck-10.0.0.zip ]; then - echo "10.0.0 TCK directory appears to be missing: panic and exit!" - exit 1 -fi - -cd ${BUNDLES} -unzip jakarta-core-profile-tck-10.0.0.zip -d . - -cd core-profile-tck-10.0.0/artifacts -mvn install - -cd ${SCRIPTPATH} diff --git a/core-tck/pom.xml b/core-tck/pom.xml index 84d4899..f2b84ff 100644 --- a/core-tck/pom.xml +++ b/core-tck/pom.xml @@ -51,45 +51,14 @@ core-tck - UTF-8 - 11 - 11 - - 10.0.0 - 5.8.2 - 1.7.0.Alpha10 - 3.0.alpha6 - 1.2.17 - 6.1.0.Beta2 - 5.0.0.SP1 - 3.0.0 - 3.0.0-M6 + 6.2.10.Final - - - - org.jboss.arquillian - arquillian-bom - ${arquillian.version} - import - pom - - - org.junit - junit-bom - ${junit.version} - import - pom - - - - jakarta.ee.tck.coreprofile core-profile-tck-impl - ${core.profile.tck.version} + ${jakarta.tck.core-profile.version} test @@ -114,14 +83,7 @@ junit-platform-reporting test - - - - fish.payara.arquillian - arquillian-payara-server-managed - ${payara.arquillian.version} - test - + org.jboss.arquillian.junit5 arquillian-junit5-container @@ -166,7 +128,6 @@ org.apache.maven.plugins maven-enforcer-plugin - ${maven.enforcer.plugin.version} enforce-payara-home-is-set @@ -190,7 +151,6 @@ org.apache.maven.plugins maven-failsafe-plugin - ${maven.failsafe.plugin.version} --add-exports=java.desktop/sun.awt=ALL-UNNAMED @@ -215,6 +175,7 @@ true + ${payara.home} payara-core-profile diff --git a/faces-tck/pom.xml-old-tck-run b/faces-tck/pom.xml-old-tck-run index 12450da..18c3472 100644 --- a/faces-tck/pom.xml-old-tck-run +++ b/faces-tck/pom.xml-old-tck-run @@ -1,7 +1,7 @@ @@ -24,10 +23,10 @@ org.eclipse.ee4j.faces.tck old-faces-tck-parent - 4.0.3 + 4.0.1 - old-tck-run + glassfish-external-tck-faces pom Old Jakarta Faces TCK - run @@ -36,17 +35,16 @@ 1.10.2 ${project.build.directory}/apache-ant-${ant.version} https://archive.apache.org/dist/ant/binaries/apache-ant-${ant.version}-bin.zip - + ${project.build.directory}/faces-tck ${tck.home}/src/com/sun/ts/tests standalone - ${skipITs} - + ${project.build.directory}/payara6 ${glassfish.home}/glassfish/bin/asadmin - + org/glassfish/**\:com/sun/enterprise/** - + 14848 11527 18080 @@ -69,7 +67,7 @@ org.eclipse.ee4j.faces.tck - old-tck-build + old-faces-tck ${project.version} zip @@ -91,7 +89,7 @@ - ${tck.old.skip} + ${skipITs} ${ant.zip.url} true ${project.build.directory} @@ -100,8 +98,9 @@ maven-dependency-plugin + 3.3.0 - ${tck.old.skip} + ${skipITs} @@ -122,7 +121,7 @@ unpack-dependencies - old-tck-build + old-faces-tck ${project.build.directory} @@ -151,16 +150,16 @@ - ${tck.old.skip} + ${skipITs} - prepare-tck-and-payara + prepare-tck-and-glassfish pre-integration-test - + @@ -168,7 +167,7 @@ match="@{key}=.*" replace="@{key}=@{value}" /> - + @@ -182,91 +181,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + @@ -280,15 +234,15 @@ - + - + - + ]]> @@ -309,31 +263,31 @@ - - + - + - + Deploying from ${test.dir} - - + + - + Deploying all archives - + @@ -375,15 +329,6 @@ - - - - - - - - - diff --git a/faces-tck/pom.xml-tck b/faces-tck/pom.xml-tck index a32fe59..1af2ebd 100755 --- a/faces-tck/pom.xml-tck +++ b/faces-tck/pom.xml-tck @@ -28,7 +28,7 @@ org.eclipse.ee4j.faces.tck jakarta-faces-tck - 4.0.3 + 4.0.1 pom Jakarta Faces ${project.version} TCK diff --git a/faces-tck/run-tck.sh b/faces-tck/run-tck.sh index 468ef54..82eb83f 100755 --- a/faces-tck/run-tck.sh +++ b/faces-tck/run-tck.sh @@ -5,18 +5,18 @@ fi rm -r target mkdir target -if [ ! -f target/jakarta-faces-tck-4.0.3.zip ]; then - echo "Downloading jakarta-faces-tck-4.0.3.zip" - wget -q https://download.eclipse.org/jakartaee/faces/4.0/jakarta-faces-tck-4.0.3.zip -O target/jakarta-faces-tck-4.0.3.zip +if [ ! -f target/jakarta-faces-tck-4.0.1.zip ]; then + echo "Downloading jakarta-faces-tck-4.0.1.zip" + wget -q https://download.eclipse.org/jakartaee/faces/4.0/jakarta-faces-tck-4.0.1.zip -O target/jakarta-faces-tck-4.0.1.zip fi echo "Unzipping" -rm -rf target/faces-tck-4.0.3 -unzip -q target/jakarta-faces-tck-4.0.3.zip -d target +rm -rf target/faces-tck-4.0.1 +unzip -q target/jakarta-faces-tck-4.0.1.zip -d target echo "Running TCK" # add payara profile, should be in the next version of upstream pom.xml -cp pom.xml-tck target/faces-tck-4.0.3/tck/pom.xml +cp pom.xml-tck target/faces-tck-4.0.1/tck/pom.xml # change usage of glassfish with payara -cp pom.xml-old-tck-run target/faces-tck-4.0.3/tck/old-tck/run/pom.xml -#mvn verify -P payara-ci-remote,\!glassfish-ci-managed -Dglassfish.version=6.2022.1.Alpha5-SNAPSHOT -f target/faces-tck-4.0.3/tck/pom.xml -pl old-tck -amd -mvn verify -P payara-ci-remote,\!glassfish-ci-managed -Dglassfish.version=6.2022.1.Alpha4 -f target/faces-tck-4.0.3/tck/pom.xml +cp pom.xml-old-tck-run target/faces-tck-4.0.1/tck/old-tck/run/pom.xml +#mvn verify -P payara-ci-remote,\!glassfish-ci-managed -Dglassfish.version=6.2022.1.Alpha5-SNAPSHOT -f target/faces-tck-4.0.1/tck/pom.xml -pl old-tck -amd +mvn verify -P payara-ci-remote,\!glassfish-ci-managed -Dglassfish.version=6.2022.1.Alpha4 -f target/faces-tck-4.0.1/tck/pom.xml \ No newline at end of file diff --git a/inject-tck/pom.xml b/inject-tck/pom.xml index 8a36c76..508fd14 100644 --- a/inject-tck/pom.xml +++ b/inject-tck/pom.xml @@ -50,13 +50,6 @@ inject-tck pom - - UTF-8 - 11 - 11 - - - diff --git a/jsonb-tck/README.md b/jsonb-tck/README.md index b5e0ef1..0f2b0d0 100644 --- a/jsonb-tck/README.md +++ b/jsonb-tck/README.md @@ -1,16 +1,21 @@ # Jakarta JSONB TCK ## Prerequisite -To be able to run the TCK test, you need to have running remote Payara Server locally at standart port (4848) +Download and install the TCK from the tck-downloads module. From the top-level directory: -## Test Execution +`mvn clean install -pl . -pl tck-download -pl tck-download/jakarta-jsonb-tck -Dpayara.version=...` -Required property to be able to execute signature test +## Test Execution -`payara.home` : path to payara installation +Run maven test from the module directory using remote arquillian profile, and provide the path to payara and its version -execute maven test here: -```angular2html -mvn test -Dpayara.home=[path to payara installation] ``` +cd jsonb-tck +mvn clean verify -Ppayara-server-remote -Dpayara.version=... -Dpayara.home=... +``` + +The test requires configuring a JVM option to pass (see https://github.com/jakartaee/jsonb-api/issues/330). +The runner will configure this for you and restart the DAS. +To skip server startup and shutdown, set `-DskipServerStartStop` to true. Defaults to false. +To skip server configuration, set to `-DskipConfig` to true. Defaults to false. \ No newline at end of file diff --git a/jsonb-tck/pom.xml b/jsonb-tck/pom.xml index 4de40b7..bc1a7ca 100644 --- a/jsonb-tck/pom.xml +++ b/jsonb-tck/pom.xml @@ -14,78 +14,33 @@ 1.0-SNAPSHOT - 11 - 11 - 1.6 - - - - ${payara.home}/glassfish/modules/jakarta.json.bind-api.jar - 3.0.alpha3 - 3.0.0 - ${project.build.directory}/jdk-bundle + ${payara.home}${file.separator}glassfish${file.separator}modules${file.separator}jakarta.json.bind-api.jar + ${project.build.directory}${file.separator}jdk-bundle + false - - - payara-nexus-artifacts - https://nexus.payara.fish/repository/payara-artifacts - - true - - - false - - - - - org.jboss.arquillian - arquillian-bom - 1.7.0.Alpha10 - import + fish.payara.api + payara-bom + ${payara.version} pom - - - org.junit - junit-bom - 5.8.2 import - pom - - - jakarta.json.bind - jakarta.json.bind-api - 3.0.0 - - + jakarta.json.bind jakarta.json.bind-tck - 3.0.0 + ${jakarta.tck.jsonb.version} test - - - fish.payara.arquillian - arquillian-payara-server-remote - ${payara.arquillian.container.version} - test - - - fish.payara.arquillian - payara-client-ee9 - ${payara.arquillian.container.version} - test - + org.jboss.arquillian.junit5 arquillian-junit5-container @@ -116,31 +71,82 @@ - jakarta.enterprise - jakarta.enterprise.cdi-api - 3.0.0 - test - - - org.eclipse.parsson - parsson - 1.1.0 + fish.payara.arquillian + payara-client-ee9 test - org.eclipse.parsson - parsson-media - 1.1.0 + jakarta.enterprise + jakarta.enterprise.cdi-api test + + org.apache.maven.plugins + maven-antrun-plugin + + + + add-jvm-option-workaround + pre-integration-test + + run + + + + + + + + + + + + + restart-payara-server + pre-integration-test + + run + + + + + + + + + + + + + ${skipTests} + + + org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + + true + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + run-tests + integration-test + + integration-test + verify + + + jakarta.json.bind:jakarta.json.bind-tck @@ -148,10 +154,13 @@ JSONBSigTest* + + * + true ${jimage.dir} - ${payara.json-bind-api.jar}${path.separator}${jimage.dir}/java.base${path.separator}${jimage.dir}/java.rmi${path.separator}${jimage.dir}/java.sql${path.separator}${jimage.dir}/java.naming + ${payara.json-bind-api.jar}${path.separator}${jimage.dir}${file.separator}java.base${path.separator}${jimage.dir}${file.separator}java.rmi${path.separator}${jimage.dir}${file.separator}java.sql${path.separator}${jimage.dir}${file.separator}java.naming diff --git a/jsonp-tck/README.md b/jsonp-tck/README.md new file mode 100644 index 0000000..321dc08 --- /dev/null +++ b/jsonp-tck/README.md @@ -0,0 +1,16 @@ +# Jakarta JSON Processing + +## Prerequisites +Download and install the TCK from the tck-downloads module. From the top-level directory: + +`mvn clean install -pl . -pl tck-download -pl tck-download/jakarta-jsonp-tck -Dpayara.version=...` + +## Test Executions +**(Make sure the Payara server up and running)** + +Run maven test from the module directory using remote arquillian profile, and provide the path to payara and its version + +``` +cd jsonp-tck +mvn clean verify -Ppayara-server-remote -Dpayara.version=... -Dpayara.home=... +``` \ No newline at end of file diff --git a/jsonp-tck/glassfish-runner-pluggability/pom.xml b/jsonp-tck/glassfish-runner-pluggability/pom.xml index 94eedb3..053bc9b 100644 --- a/jsonp-tck/glassfish-runner-pluggability/pom.xml +++ b/jsonp-tck/glassfish-runner-pluggability/pom.xml @@ -18,59 +18,32 @@ jakarta.json jakarta.json-tck-common - ${jsonp.api.version} + ${jakarta.tck.jsonp.version} test jakarta.json jakarta.json-tck-tests-pluggability - ${jsonp.api.version} + ${jakarta.tck.jsonp.version} test - jakarta.json - jakarta.json-api + org.junit.jupiter + * - org.netbeans.tools - sigtest-maven-plugin - 1.6 + org.junit.jupiter + junit-jupiter-engine + test - - org.apache.maven.plugins - maven-dependency-plugin - 3.2.0 - - - unpack - generate-test-resources - - unpack - - - - - fish.payara.distributions - ${payara.artifact} - ${payara.version} - zip - false - ${project.build.directory} - - - - - - maven-surefire-plugin - 3.0.0-M5 false false @@ -78,14 +51,13 @@ true jakarta.json:jakarta.json-tck-tests-pluggability - ${project.build.directory}/payara6/glassfish/modules/jakarta.json.jar - ${project.build.directory}/payara6/glassfish/modules/parsson.jar + ${payara.home}${file.separator}glassfish${file.separator}modules${file.separator}jakarta.json.jar + ${payara.home}${file.separator}glassfish${file.separator}modules${file.separator}parsson.jar maven-surefire-report-plugin - 3.0.0-M5 post-unit-test diff --git a/jsonp-tck/glassfish-runner/pom.xml b/jsonp-tck/glassfish-runner/pom.xml index 96792e5..0a6b3d9 100644 --- a/jsonp-tck/glassfish-runner/pom.xml +++ b/jsonp-tck/glassfish-runner/pom.xml @@ -18,13 +18,13 @@ jakarta.json jakarta.json-tck-common - ${jsonp.api.version} + ${jakarta.tck.jsonp.version} test jakarta.json jakarta.json-tck-tests - ${jsonp.api.version} + ${jakarta.tck.jsonp.version} test @@ -33,44 +33,21 @@ + + org.junit.jupiter + junit-jupiter-engine + test + org.netbeans.tools sigtest-maven-plugin - 1.6 - - org.apache.maven.plugins - maven-dependency-plugin - 3.2.0 - - - unpack - generate-test-resources - - unpack - - - - - fish.payara.distributions - ${payara.artifact} - ${payara.version} - zip - false - ${project.build.directory} - - - - - - maven-surefire-plugin - 3.0.0-M5 false false @@ -78,12 +55,12 @@ true jakarta.json:jakarta.json-tck-tests - ${project.build.directory}/jdk-bundle - ${project.build.directory}/payara6/glassfish/modules/jakarta.json.jar:${project.build.directory}/jdk-bundle/java.base:${project.build.directory}/jdk-bundle/java.rmi:${project.build.directory}/jdk-bundle/java.sql:${project.build.directory}/jdk-bundle/java.naming + ${project.build.directory}${file.separator}jdk-bundle + ${payara.home}${file.separator}glassfish${file.separator}modules${file.separator}jakarta.json.jar${path.separator}${project.build.directory}${file.separator}jdk-bundle${file.separator}java.base${path.separator}${project.build.directory}${file.separator}jdk-bundle${file.separator}java.rmi${path.separator}${project.build.directory}${file.separator}jdk-bundle${file.separator}java.sql${path.separator}${project.build.directory}${file.separator}jdk-bundle${file.separator}java.naming - ${project.build.directory}/payara6/glassfish/modules/jakarta.json.jar - ${project.build.directory}/payara6/glassfish/modules/parsson.jar + ${payara.home}${file.separator}glassfish${file.separator}modules${file.separator}jakarta.json.jar + ${payara.home}${file.separator}glassfish${file.separator}modules${file.separator}parsson.jar diff --git a/jsonp-tck/payara-runner/pom.xml b/jsonp-tck/payara-runner/pom.xml index 670d199..2fefa7b 100644 --- a/jsonp-tck/payara-runner/pom.xml +++ b/jsonp-tck/payara-runner/pom.xml @@ -18,33 +18,24 @@ - ${project.build.directory}/jdk-bundle + ${project.build.directory}${file.separator}jdk-bundle - 3.0.alpha6 - - ${payara.home}/glassfish/modules/jakarta.json.jar + ${payara.home}${file.separator}glassfish${file.separator}modules${file.separator}jakarta.json.jar - org.jboss.arquillian - arquillian-bom - 1.7.0.Alpha10 - import + fish.payara.api + payara-bom + ${payara.version} pom - - - org.junit - junit-bom - 5.8.2 import - pom jakarta.json jakarta.json-tck - ${jsonp.api.version} + ${jakarta.tck.jsonp.version} pom import @@ -56,32 +47,23 @@ jakarta.json jakarta.json-tck-tests - ${jsonp.api.version} + ${jakarta.tck.jsonp.version} test jakarta.json jakarta.json-tck-tests-pluggability - ${jsonp.api.version} + ${jakarta.tck.jsonp.version} test org.netbeans.tools sigtest-maven-plugin - 1.6 - - - fish.payara.arquillian - arquillian-payara-server-remote - ${payara.arquillian.container.version} - test - fish.payara.arquillian payara-client-ee9 - ${payara.arquillian.container.version} test @@ -111,20 +93,6 @@ junit-platform-reporting test - - - - jakarta.enterprise - jakarta.enterprise.cdi-api - 3.0.0 - test - - - org.eclipse.parsson - parsson-media - 1.1.0 - test - @@ -132,8 +100,6 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 - default-test @@ -156,7 +122,7 @@ true ${jimage.dir} jakarta.xml.bind - ${payara.json-api.jar}${path.separator}${jimage.dir}/java.base${path.separator}${jimage.dir}/java.rmi${path.separator}${jimage.dir}/java.sql${path.separator}${jimage.dir}/java.naming + ${payara.json-api.jar}${path.separator}${jimage.dir}${file.separator}java.base${path.separator}${jimage.dir}${file.separator}java.rmi${path.separator}${jimage.dir}${file.separator}java.sql${path.separator}${jimage.dir}${file.separator}java.naming diff --git a/jsonp-tck/pom.xml b/jsonp-tck/pom.xml index 51a1dc1..7bf309b 100644 --- a/jsonp-tck/pom.xml +++ b/jsonp-tck/pom.xml @@ -17,11 +17,7 @@ This pom runs the JakartaEE JSON Processing TCK. - UTF-8 - 11 - 11 - 2.1.1 - + true @@ -30,18 +26,4 @@ glassfish-runner-pluggability - - - - payara-nexus-artifacts - https://nexus.payara.fish/repository/payara-artifacts - - true - - - false - - - - \ No newline at end of file diff --git a/pages-tck/README.md b/pages-tck/README.md new file mode 100644 index 0000000..8a9fca3 --- /dev/null +++ b/pages-tck/README.md @@ -0,0 +1,13 @@ +# Jakarta Pages + +## Prerequisites +Download and install the TCK from the tck-downloads module. From the top-level directory: + +`mvn clean install -pl . -pl tck-download -pl tck-download/jakarta-pages-tck -Dpayara.version=...` + +## Test Executions +Run maven test from the top-level directory using managed arquillian profile + +``` +mvn clean verify -Ppayara-server-managed -Dpayara.version=... -pl . -pl pages-tck +``` \ No newline at end of file diff --git a/pages-tck/pom.xml b/pages-tck/pom.xml index d08ad9c..7bee6ff 100644 --- a/pages-tck/pom.xml +++ b/pages-tck/pom.xml @@ -17,7 +17,8 @@ --> - + 4.0.0 @@ -31,12 +32,12 @@ TCK: pages - + ${project.build.directory}/pages-tck - ${tck.home}/src/com/sun/ts/tests - + ${tck.home}/src/com/sun/ts/tests + org/glassfish/**\:com/sun/enterprise/** - + 4848 11527 18080 @@ -50,12 +51,6 @@ - - fish.payara.distributions - ${payara.artifact} - ${payara.version} - zip - fish.payara.jakarta.tests.tck jakarta-pages-tck @@ -70,7 +65,6 @@ com.googlecode.maven-download-plugin download-maven-plugin - 1.6.8 download-ant @@ -78,20 +72,19 @@ wget + + ${skipTests} + ${ant.zip.url} + true + - - ${skipITs} - ${ant.zip.url} - true - ${project.build.directory} - maven-dependency-plugin - ${skipITs} + ${skipTests} @@ -122,7 +115,6 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 org.apache.ant @@ -142,7 +134,7 @@ - ${skipITs} + ${skipTests} @@ -151,18 +143,18 @@ - + - + - + - + @@ -172,19 +164,19 @@ - + - + - + - - + + @@ -218,16 +210,16 @@ - + - ]]> - + ]]> + ]]> - + - ]]> - + ]]> + ]]> @@ -252,22 +244,22 @@ - + - - Deploying from ${test.dir} - - - - + + Deploying from ${test.dir} + + + + - + - - - + + + @@ -284,7 +276,7 @@ - + diff --git a/pom.xml b/pom.xml index c2e5e35..ddb6319 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ + 6.2024.11-SNAPSHOT + + ${payara.home}${file.separator}glassfish${file.separator}bin${file.separator}asadmin${script.extension} payara + domain1 + 3.1 + false + ${skipTests} + ${skipTests} - 1.7.0.Alpha10 + + 3.1.2 + 3.3.0 + 3.3.1 + 3.5.0 + 3.7.1 + 3.5.0 + 3.1.0 + 3.3.0 + 1.9.0 + 1.9.1.Final + 5.10.3 + ${project.build.directory}${file.separator}jdk-bundle + 3.3.0 + 2.0.0 + 1.6 + + + 2.1.0 + 3.1.5 + 2.1.0 + 3.1.0 + 4.0.13 + 4.0.1 + 6.0.2 + 3.0.2 + 2.1.1 + 3.0.0 + 2.1.5 + 10.0.3 + 2.0.2 + + + full + ${jakarta.tck.platform} payara-nexus-artifacts - https://nexus.payara.fish/repository/payara-artifacts + https://nexus.dev.payara.fish/repository/payara-artifacts true @@ -73,9 +123,10 @@ + + tck-download authorization-tck - - + batch-tck cdi-langmodel-tck cdi-tck concurrent-tck @@ -87,11 +138,152 @@ rest-tck servlet-tck tags-tck - tck-download websocket-tck - tck-summarizer + summarizer + + + + org.jboss.arquillian + arquillian-bom + ${arquillian.version} + import + pom + + + org.jboss.shrinkwrap.resolver + shrinkwrap-resolver-bom + ${shrinkwrap.resolver.version} + pom + import + + + org.jboss.shrinkwrap.descriptors + shrinkwrap-descriptors-bom + ${shrinkwrap.descriptors.version} + pom + import + + + + org.junit + junit-bom + ${junit.version} + pom + import + + + + org.netbeans.tools + sigtest-maven-plugin + ${sigtest-maven-plugin.version} + test + + + + fish.payara.distributions + payara + ${payara.version} + zip + test + + + fish.payara.distributions + payara-web + ${payara.version} + zip + test + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin.version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-failsafe-plugin.version} + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin.version} + + + com.googlecode.maven-download-plugin + download-maven-plugin + ${download-maven-plugin.version} + + + + org.codehaus.mojo + exec-maven-plugin + ${exec-maven-plugin.version} + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven-enforcer-plugin.version} + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + org.apache.maven.plugins + maven-surefire-report-plugin + ${maven-surefire-report-plugin.version} + + + + org.netbeans.tools + sigtest-maven-plugin + ${sigtest-maven-plugin.version} + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-versions + + enforce + + + + + [${jdk.version},) + You need at least JDK11 + + + + + + + + + web @@ -101,6 +293,108 @@ payara-web + web + + + + jakarta-staging + + + jakarta-releases + https://jakarta.oss.sonatype.org/content/groups/staging/ + + true + + + false + + + + + + + payara-server-remote + + + + true + + + + + fish.payara.arquillian + arquillian-payara-server-remote + ${payara.arquillian.version} + test + + + + + + payara-server-managed + + + + + + + + fish.payara.distributions + ${payara.artifact} + zip + + + + fish.payara.arquillian + arquillian-payara-server-managed + ${payara.arquillian.version} + test + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-server + + unpack + + pre-integration-test + false + + ${skipConfig} + + + fish.payara.distributions + ${payara.artifact} + ${payara.version} + zip + true + ${maven.multiModuleProjectDirectory}${file.separator}target + + + + + + + + + + + + windows + + + Windows + + + + .bat + ${ant.home}${file.separator}bin${file.separator}ant.cmd diff --git a/rest-tck/README.MD b/rest-tck/README.MD index 6af6d9b..1495637 100644 --- a/rest-tck/README.MD +++ b/rest-tck/README.MD @@ -7,17 +7,21 @@ Comprised of two modules: ## Prerequisities -* Install TCK artifact in local Maven repository by running `mvn install` in `/tck-download/jakarta-rest-tck`. +Download and install the TCK from the tck-downloads module. From the top-level directory: -## Additional properties - -`payara.home`: -path to payara installation, so that SigTest can verify jar files statically +`mvn clean install -pl . -pl tck-download -pl tck-download/jakarta-rest-tck -Dpayara.version=...` ## Running ### Main TCK -Run `mvn verify -Dpayara.home=/path/to/payara` +**(Make sure the Payara server up and running)** + +Run maven test from the module directory using remote arquillian profile, and provide the path to payara and its version + +``` +cd rest-tck +mvn clean verify -Dpayara.version=... -Dpayara.home=... +``` ### SE Tests * Make sure you don't have a running server diff --git a/rest-tck/payara-server-remote-tests/pom.xml b/rest-tck/payara-server-remote-tests/pom.xml index e716bc8..4540fe3 100644 --- a/rest-tck/payara-server-remote-tests/pom.xml +++ b/rest-tck/payara-server-remote-tests/pom.xml @@ -11,19 +11,22 @@ rest-tck-payara-server-remote-tests + + ${project.build.directory}${file.separator}jdk-bundle + + jakarta.ws.rs jakarta-restful-ws-tck - ${rest-tck.version} + ${jakarta-rest-tck.version} test fish.payara.arquillian arquillian-payara-server-remote - 3.0.alpha6 test @@ -55,6 +58,11 @@ jersey-media-sse test + + org.glassfish.jersey.media + jersey-media-multipart + test + org.junit.jupiter @@ -70,7 +78,25 @@ org.jboss.arquillian.protocol - arquillian-protocol-servlet-jakarta + arquillian-protocol-servlet + + + + org.hamcrest + hamcrest + test + + + + commons-httpclient + commons-httpclient + 3.1 + test + + + + org.netbeans.tools + sigtest-maven-plugin @@ -78,7 +104,7 @@ com.sun.xml.bind jaxb-impl - 3.0.0 + 4.0.1 runtime @@ -98,7 +124,7 @@ exec - ${asadmin} + ${payara.asadmin} set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true @@ -112,7 +138,7 @@ exec - ${asadmin} + ${payara.asadmin} --passwordfile ${project.basedir}/j2ee.pass @@ -132,13 +158,13 @@ exec - ${asadmin} + ${payara.asadmin} --passwordfile ${project.basedir}/j2ee.pass create-file-user --groups - staff:mgr + staff:mgr:DIRECTOR j2ee @@ -150,7 +176,7 @@ exec - ${asadmin} + ${payara.asadmin} --passwordfile ${project.basedir}/javajoe.pass @@ -170,13 +196,13 @@ exec - ${asadmin} + ${payara.asadmin} --passwordfile ${project.basedir}/javajoe.pass create-file-user --groups - guest + guest:OTHERROLE javajoe @@ -188,7 +214,7 @@ exec - ${asadmin} + ${payara.asadmin} list-file-users @@ -200,7 +226,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.0.0-M6 payara-tests @@ -222,9 +247,9 @@ false ee.jakarta.tck.ws.rs.lib.implementation.sun.common.SunRIURL - ${project.build.directory}/jdk11-bundle + ${jimage.dir} jakarta.xml.bind - ${payara.home}/glassfish/modules/jakarta.ws.rs-api.jar${path.separator}${payara.home}/glassfish/modules/jakarta.xml.bind-api.jar${path.separator}${project.build.directory}/jdk11-bundle/java.base${path.separator}${project.build.directory}/jdk11-bundle/java.rmi${path.separator}${project.build.directory}/jdk11-bundle/java.sql${path.separator}${project.build.directory}/jdk11-bundle/java.naming + ${payara.home}${file.separator}glassfish${file.separator}modules${file.separator}jakarta.ws.rs-api.jar${path.separator}${payara.home}${file.separator}glassfish${file.separator}modules${file.separator}jakarta.xml.bind-api.jar${path.separator}${jimage.dir}${file.separator}java.base${path.separator}${jimage.dir}${file.separator}java.rmi${path.separator}${jimage.dir}${file.separator}java.sql${path.separator}${jimage.dir}${file.separator}java.naming jakarta.ws.rs:jakarta-restful-ws-tck @@ -232,14 +257,6 @@ ee.jakarta.tck.ws.rs.jaxrs21.ee.client.executor.rx.JAXRSClientIT ee.jakarta.tck.ws.rs.jaxrs21.ee.client.rxinvoker.JAXRSClientIT - - false - 3.0 - false - true - true - true - diff --git a/rest-tck/pom.xml b/rest-tck/pom.xml index 22ef89d..09c3925 100644 --- a/rest-tck/pom.xml +++ b/rest-tck/pom.xml @@ -19,16 +19,10 @@ - 11 - 11 - 3.1.2 - 5.7.2 localhost - ../../../payara/appserver/distributions/payara/target/stage/payara6/ - ${payara.home}/bin/asadmin diff --git a/rest-tck/se-tests/pom.xml b/rest-tck/se-tests/pom.xml index ab9c102..3a8a3d6 100644 --- a/rest-tck/se-tests/pom.xml +++ b/rest-tck/se-tests/pom.xml @@ -16,14 +16,13 @@ jakarta.ws.rs jakarta-restful-ws-tck - ${rest-tck.version} + ${jakarta-rest-tck.version} test fish.payara.arquillian arquillian-payara-server-remote - 3.0.alpha6 test @@ -70,7 +69,13 @@ org.jboss.arquillian.protocol - arquillian-protocol-servlet-jakarta + arquillian-protocol-servlet + + + + org.hamcrest + hamcrest + test @@ -78,7 +83,7 @@ com.sun.xml.bind jaxb-impl - 3.0.0 + 4.0.1 runtime @@ -89,7 +94,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.0.0-M6 se-tests diff --git a/servlet-tck/README.md b/servlet-tck/README.md new file mode 100644 index 0000000..45f3376 --- /dev/null +++ b/servlet-tck/README.md @@ -0,0 +1,13 @@ +# Jakarta Servlet + +## Prerequisites +Download and install the TCK from the tck-downloads module. From the top-level directory: + +`mvn clean install -pl . -pl tck-download -pl tck-download/jakarta-servlet-tck -Dpayara.version=...` + +## Test Executions +Run maven test from the top-level directory using managed arquillian profile + +``` +mvn clean verify -Ppayara-server-managed -Dpayara.version=... -pl . -pl servlet-tck +``` \ No newline at end of file diff --git a/servlet-tck/pom.xml b/servlet-tck/pom.xml index 683836f..d130781 100644 --- a/servlet-tck/pom.xml +++ b/servlet-tck/pom.xml @@ -1,7 +1,7 @@ + + maven-install-plugin + + + default-install + disabled + + + + com.googlecode.maven-download-plugin download-maven-plugin - 1.6.8 download-ant @@ -78,33 +76,21 @@ wget + + ${skipTests} + ${ant.zip.url} + true + - - ${skipITs} - ${ant.zip.url} - true - ${project.build.directory} - maven-dependency-plugin - ${skipITs} + ${skipTests} - - unpack-payara - pre-integration-test - - unpack-dependencies - - - ${payara.artifact} - ${project.build.directory} - - unpack-tck pre-integration-test @@ -122,7 +108,6 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 org.apache.ant @@ -142,7 +127,7 @@ - ${skipITs} + ${skipTests} @@ -151,7 +136,7 @@ - + @@ -159,26 +144,26 @@ match="@{key}=.*" replace="@{key}=@{value}" /> - + - + - + - + - + - + @@ -216,13 +201,13 @@ - + ]]> ]]> - + ]]> @@ -244,7 +229,7 @@ - + @@ -252,22 +237,22 @@ - + - + Deploying from ${test.dir} - + - + @@ -310,7 +295,7 @@ - + diff --git a/soap-tck/run-tck.sh b/soap-tck/run-tck.sh index 1178238..4f1b96e 100755 --- a/soap-tck/run-tck.sh +++ b/soap-tck/run-tck.sh @@ -9,10 +9,10 @@ export TS_HOME=`pwd`/soap-tck #/home/aubi/work/payara/server/defects/FISH-6064-upgrade-metro/soap-tck export PATH=${PATH}:${TS_HOME}/bin -rm jakarta-soap-tck-3.0.0.zip -wget https://download.eclipse.org/jakartaee/soap-attachments/3.0/jakarta-soap-tck-3.0.0.zip +rm jakarta-soap-tck-3.0.1.zip +wget https://download.eclipse.org/jakartaee/soap-attachments/3.0/jakarta-soap-tck-3.0.1.zip rm -rf ./soap-tck -unzip jakarta-soap-tck-3.0.0.zip +unzip jakarta-soap-tck-3.0.1.zip # replace settings if [[ ! -f ${TS_HOME}/bin/ts.jte-origin ]] @@ -32,4 +32,4 @@ ant config.vi -Dwork.dir=${TS_HOME}/JTwork -Dreport.dir=${TS_HOME}/JTreport ant deploy.all -Dwork.dir=${TS_HOME}/JTwork -Dreport.dir=${TS_HOME}/JTreport -ant run.all -Dwork.dir=${TS_HOME}/JTwork -Dreport.dir=${TS_HOME}/JTreport \ No newline at end of file +ant run.all -Dwork.dir=${TS_HOME}/JTwork -Dreport.dir=${TS_HOME}/JTreport diff --git a/summarizer/pom.xml b/summarizer/pom.xml index 01d12e9..85defa1 100644 --- a/summarizer/pom.xml +++ b/summarizer/pom.xml @@ -43,16 +43,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + fish.payara.jakarta.tests.tck + tck + 1.0-SNAPSHOT + fish.payara.internal tck-summarizer 1.0-SNAPSHOT - - 11 - 11 - - junit diff --git a/tags-tck/README.md b/tags-tck/README.md new file mode 100644 index 0000000..44855c1 --- /dev/null +++ b/tags-tck/README.md @@ -0,0 +1,14 @@ +# Jakarta Tags + +## Prerequisites +Download and install the TCK from the tck-downloads module. From the top-level directory: + +`mvn clean install -pl . -pl tck-download -pl tck-download/jakarta-tags-tck -Dpayara.version=...` + +## Test Executions +Run maven test from the module directory + +``` +cd tags-tck +mvn clean verify -Dpayara.version=... +``` \ No newline at end of file diff --git a/tags-tck/pom.xml b/tags-tck/pom.xml index f663e20..7eea42b 100644 --- a/tags-tck/pom.xml +++ b/tags-tck/pom.xml @@ -35,12 +35,6 @@ - - fish.payara.distributions - ${payara.artifact} - ${payara.version} - zip - fish.payara.jakarta.tests.tck jakarta-tags-tck @@ -55,7 +49,6 @@ com.googlecode.maven-download-plugin download-maven-plugin - 1.6.8 download-ant @@ -64,10 +57,9 @@ wget - ${skipITs} + ${skipTests} ${ant.zip.url} true - ${project.build.directory} @@ -77,10 +69,9 @@ wget - ${skipITs} + ${skipTests} ${derby.zip.url} true - ${project.build.directory} @@ -90,20 +81,9 @@ maven-dependency-plugin - ${skipITs} + ${skipTests} - - unpack-payara - pre-integration-test - - unpack-dependencies - - - ${payara.artifact} - ${project.build.directory} - - unpack-tck pre-integration-test @@ -121,7 +101,6 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 org.apache.ant @@ -141,7 +120,7 @@ - ${skipITs} + ${skipTests} diff --git a/tck-download/jakarta-authorization-tck/pom.xml b/tck-download/jakarta-authorization-tck/pom.xml index 1b43ed9..31240d4 100644 --- a/tck-download/jakarta-authorization-tck/pom.xml +++ b/tck-download/jakarta-authorization-tck/pom.xml @@ -33,7 +33,7 @@ TCK: Install Jakarta Authorization TCK - jakarta-authorization-tck-2.1.0.zip + jakarta-authorization-tck-${jakarta-authorization-tck.version}.zip https://download.eclipse.org/jakartaee/authorization/2.1/${tck.test.authorization.file} @@ -49,13 +49,11 @@ wget + + ${tck.tests.authorization.url} + - - ${tck.tests.authorization.url} - false - ${project.build.directory} - maven-install-plugin diff --git a/tck-download/jakarta-batch-tck/pom.xml b/tck-download/jakarta-batch-tck/pom.xml new file mode 100644 index 0000000..6ab41b3 --- /dev/null +++ b/tck-download/jakarta-batch-tck/pom.xml @@ -0,0 +1,81 @@ + + + 4.0.0 + + fish.payara.jakarta.tests.tck + tck-download + 1.0-SNAPSHOT + + + jakarta-batch-tck + + pom + + TCK: Install Jakarta Batch TCK + + + https://download.eclipse.org/jakartaee/batch/2.1/jakarta.batch.official.tck-${jakarta.tck.batch.version}.zip + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + + + download-batch-tck + generate-resources + + wget + + + ${tck.tests.jsonb.url} + true + + + + + + maven-install-plugin + + + install-batch-tck + process-resources + + install-file + + + ${project.build.directory}${file.separator}jakarta.batch.official.tck-${jakarta.tck.batch.version}${file.separator}artifacts${file.separator}com.ibm.jbatch.tck-${jakarta.tck.batch.version}.jar + jakarta.batch + com.ibm.jbatch.tck + ${jakarta.tck.batch.version} + jar + ${project.build.directory}${file.separator}jakarta.batch.official.tck-${jakarta.tck.batch.version}${file.separator}artifacts${file.separator}com.ibm.jbatch.tck-${jakarta.tck.batch.version}-sources.jar + ${project.build.directory}${file.separator}jakarta.batch.official.tck-${jakarta.tck.batch.version}${file.separator}artifacts${file.separator}com.ibm.jbatch.tck-${jakarta.tck.batch.version}-javadoc.jar + + + + install-batch-tck-spi + process-resources + + install-file + + + ${project.build.directory}${file.separator}jakarta.batch.official.tck-${jakarta.tck.batch.version}${file.separator}artifacts${file.separator}com.ibm.jbatch.tck.spi-${jakarta.tck.batch.version}.jar + jakarta.batch + com.ibm.jbatch.tck.spi + ${jakarta.tck.batch.version} + jar + ${project.build.directory}${file.separator}jakarta.batch.official.tck-${jakarta.tck.batch.version}${file.separator}artifacts${file.separator}com.ibm.jbatch.tck.spi-${jakarta.tck.batch.version}-sources.jar + ${project.build.directory}${file.separator}jakarta.batch.official.tck-${jakarta.tck.batch.version}${file.separator}artifacts${file.separator}com.ibm.jbatch.tck.spi-${jakarta.tck.batch.version}-javadoc.jar + + + + + + + + \ No newline at end of file diff --git a/tck-download/jakarta-cdi-tck/pom.xml b/tck-download/jakarta-cdi-tck/pom.xml new file mode 100644 index 0000000..d764992 --- /dev/null +++ b/tck-download/jakarta-cdi-tck/pom.xml @@ -0,0 +1,184 @@ + + + 4.0.0 + + fish.payara.jakarta.tests.tck + tck-download + 1.0-SNAPSHOT + + + jakarta-cdi-tck + + pom + + TCK: Install Jakarta CDI TCK + + + https://download.eclipse.org/jakartaee/cdi/4.0/cdi-tck-${jakarta.tck.cdi.version}-dist.zip + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + + + download-cdi-tck + generate-resources + + wget + + + ${tck.tests.cdi.url} + true + + + + + + maven-install-plugin + + + install-cdi-tck-parent-pom + process-resources + + install-file + + + ${project.build.directory}${file.separator}cdi-tck-${jakarta.tck.cdi.version}${file.separator}artifacts${file.separator}cdi-tck-parent-${jakarta.tck.cdi.version}.pom + jakarta.enterprise + cdi-tck-parent + ${jakarta.tck.cdi.version} + pom + + + + install-cdi-tck-api + process-resources + + install-file + + + ${project.build.directory}${file.separator}cdi-tck-${jakarta.tck.cdi.version}${file.separator}artifacts${file.separator}cdi-tck-api-${jakarta.tck.cdi.version}.jar + jakarta.enterprise + cdi-tck-api + ${jakarta.tck.cdi.version} + jar + ${project.build.directory}${file.separator}cdi-tck-${jakarta.tck.cdi.version}${file.separator}artifacts${file.separator}cdi-tck-api-${jakarta.tck.cdi.version}-sources.jar + ${project.build.directory}${file.separator}cdi-tck-${jakarta.tck.cdi.version}${file.separator}artifacts${file.separator}cdi-tck-api-${jakarta.tck.cdi.version}-javadoc.jar + + + + install-cdi-tck-core-impl + process-resources + + install-file + + + ${project.build.directory}${file.separator}cdi-tck-${jakarta.tck.cdi.version}${file.separator}artifacts${file.separator}cdi-tck-core-impl-${jakarta.tck.cdi.version}.jar + jakarta.enterprise + cdi-tck-core-impl + ${jakarta.tck.cdi.version} + jar + ${project.build.directory}${file.separator}cdi-tck-${jakarta.tck.cdi.version}${file.separator}artifacts${file.separator}cdi-tck-core-impl-${jakarta.tck.cdi.version}-sources.jar + + + + install-cdi-tck-ext-lib + process-resources + + install-file + + + ${project.build.directory}${file.separator}cdi-tck-${jakarta.tck.cdi.version}${file.separator}artifacts${file.separator}cdi-tck-ext-lib-${jakarta.tck.cdi.version}.jar + jakarta.enterprise + cdi-tck-ext-lib + ${jakarta.tck.cdi.version} + jar + + + + install-cdi-tck-lang-model + process-resources + + install-file + + + ${project.build.directory}${file.separator}cdi-tck-${jakarta.tck.cdi.version}${file.separator}artifacts${file.separator}cdi-tck-lang-model-${jakarta.tck.cdi.version}.jar + jakarta.enterprise + cdi-tck-lang-model + ${jakarta.tck.cdi.version} + jar + + + + install-cdi-tck-core-impl-suite + process-resources + + install-file + + + ${project.build.directory}${file.separator}cdi-tck-${jakarta.tck.cdi.version}${file.separator}artifacts${file.separator}cdi-tck-core-impl-${jakarta.tck.cdi.version}-suite.xml + jakarta.enterprise + cdi-tck-core-impl + ${jakarta.tck.cdi.version} + xml + suite + false + + + + install-cdi-tck-web-impl + process-resources + + install-file + + + ${project.build.directory}${file.separator}cdi-tck-${jakarta.tck.cdi.version}${file.separator}artifacts${file.separator}cdi-tck-web-impl-${jakarta.tck.cdi.version}.jar + jakarta.enterprise + cdi-tck-web-impl + ${jakarta.tck.cdi.version} + jar + ${project.build.directory}${file.separator}cdi-tck-${jakarta.tck.cdi.version}${file.separator}artifacts${file.separator}cdi-tck-web-impl-${jakarta.tck.cdi.version}-sources.jar + + + + install-cdi-tck-web-impl-suite + process-resources + + install-file + + + ${project.build.directory}${file.separator}cdi-tck-${jakarta.tck.cdi.version}${file.separator}artifacts${file.separator}cdi-tck-web-impl-${jakarta.tck.cdi.version}-suite.xml + jakarta.enterprise + cdi-tck-web-impl + ${jakarta.tck.cdi.version} + xml + suite + false + + + + install-cdi-tck-core-impl-sigtest + process-resources + + install-file + + + ${project.build.directory}${file.separator}cdi-tck-${jakarta.tck.cdi.version}${file.separator}artifacts${file.separator}cdi-tck-core-impl-${jakarta.tck.cdi.version}-sigtest-jdk11.sig + jakarta.enterprise + cdi-tck-core-impl + ${jakarta.tck.cdi.version} + sig + sigtest-jdk17 + false + + + + + + + \ No newline at end of file diff --git a/tck-download/jakarta-concurrency-tck/pom.xml b/tck-download/jakarta-concurrency-tck/pom.xml new file mode 100644 index 0000000..d4a5539 --- /dev/null +++ b/tck-download/jakarta-concurrency-tck/pom.xml @@ -0,0 +1,77 @@ + + + 4.0.0 + + fish.payara.jakarta.tests.tck + tck-download + 1.0-SNAPSHOT + + + jakarta-concurrency-tck + + pom + + TCK: Install Jakarta Concurrency TCK + + + https://download.eclipse.org/jakartaee/concurrency/3.0/concurrency-tck-${jakarta.tck.concurrency.version}.zip + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + + + download-concurrency-tck + generate-resources + + wget + + + ${tck.tests.concurrency.url} + true + + + + + + maven-install-plugin + + + install-concurrency-tck-parent-pom + process-resources + + install-file + + + ${project.build.directory}${file.separator}concurrency-tck-${jakarta.tck.concurrency.version}${file.separator}artifacts${file.separator}jakarta.enterprise.concurrent.parent-${jakarta.tck.concurrency.version}.pom + jakarta.enterprise.concurrent + jakarta.enterprise.concurrent.parent + ${jakarta.tck.concurrency.version} + pom + + + + install-concurrency-tck + process-resources + + install-file + + + ${project.build.directory}${file.separator}concurrency-tck-${jakarta.tck.concurrency.version}${file.separator}artifacts${file.separator}jakarta.enterprise.concurrent-tck-${jakarta.tck.concurrency.version}.jar + jakarta.enterprise.concurrent + jakarta.enterprise.concurrent-tck + ${jakarta.tck.concurrency.version} + jar + + + + + + + + \ No newline at end of file diff --git a/tck-download/jakarta-core-profile-tck/pom.xml b/tck-download/jakarta-core-profile-tck/pom.xml new file mode 100644 index 0000000..b17dedd --- /dev/null +++ b/tck-download/jakarta-core-profile-tck/pom.xml @@ -0,0 +1,156 @@ + + + 4.0.0 + + fish.payara.jakarta.tests.tck + tck-download + 1.0-SNAPSHOT + + + jakarta-core-profile-tck + pom + TCK: Install Jakarta Core Profile TCK + + + jakarta-core-profile-tck-${jakarta.tck.core-profile.version}.zip + https://download.eclipse.org/jakartaee/coreprofile/10.0/${tck.test.core-profile.file} + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + + + download-core-profile-tck-zip + + wget + + generate-resources + + ${tck.tests.core-profile.url} + true + + + + + + maven-install-plugin + + + install-core-tck-parent-pom + process-resources + + install-file + + + ${project.build.directory}${file.separator}core-profile-tck-${jakarta.tck.core-profile.version}${file.separator}artifacts${file.separator}core-tck-parent-${jakarta.tck.core-profile.version}.pom + jakarta.ee.tck.coreprofile + core-tck-parent + ${jakarta.tck.core-profile.version} + pom + + + + + install-core-profile-tck-impl-jar + process-resources + + install-file + + + ${project.build.directory}${file.separator}core-profile-tck-${jakarta.tck.core-profile.version}${file.separator}artifacts${file.separator}core-profile-tck-impl-${jakarta.tck.core-profile.version}.jar + jakarta.ee.tck.coreprofile + core-profile-tck-impl + ${jakarta.tck.core-profile.version} + jar + ${project.build.directory}${file.separator}core-profile-tck-${jakarta.tck.core-profile.version}${file.separator}artifacts${file.separator}core-profile-tck-impl-${jakarta.tck.core-profile.version}-sources.jar + + + + + install-core-tck-jsonp-extension-jar + process-resources + + install-file + + + ${project.build.directory}${file.separator}core-profile-tck-${jakarta.tck.core-profile.version}${file.separator}artifacts${file.separator}core-tck-jsonp-extension-${jakarta.tck.core-profile.version}.jar + jakarta.ee.tck.coreprofile + core-tck-jsonp-extension + ${jakarta.tck.core-profile.version} + jar + ${project.build.directory}${file.separator}core-profile-tck-${jakarta.tck.core-profile.version}${file.separator}artifacts${file.separator}core-tck-jsonp-extension-${jakarta.tck.core-profile.version}-sources.jar + + + + + install-cdi-lite-tck-suite-lib + process-resources + + install-file + + + ${project.build.directory}${file.separator}core-profile-tck-${jakarta.tck.core-profile.version}${file.separator}artifacts${file.separator}cdi-lite-tck-suite-${jakarta.tck.core-profile.version}.jar + jakarta.ee.tck.coreprofile + cdi-lite-tck-suite + ${jakarta.tck.core-profile.version} + jar + + + + + install-cdi-lite-tck-suite-xml + process-resources + + install-file + + + ${project.build.directory}${file.separator}core-profile-tck-${jakarta.tck.core-profile.version}${file.separator}artifacts${file.separator}cdi-lite-tck-suite-${jakarta.tck.core-profile.version}.xml + jakarta.ee.tck.coreprofile + cdi-lite-tck-suite + ${jakarta.tck.core-profile.version} + xml + + + + + install-common-annotations-sig + + install-file + + process-resources + + jakarta.ee.tck.coreprofile + common-annotations + ${jakarta.tck.core-profile.version} + sig + sigtest-jdk11 + ${project.build.directory}${file.separator}core-profile-tck-${jakarta.tck.core-profile.version}${file.separator}artifacts${file.separator}common-annotations-${jakarta.tck.core-profile.version}-sigtest-jdk11.sig + false + + + + + install-coreprofile-restful-tck-suite + + install-file + + process-resources + + jakarta.ee.tck.coreprofile + rest-tck-suite + ${jakarta.tck.core-profile.version} + ${project.build.directory}${file.separator}core-profile-tck-${jakarta.tck.core-profile.version}${file.separator}artifacts${file.separator}rest-tck-suite-${jakarta.tck.core-profile.version}.jar + true + + + + + + + + \ No newline at end of file diff --git a/tck-download/jakarta-inject-tck/pom.xml b/tck-download/jakarta-inject-tck/pom.xml new file mode 100644 index 0000000..43ffe71 --- /dev/null +++ b/tck-download/jakarta-inject-tck/pom.xml @@ -0,0 +1,65 @@ + + + 4.0.0 + + fish.payara.jakarta.tests.tck + tck-download + 1.0-SNAPSHOT + + + jakarta-inject-tck + pom + TCK: Install Jakarta Inject TCK + + + jakarta.inject-tck-${jakarta.tck.inject.version}-bin.zip + https://download.eclipse.org/jakartaee/dependency-injection/2.0/${tck.test.inject.file} + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + + + download-inject-tck-zip + + wget + + generate-resources + + ${tck.tests.inject.url} + true + + + + + + maven-install-plugin + + + install-inject-tck + + install-file + + process-resources + + jakarta.inject + jakarta.inject-tck + ${jakarta.tck.inject.version} + jar + ${project.build.directory}${file.separator}jakarta.inject-tck-${jakarta.tck.inject.version}${file.separator}jakarta.inject-tck-${jakarta.tck.inject.version}.jar + ${project.build.directory}${file.separator}jakarta.inject-tck-${jakarta.tck.inject.version}${file.separator}jakarta.inject-tck-${jakarta.tck.inject.version}-sources.jar + ${project.build.directory}${file.separator}jakarta.inject-tck-${jakarta.tck.inject.version}${file.separator}jakarta.inject-tck-${jakarta.tck.inject.version}-javadoc.jar + true + + + + + + + + \ No newline at end of file diff --git a/tck-download/jakarta-jsonb-tck/pom.xml b/tck-download/jakarta-jsonb-tck/pom.xml new file mode 100644 index 0000000..128d776 --- /dev/null +++ b/tck-download/jakarta-jsonb-tck/pom.xml @@ -0,0 +1,65 @@ + + + 4.0.0 + + fish.payara.jakarta.tests.tck + tck-download + 1.0-SNAPSHOT + + + jakarta-jsonb-tck + + pom + + TCK: Install Jakarta JSON-B TCK + + + https://download.eclipse.org/jakartaee/jsonb/3.0/jakarta-jsonb-tck-${jakarta.tck.jsonb.version}.zip + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + + + download-jsonb-tck + generate-resources + + wget + + + ${tck.tests.jsonb.url} + true + + + + + + maven-install-plugin + + + install-jsonb-tck + process-resources + + install-file + + + ${project.build.directory}${file.separator}jsonb-tck${file.separator}artifacts${file.separator}jakarta.json.bind-tck-${jakarta.tck.jsonb.version}.jar + jakarta.json.bind + jakarta.json.bind-tck + ${jakarta.tck.jsonb.version} + jar + ${project.build.directory}${file.separator}jsonb-tck${file.separator}artifacts${file.separator}jakarta.json.bind-tck-${jakarta.tck.jsonb.version}-sources.jar + ${project.build.directory}${file.separator}jsonb-tck${file.separator}artifacts${file.separator}jakarta.json.bind-tck-${jakarta.tck.jsonb.version}.pom + + + + + + + + \ No newline at end of file diff --git a/tck-download/jakarta-jsonp-tck/pom.xml b/tck-download/jakarta-jsonp-tck/pom.xml new file mode 100644 index 0000000..020e0c0 --- /dev/null +++ b/tck-download/jakarta-jsonp-tck/pom.xml @@ -0,0 +1,111 @@ + + + 4.0.0 + + fish.payara.jakarta.tests.tck + tck-download + 1.0-SNAPSHOT + + + jakarta-jsonp-tck + + pom + + TCK: Install Jakarta JSON-P TCK + + + https://download.eclipse.org/jakartaee/jsonp/2.1/jakarta-jsonp-tck-${jakarta.tck.jsonp.version}.zip + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + + + download-jsonp-tck + generate-resources + + wget + + + ${tck.tests.jsonp.url} + true + + + + + + maven-install-plugin + + + install-jsonp-tck-pom + process-resources + + install-file + + + ${project.build.directory}${file.separator}jsonp-tck${file.separator}artifacts${file.separator}jakarta.json-tck-${jakarta.tck.jsonp.version}.pom + jakarta.json + jakarta.json-tck + ${jakarta.tck.jsonp.version} + pom + + + + install-jsonp-tck-common + process-resources + + install-file + + + ${project.build.directory}${file.separator}jsonp-tck${file.separator}artifacts${file.separator}jakarta.json-tck-common-${jakarta.tck.jsonp.version}.jar + jakarta.json + jakarta.json-tck-common + ${jakarta.tck.jsonp.version} + jar + ${project.build.directory}${file.separator}jsonp-tck${file.separator}artifacts${file.separator}jakarta.json-tck-common-${jakarta.tck.jsonp.version}-sources.jar + ${project.build.directory}${file.separator}jsonp-tck${file.separator}artifacts${file.separator}jakarta.json-tck-common-${jakarta.tck.jsonp.version}.pom + + + + install-jsonp-tck-tests + process-resources + + install-file + + + ${project.build.directory}${file.separator}jsonp-tck${file.separator}artifacts${file.separator}jakarta.json-tck-tests-${jakarta.tck.jsonp.version}.jar + jakarta.json + jakarta.json-tck-tests + ${jakarta.tck.jsonp.version} + jar + ${project.build.directory}${file.separator}jsonp-tck${file.separator}artifacts${file.separator}jakarta.json-tck-tests-${jakarta.tck.jsonp.version}-sources.jar + ${project.build.directory}${file.separator}jsonp-tck${file.separator}artifacts${file.separator}jakarta.json-tck-tests-${jakarta.tck.jsonp.version}.pom + + + + install-jsonp-tck-tests-pluggability + process-resources + + install-file + + + ${project.build.directory}${file.separator}jsonp-tck${file.separator}artifacts${file.separator}jakarta.json-tck-tests-pluggability-${jakarta.tck.jsonp.version}.jar + jakarta.json + jakarta.json-tck-tests-pluggability + ${jakarta.tck.jsonp.version} + jar + ${project.build.directory}${file.separator}jsonp-tck${file.separator}artifacts${file.separator}jakarta.json-tck-tests-pluggability-${jakarta.tck.jsonp.version}-sources.jar + ${project.build.directory}${file.separator}jsonp-tck${file.separator}artifacts${file.separator}jakarta.json-tck-tests-pluggability-${jakarta.tck.jsonp.version}.pom + + + + + + + + \ No newline at end of file diff --git a/tck-download/jakarta-pages-tck/pom.xml b/tck-download/jakarta-pages-tck/pom.xml index 6861b35..670c554 100644 --- a/tck-download/jakarta-pages-tck/pom.xml +++ b/tck-download/jakarta-pages-tck/pom.xml @@ -32,7 +32,7 @@ TCK: Install Jakarta pages TCK - jakarta-pages-tck-3.1.0.zip + jakarta-pages-tck-${jakarta.tck.pages.version}.zip https://download.eclipse.org/jakartaee/pages/3.1/${tck.test.pages.file} @@ -48,13 +48,11 @@ wget + + ${tck.test.pages.url} + - - ${tck.test.pages.url} - false - ${project.build.directory} - maven-install-plugin @@ -71,7 +69,6 @@ ${project.artifactId} ${project.version} zip - true diff --git a/tck-download/jakarta-rest-tck/pom.xml b/tck-download/jakarta-rest-tck/pom.xml index 581d5fd..523bd7f 100644 --- a/tck-download/jakarta-rest-tck/pom.xml +++ b/tck-download/jakarta-rest-tck/pom.xml @@ -13,7 +13,7 @@ jakarta-rest-tck - jakarta-restful-ws-tck-3.1.2 + jakarta-restful-ws-tck-${jakarta-rest-tck.version} https://download.eclipse.org/jakartaee/restful-ws/3.1/${tck.basename}.zip @@ -29,13 +29,12 @@ wget + + ${tck.download.url} + true + - - ${tck.download.url} - true - ${project.build.directory} - maven-install-plugin @@ -47,8 +46,9 @@ install-file - ${project.build.directory}/${tck.basename}.jar - ${project.build.directory}/${tck.basename}.pom + ${project.build.directory}${file.separator}${tck.basename}.jar + ${project.build.directory}${file.separator}${tck.basename}.pom + ${project.build.directory}${file.separator}${tck.basename}-sources.jar diff --git a/tck-download/jakarta-servlet-tck/pom.xml b/tck-download/jakarta-servlet-tck/pom.xml index c2825f1..00ae454 100644 --- a/tck-download/jakarta-servlet-tck/pom.xml +++ b/tck-download/jakarta-servlet-tck/pom.xml @@ -1,25 +1,7 @@ - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 fish.payara.jakarta.tests.tck @@ -28,12 +10,14 @@ jakarta-servlet-tck + pom - TCK: Install Jakarta servlet TCK + + TCK: Install Jakarta Servlet TCK - jakarta-servlet-tck-6.0.0.zip - https://download.eclipse.org/jakartaee/servlet/6.0/${tck.test.servlet.file} + jakarta-servlet-tck-${jakarta.tck.servlet.version}.zip + https://download.eclipse.org/jakartaee/servlet/6.0/${tck.test.servlet.file} @@ -43,18 +27,16 @@ download-maven-plugin - download-servlet-tck - generate-resources + download-servlet-tck-zip wget + generate-resources + + ${tck.tests.servlet.url} + - - ${tck.test.servlet.url} - false - ${project.build.directory} - maven-install-plugin @@ -71,12 +53,10 @@ ${project.artifactId} ${project.version} zip - true - - + \ No newline at end of file diff --git a/tck-download/jakarta-tags-tck/pom.xml b/tck-download/jakarta-tags-tck/pom.xml index b9728d8..1ec2604 100644 --- a/tck-download/jakarta-tags-tck/pom.xml +++ b/tck-download/jakarta-tags-tck/pom.xml @@ -15,7 +15,7 @@ TCK: Install Jakarta tags TCK - jakarta-tags-tck-3.0.0.zip + jakarta-tags-tck-3.0.1.zip https://download.eclipse.org/jakartaee/tags/3.0/${tck.test.tags.file} @@ -31,13 +31,11 @@ wget + + ${tck.test.tags.url} + - - ${tck.test.tags.url} - false - ${project.build.directory} - maven-install-plugin diff --git a/tck-download/jakarta-websocket-tck/pom.xml b/tck-download/jakarta-websocket-tck/pom.xml index 3a43df2..5a72ea1 100644 --- a/tck-download/jakarta-websocket-tck/pom.xml +++ b/tck-download/jakarta-websocket-tck/pom.xml @@ -14,11 +14,11 @@ https://www.gnu.org/software/classpath/license.html. SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - --> + 4.0.0 @@ -32,7 +32,7 @@ TCK: Install Jakarta Websocket TCK - jakarta-websocket-tck-2.1.0.zip + jakarta-websocket-tck-${jakarta.tck.websocket.version}.zip https://download.eclipse.org/jakartaee/websocket/2.1/${tck.test.websocket.file} @@ -43,24 +43,22 @@ download-maven-plugin - download-servlet-tck + download-websocket-tck generate-resources wget + + ${tck.test.websocket.url} + - - ${tck.test.websocket.url} - false - ${project.build.directory} - maven-install-plugin - install-servlet-tck + install-websocket-tck process-resources install-file @@ -71,7 +69,6 @@ ${project.artifactId} ${project.version} zip - true diff --git a/tck-download/pom.xml b/tck-download/pom.xml index a93e361..08cbf54 100644 --- a/tck-download/pom.xml +++ b/tck-download/pom.xml @@ -1,7 +1,7 @@ - + - + - + - + - + @@ -216,13 +195,13 @@ - + ]]> ]]> - + ]]> @@ -244,7 +223,7 @@ - + @@ -252,22 +231,22 @@ - + - + Deploying from ${test.dir} - + - + @@ -310,7 +289,7 @@ - + From f3f977bb4cad60c7809b2ac38485f0d6e4c1a22f Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 25 Oct 2024 13:24:13 +0100 Subject: [PATCH 2/9] Fix dependabot location Signed-off-by: Andrew Pielage --- {.gthub => .github}/dependabot.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {.gthub => .github}/dependabot.yaml (100%) diff --git a/.gthub/dependabot.yaml b/.github/dependabot.yaml similarity index 100% rename from .gthub/dependabot.yaml rename to .github/dependabot.yaml From ddaffe4e0c9df15a4aa27864f7b296c9995c111d Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 25 Oct 2024 14:41:06 +0100 Subject: [PATCH 3/9] FISH-10024 Deinit submodules Signed-off-by: Andrew Pielage --- .gitmodules | 11 ----------- cdi-tck/cditck-porting | 1 - inject-tck/ditck-porting | 1 - 3 files changed, 13 deletions(-) delete mode 160000 cdi-tck/cditck-porting delete mode 160000 inject-tck/ditck-porting diff --git a/.gitmodules b/.gitmodules index 8cc887d..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +0,0 @@ -[submodule "inject-tck/ditck-porting"] - path = inject-tck/ditck-porting - url = https://github.com/payara/ditck-porting - branch = EE10 -[submodule "cdi-tck/cditck-porting"] - path = cdi-tck/cditck-porting - url = https://github.com/payara/cditck-porting - branch = EE10 -[submodule "cdi-tck/glassfish-cdi-porting-tck"] - path = cdi-tck/glassfish-cdi-porting-tck - url = https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck diff --git a/cdi-tck/cditck-porting b/cdi-tck/cditck-porting deleted file mode 160000 index a91d68a..0000000 --- a/cdi-tck/cditck-porting +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a91d68ac084bb6880befb76b3d8a321b34f59b13 diff --git a/inject-tck/ditck-porting b/inject-tck/ditck-porting deleted file mode 160000 index 7bee40a..0000000 --- a/inject-tck/ditck-porting +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7bee40a99cb37ed1cf88d3dd309c4af0b0b8beb4 From c1ea25332b9c2c3c03b9e74154593c33fddc2f82 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 25 Oct 2024 14:50:04 +0100 Subject: [PATCH 4/9] FISH-10024 Reinit submodules Signed-off-by: Andrew Pielage --- .gitmodules | 11 +++++++++++ cdi-tck/cditck-porting | 1 + cdi-tck/glassfish-cdi-porting-tck | 1 + inject-tck/ditck-porting | 1 + 4 files changed, 14 insertions(+) create mode 160000 cdi-tck/cditck-porting create mode 160000 cdi-tck/glassfish-cdi-porting-tck create mode 160000 inject-tck/ditck-porting diff --git a/.gitmodules b/.gitmodules index e69de29..9459d2b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,11 @@ +[submodule "cdi-tck/glassfish-cdi-porting-tck"] + path = cdi-tck/glassfish-cdi-porting-tck + url = https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck +[submodule "cdi-tck/cditck-porting"] + path = cdi-tck/cditck-porting + url = https://github.com/payara/cditck-porting + branch = EE10 +[submodule "inject-tck/ditck-porting"] + path = inject-tck/ditck-porting + url = https://github.com/payara/ditck-porting + branch = EE10 diff --git a/cdi-tck/cditck-porting b/cdi-tck/cditck-porting new file mode 160000 index 0000000..a91d68a --- /dev/null +++ b/cdi-tck/cditck-porting @@ -0,0 +1 @@ +Subproject commit a91d68ac084bb6880befb76b3d8a321b34f59b13 diff --git a/cdi-tck/glassfish-cdi-porting-tck b/cdi-tck/glassfish-cdi-porting-tck new file mode 160000 index 0000000..49ecffe --- /dev/null +++ b/cdi-tck/glassfish-cdi-porting-tck @@ -0,0 +1 @@ +Subproject commit 49ecffef70da0142cb1be185aa25b6b124f218f4 diff --git a/inject-tck/ditck-porting b/inject-tck/ditck-porting new file mode 160000 index 0000000..7bee40a --- /dev/null +++ b/inject-tck/ditck-porting @@ -0,0 +1 @@ +Subproject commit 7bee40a99cb37ed1cf88d3dd309c4af0b0b8beb4 From cbc7ef0d2a80bf5ec26e56a29875cd051d1d4db4 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 25 Oct 2024 16:41:51 +0100 Subject: [PATCH 5/9] FISH-10024 Restore faces runner Signed-off-by: Andrew Pielage --- faces-tck/pom.xml-old-tck-run | 125 ++++++++++++++++++++++++---------- faces-tck/pom.xml-tck | 2 +- faces-tck/run-tck.sh | 18 ++--- 3 files changed, 100 insertions(+), 45 deletions(-) diff --git a/faces-tck/pom.xml-old-tck-run b/faces-tck/pom.xml-old-tck-run index 18c3472..12450da 100644 --- a/faces-tck/pom.xml-old-tck-run +++ b/faces-tck/pom.xml-old-tck-run @@ -1,7 +1,7 @@ @@ -23,10 +24,10 @@ org.eclipse.ee4j.faces.tck old-faces-tck-parent - 4.0.1 + 4.0.3 - glassfish-external-tck-faces + old-tck-run pom Old Jakarta Faces TCK - run @@ -35,16 +36,17 @@ 1.10.2 ${project.build.directory}/apache-ant-${ant.version} https://archive.apache.org/dist/ant/binaries/apache-ant-${ant.version}-bin.zip - + ${project.build.directory}/faces-tck ${tck.home}/src/com/sun/ts/tests standalone - + ${skipITs} + ${project.build.directory}/payara6 ${glassfish.home}/glassfish/bin/asadmin - + org/glassfish/**\:com/sun/enterprise/** - + 14848 11527 18080 @@ -67,7 +69,7 @@ org.eclipse.ee4j.faces.tck - old-faces-tck + old-tck-build ${project.version} zip @@ -89,7 +91,7 @@ - ${skipITs} + ${tck.old.skip} ${ant.zip.url} true ${project.build.directory} @@ -98,9 +100,8 @@ maven-dependency-plugin - 3.3.0 - ${skipITs} + ${tck.old.skip} @@ -121,7 +122,7 @@ unpack-dependencies - old-faces-tck + old-tck-build ${project.build.directory} @@ -150,16 +151,16 @@ - ${skipITs} + ${tck.old.skip} - prepare-tck-and-glassfish + prepare-tck-and-payara pre-integration-test - + @@ -167,7 +168,7 @@ match="@{key}=.*" replace="@{key}=@{value}" /> - + @@ -181,46 +182,91 @@ + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + @@ -234,15 +280,15 @@ - + - + - + ]]> @@ -263,31 +309,31 @@ - - + - + - + Deploying from ${test.dir} - - + + - + Deploying all archives - + @@ -329,6 +375,15 @@ + + + + + + + + + diff --git a/faces-tck/pom.xml-tck b/faces-tck/pom.xml-tck index 1af2ebd..a32fe59 100755 --- a/faces-tck/pom.xml-tck +++ b/faces-tck/pom.xml-tck @@ -28,7 +28,7 @@ org.eclipse.ee4j.faces.tck jakarta-faces-tck - 4.0.1 + 4.0.3 pom Jakarta Faces ${project.version} TCK diff --git a/faces-tck/run-tck.sh b/faces-tck/run-tck.sh index 82eb83f..468ef54 100755 --- a/faces-tck/run-tck.sh +++ b/faces-tck/run-tck.sh @@ -5,18 +5,18 @@ fi rm -r target mkdir target -if [ ! -f target/jakarta-faces-tck-4.0.1.zip ]; then - echo "Downloading jakarta-faces-tck-4.0.1.zip" - wget -q https://download.eclipse.org/jakartaee/faces/4.0/jakarta-faces-tck-4.0.1.zip -O target/jakarta-faces-tck-4.0.1.zip +if [ ! -f target/jakarta-faces-tck-4.0.3.zip ]; then + echo "Downloading jakarta-faces-tck-4.0.3.zip" + wget -q https://download.eclipse.org/jakartaee/faces/4.0/jakarta-faces-tck-4.0.3.zip -O target/jakarta-faces-tck-4.0.3.zip fi echo "Unzipping" -rm -rf target/faces-tck-4.0.1 -unzip -q target/jakarta-faces-tck-4.0.1.zip -d target +rm -rf target/faces-tck-4.0.3 +unzip -q target/jakarta-faces-tck-4.0.3.zip -d target echo "Running TCK" # add payara profile, should be in the next version of upstream pom.xml -cp pom.xml-tck target/faces-tck-4.0.1/tck/pom.xml +cp pom.xml-tck target/faces-tck-4.0.3/tck/pom.xml # change usage of glassfish with payara -cp pom.xml-old-tck-run target/faces-tck-4.0.1/tck/old-tck/run/pom.xml -#mvn verify -P payara-ci-remote,\!glassfish-ci-managed -Dglassfish.version=6.2022.1.Alpha5-SNAPSHOT -f target/faces-tck-4.0.1/tck/pom.xml -pl old-tck -amd -mvn verify -P payara-ci-remote,\!glassfish-ci-managed -Dglassfish.version=6.2022.1.Alpha4 -f target/faces-tck-4.0.1/tck/pom.xml \ No newline at end of file +cp pom.xml-old-tck-run target/faces-tck-4.0.3/tck/old-tck/run/pom.xml +#mvn verify -P payara-ci-remote,\!glassfish-ci-managed -Dglassfish.version=6.2022.1.Alpha5-SNAPSHOT -f target/faces-tck-4.0.3/tck/pom.xml -pl old-tck -amd +mvn verify -P payara-ci-remote,\!glassfish-ci-managed -Dglassfish.version=6.2022.1.Alpha4 -f target/faces-tck-4.0.3/tck/pom.xml From 43428ccec80e21d721320e47db1a27722e78fa29 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 25 Oct 2024 17:04:47 +0100 Subject: [PATCH 6/9] FISH-10044 Remove glassfish.version to allow an easier sed replacement Signed-off-by: Andrew Pielage --- faces-tck/run-tck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faces-tck/run-tck.sh b/faces-tck/run-tck.sh index 468ef54..35e5240 100755 --- a/faces-tck/run-tck.sh +++ b/faces-tck/run-tck.sh @@ -19,4 +19,4 @@ cp pom.xml-tck target/faces-tck-4.0.3/tck/pom.xml # change usage of glassfish with payara cp pom.xml-old-tck-run target/faces-tck-4.0.3/tck/old-tck/run/pom.xml #mvn verify -P payara-ci-remote,\!glassfish-ci-managed -Dglassfish.version=6.2022.1.Alpha5-SNAPSHOT -f target/faces-tck-4.0.3/tck/pom.xml -pl old-tck -amd -mvn verify -P payara-ci-remote,\!glassfish-ci-managed -Dglassfish.version=6.2022.1.Alpha4 -f target/faces-tck-4.0.3/tck/pom.xml +mvn verify -P payara-ci-remote,\!glassfish-ci-managed -Dglassfish.version= -f target/faces-tck-4.0.3/tck/pom.xml From 4dd673f335b9543a8f9854c6e9fa59111cd08a2d Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 25 Oct 2024 19:02:14 +0100 Subject: [PATCH 7/9] FISH-10024 Restore servlet properties Signed-off-by: Andrew Pielage --- servlet-tck/pom.xml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/servlet-tck/pom.xml b/servlet-tck/pom.xml index d130781..9f5ef5c 100644 --- a/servlet-tck/pom.xml +++ b/servlet-tck/pom.xml @@ -27,10 +27,28 @@ servlet-tck-runner - jar + pom TCK: Servlet + + ${project.build.directory}/servlet-tck + ${tck.home}/src/com/sun/ts/tests + + org/glassfish/**\:com/sun/enterprise/** + + 4848 + 11527 + 18080 + 18181 + 17676 + 18686 + 13700 + 13920 + 13820 + 12000 + + From 4fba2f5fe2356cc5fc3f1c45cc7b40a0fa88ee5b Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 28 Oct 2024 22:12:49 +0000 Subject: [PATCH 8/9] FISH-10024 Use CDI TCK 4.0.6 Signed-off-by: Andrew Pielage --- cdi-tck/cditck-porting | 2 +- cdi-tck/glassfish-cdi-porting-tck | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cdi-tck/cditck-porting b/cdi-tck/cditck-porting index a91d68a..53d08e4 160000 --- a/cdi-tck/cditck-porting +++ b/cdi-tck/cditck-porting @@ -1 +1 @@ -Subproject commit a91d68ac084bb6880befb76b3d8a321b34f59b13 +Subproject commit 53d08e443dab1bff4450afbe549b893b90b0a8ac diff --git a/cdi-tck/glassfish-cdi-porting-tck b/cdi-tck/glassfish-cdi-porting-tck index 49ecffe..4634d71 160000 --- a/cdi-tck/glassfish-cdi-porting-tck +++ b/cdi-tck/glassfish-cdi-porting-tck @@ -1 +1 @@ -Subproject commit 49ecffef70da0142cb1be185aa25b6b124f218f4 +Subproject commit 4634d712b6a837c7169afbda048af23987c53502 diff --git a/pom.xml b/pom.xml index ddb6319..1747469 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ 3.1.5 2.1.0 3.1.0 - 4.0.13 + 4.0.6 4.0.1 6.0.2 3.0.2 From c3697d4b93b3942d2c18830f3c6cd6f4995c8b2c Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Tue, 29 Oct 2024 09:16:11 +0000 Subject: [PATCH 9/9] FISH-10024 Update submodule remote Signed-off-by: Andrew Pielage --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 9459d2b..a4a2419 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "cdi-tck/glassfish-cdi-porting-tck"] path = cdi-tck/glassfish-cdi-porting-tck - url = https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck + url = https://github.com/payara/glassfish-cdi-porting-tck [submodule "cdi-tck/cditck-porting"] path = cdi-tck/cditck-porting url = https://github.com/payara/cditck-porting