From 91123f47fc9fcc9280d62c0214dd4eb11442f983 Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Thu, 30 May 2024 01:09:12 +0200 Subject: [PATCH 1/3] Update GlassFish runner for Jakarta Persistence 3.2 * Download and installs required artefacts * Runs TCK in Java SE mode (Jakarta EE mode not ready yet) Signed-off-by: Arjan Tijms --- glassfish-runner/jpa-tck/pom.xml | 362 ---------- .../persistence-tck-install/pom.xml | 172 +++++ .../persistence-tck-run-se/pom.xml | 646 ++++++++++++++++++ .../derby/derby.ddl.persistence.sprocs.sql | 0 .../sql/derby/derby.ddl.persistence.sql | 0 .../sql/derby/derby.dml.jpa.sql | 0 glassfish-runner/persistence-tck/pom.xml | 36 + glassfish-runner/pom.xml | 1 + 8 files changed, 855 insertions(+), 362 deletions(-) delete mode 100644 glassfish-runner/jpa-tck/pom.xml create mode 100644 glassfish-runner/persistence-tck/persistence-tck-install/pom.xml create mode 100644 glassfish-runner/persistence-tck/persistence-tck-run-se/pom.xml rename glassfish-runner/{jpa-tck => persistence-tck/persistence-tck-run-se}/sql/derby/derby.ddl.persistence.sprocs.sql (100%) rename glassfish-runner/{jpa-tck => persistence-tck/persistence-tck-run-se}/sql/derby/derby.ddl.persistence.sql (100%) rename glassfish-runner/{jpa-tck => persistence-tck/persistence-tck-run-se}/sql/derby/derby.dml.jpa.sql (100%) create mode 100644 glassfish-runner/persistence-tck/pom.xml diff --git a/glassfish-runner/jpa-tck/pom.xml b/glassfish-runner/jpa-tck/pom.xml deleted file mode 100644 index 21c2696f2d..0000000000 --- a/glassfish-runner/jpa-tck/pom.xml +++ /dev/null @@ -1,362 +0,0 @@ - - - jakarta - glassfish.jpa-tck - 11.0.0-M1 - pom - 4.0.0 - - org.glassfish - standalone-tck - 10.0.0 - ../pom.xml - - - jakarta.tck.persistence-tck-tests - 3.1.0 - org.eclipse.persistence.jpa.PersistenceProvider - org.apache.derby.jdbc.ClientDriver - jdbc:derby://localhost:1527/derbyDB;create=true - cts1 - cts1 - eclipselink.logging.level=OFF - true - ${project.build.directory}/${glassfish.toplevel.dir}/javadb/lib/derbyclient.jar:${project.build.directory}/${glassfish.toplevel.dir}/javadb/lib/derbyshared.jar:${project.build.directory}/${glassfish.toplevel.dir}/javadb/lib/derbytools.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - ; - derby - - - - - org.junit - junit-bom - ${junit.jupiter.version} - pom - import - - - - - - org.junit.jupiter - junit-jupiter - ${junit.jupiter.version} - - - jakarta.tck - common - ${project.version} - - - org.jboss.arquillian.container - arquillian-glassfish-managed-6 - 1.0.0.Alpha1 - - - org.glassfish.hk2 - hk2-locator - - - - - jakarta.tck - persistence-tck-tests - 11.0.0-SNAPSHOT - test - - - jakarta.tck - dbprocedures - 11.0.0-SNAPSHOT - test - - - org.glassfish.main.common - simple-glassfish-api - ${glassfish.container.version} - - - org.jboss.arquillian.junit5 - arquillian-junit5-container - 1.7.0.Alpha14 - - - org.jboss.arquillian.junit5 - arquillian-junit5-core - 1.7.0.Alpha14 - - - org.glassfish.hk2 - hk2-locator - 3.0.3 - - - - - full - - true - - - glassfish - - - - web - - web - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.2.0 - - - unpack - pre-integration-test - - unpack - - - - - org.glassfish.main.distributions - ${glassfish-artifact-id} - ${glassfish.container.version} - zip - true - ${project.build.directory} - - - - - - copy-lib - pre-integration-test - - copy - - - - - jakarta.tck - dbprocedures - true - ${project.build.directory} - dbprocedures.jar - - - - - - - - exec-maven-plugin - org.codehaus.mojo - - - stop-database - pre-integration-test - - exec - - - ${exec.asadmin} - - stop-database - - - 0 - 1 - - - - - - - exec-maven-plugin - org.codehaus.mojo - - - start-database - pre-integration-test - - exec - - - ${exec.asadmin} - - start-database - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 3.0.0 - - - initdb - pre-integration-test - - run - - - - - - - - - - - initdb-2 - pre-integration-test - - run - - - - - - - - - - - install_java_procedures - pre-integration-test - - run - - - - CALL sqlj.remove_jar('APP.dbprocedures', 0); - CALL sqlj.install_jar('${project.build.directory}/dbprocedures.jar', 'APP.dbprocedures', 0); - CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.database.classpath', 'APP.dbprocedures'); - - - - - - - - maven-failsafe-plugin - 3.0.0-M5 - - - gf-tests - - integration-test - verify - - - - **/*Client*.* - **/*JPASigTest*.* - - - **/jpa/ee/**/*.* - - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.jpa-api.jar - ${project.build.directory}/${glassfish.toplevel.dir}/javadb/lib/derbyshared.jar - ${project.build.directory}/${glassfish.toplevel.dir}/javadb/lib/derbytools.jar - ${project.build.directory}/${glassfish.toplevel.dir}/javadb/lib/dbprocedures.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.persistence-api.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/org.eclipse.persistence.jpa.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet-api.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.transaction-api.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.ejb-api.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/org.eclipse.persistence.antlr.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/org.eclipse.persistence.asm.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/org.eclipse.persistence.core.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/org.eclipse.persistence.dbws.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/org.eclipse.persistence.jpa.jpql.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/org.eclipse.persistence.jpa.modelgen.processor.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/org.eclipse.persistence.moxy.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/org.eclipse.persistence.oracle.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.validation-api.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/hibernate-validator-cdi.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/hibernate-validator.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jboss-logging.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.el-api.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/expressly.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/classmate.jar - - jakarta.tck:persistence-tck-tests - - ${project.build.directory}/${glassfish.toplevel.dir} - standalone - JPATCK - JPATCK2 - ${jakarta.persistence.provider} - ${jakarta.persistence.jdbc.driver} - ${jakarta.persistence.jdbc.url} - ${jakarta.persistence.jdbc.user} - ${jakarta.persistence.jdbc.password} - eclipselink.logging.level=OFF - true - standalone - /tmp - true - INSERT INTO PURCHASE_ORDER(ID, TOTAL, DESCRIPTION) VALUES(?, ?, null) - SELECT ID, TOTAL FROM PURCHASE_ORDER WHERE ID=? - /tmp - ${jdbc.db} - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.persistence-api.jar:${project.build.directory}/jdk11-bundle/java.base:${project.build.directory}/jdk11-bundle/java.rmi:${project.build.directory}/jdk11-bundle/java.sql:${project.build.directory}/jdk11-bundle/java.naming - ${project.build.directory}/jdk11-bundle - - - - - - - exec-maven-plugin - org.codehaus.mojo - - - stop-database-final - post-integration-test - - exec - - - ${exec.asadmin} - - stop-database - - - 0 - 1 - - - - - - - - \ No newline at end of file diff --git a/glassfish-runner/persistence-tck/persistence-tck-install/pom.xml b/glassfish-runner/persistence-tck/persistence-tck-install/pom.xml new file mode 100644 index 0000000000..29e265bd07 --- /dev/null +++ b/glassfish-runner/persistence-tck/persistence-tck-install/pom.xml @@ -0,0 +1,172 @@ + + + + 4.0.0 + + + org.glassfish + persistence-tck + 6.1.0-SNAPSHOT + + + persistence-tck-install + pom + + TCK: Install Jakarta persistence TCK + + + jakarta-persistence-tck-${tck.test.persistence.version}.zip + 3.2 + https://download.eclipse.org/jakartaee/persistence/${tck.test.persistence.main.version}/${tck.test.persistence.file} + 3.2.0 + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + 1.9.0 + + ${tck.test.persistence.url} + true + ${project.build.directory} + + + + download-persistence-tck + + wget + + generate-resources + + + + + + maven-install-plugin + + + + + + install-dbprocedures + + install-file + + process-resources + + ${project.build.directory}/persistence-tck/artifacts/dbprocedures-${tck.test.persistence.version}.jar + jakarta.tck + dbprocedures + ${tck.test.persistence.version} + ${project.build.directory}/persistence-tck/artifacts/dbprocedures-${tck.test.persistence.version}-sources.jar + jar + + + + + + + install-persistence-tck-common-jar + + install-file + + process-resources + + ${project.build.directory}/persistence-tck/artifacts/persistence-tck-common-${tck.test.persistence.version}.jar + jakarta.tck + persistence-tck-common + ${tck.test.persistence.version} + ${project.build.directory}/persistence-tck/artifacts/persistence-tck-common-${tck.test.persistence.version}-sources.jar + jar + + + + + install-persistence-tck-common-pom + + install-file + + process-resources + + ${project.build.directory}/persistence-tck/artifacts/persistence-tck-common-${tck.test.persistence.version}.pom + jakarta.tck + persistence-tck-common + ${tck.test.persistence.version} + pom + + + + + + + install-persistence-tck-pom + + install-file + + process-resources + + ${project.build.directory}/persistence-tck/artifacts/persistence-tck-${tck.test.persistence.version}.pom + jakarta.tck + persistence-tck + ${tck.test.persistence.version} + pom + + + + + + + install-persistence-tck-spec-tests-jar + + install-file + + process-resources + + ${project.build.directory}/persistence-tck/artifacts/persistence-tck-spec-tests-${tck.test.persistence.version}.jar + jakarta.tck + persistence-tck-spec-tests + ${tck.test.persistence.version} + ${project.build.directory}/persistence-tck/artifacts/persistence-tck-spec-tests-${tck.test.persistence.version}-sources.jar + jar + + + + + install-persistence-tck-spec-tests-pom + + install-file + + process-resources + + ${project.build.directory}/persistence-tck/artifacts/persistence-tck-spec-tests-${tck.test.persistence.version}.pom + jakarta.tck + persistence-tck-spec-tests + ${tck.test.persistence.version} + pom + + + + + + + + + diff --git a/glassfish-runner/persistence-tck/persistence-tck-run-se/pom.xml b/glassfish-runner/persistence-tck/persistence-tck-run-se/pom.xml new file mode 100644 index 0000000000..8d031dea52 --- /dev/null +++ b/glassfish-runner/persistence-tck/persistence-tck-run-se/pom.xml @@ -0,0 +1,646 @@ + + + + 4.0.0 + + + org.eclipse.ee4j + project + 1.0.9 + + + jakarta.tck + persistence-tck-run-se + 3.2.0 + pom + + + + 8.0.0-M6 + ${project.build.directory}/glassfish8 + ${glassfish.home}/glassfish/modules + + + + ${glassfish.module.dir}/jakarta.persistence-api.jar,${glassfish.module.dir}/org.eclipse.persistence.jpa.jar,${glassfish.module.dir}/jakarta.servlet-api.jar,${glassfish.module.dir}/jakarta.transaction-api.jar,${glassfish.module.dir}/jakarta.ejb-api.jar,${glassfish.module.dir}/org.eclipse.persistence.antlr.jar,${glassfish.module.dir}/org.eclipse.persistence.asm.jar,${glassfish.module.dir}/org.eclipse.persistence.core.jar,${glassfish.module.dir}/org.eclipse.persistence.dbws.jar,${glassfish.module.dir}/org.eclipse.persistence.jpa.jpql.jar,${glassfish.module.dir}/org.eclipse.persistence.jpa.modelgen.processor.jar,${glassfish.module.dir}/org.eclipse.persistence.moxy.jar,${glassfish.module.dir}/org.eclipse.persistence.oracle.jar,${glassfish.module.dir}/jboss-logging.jar,${glassfish.module.dir}/jakarta.el-api.jar,${glassfish.module.dir}/expressly.jar,${glassfish.module.dir}/classmate.jar,${glassfish.module.dir}/jakarta.validation-api.jar + ${glassfish.module.dir}/jakarta.validation-api.jar,${glassfish.module.dir}/hibernate-validator-cdi.jar,${glassfish.module.dir}/hibernate-validator.jar + ${javadb.lib}/derbyclient.jar,${javadb.lib}/derbyshared.jar,${javadb.lib}/derbytools.jar + ${javadb.lib}/derbyclient.jar:${javadb.lib}/derbyshared.jar:${javadb.lib}/derbytools.jar + derby + org.eclipse.persistence.jpa.PersistenceProvider + org.apache.derby.jdbc.ClientDriver + jdbc:derby://localhost:1527/derbyDB;create=true + cts1 + cts1 + + + true + true + + + + 5.10.2 + 11.0.0-M1 + 3.2.0 + 3.2.0 + + + + ${glassfish.home}/bin/asadmin + ${glassfish.home}/javadb/lib + ./sql + ; + + + + + + org.junit + junit-bom + 5.10.2 + pom + import + + + + + + + jakarta.persistence + jakarta.persistence-api + ${persistence.api.version} + test + + + + jakarta.tck + persistence-tck-common + ${project.version} + test + + + jakarta.persistence + jakarta.persistence-api + + + + + + jakarta.tck + persistence-tck-spec-tests + ${project.version} + test + + + jakarta.persistence + jakarta.persistence-api + + + + + + jakarta.tck + dbprocedures + ${persistence.tck.version} + test + + + jakarta.persistence + jakarta.persistence-api + + + + + + jakarta.tck + common + ${jakarta.ee.version} + test + + + + org.junit.jupiter + junit-jupiter + test + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-dependency-plugin + 3.6.1 + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.2.5 + + + org.apache.maven.plugins + maven-surefire-report-plugin + 3.2.5 + + + org.codehaus.mojo + exec-maven-plugin + 3.3.0 + + + + + + + maven-enforcer-plugin + + + enforce-maven + + enforce + + + + + 3.8.6 + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + pre-integration-test + + unpack + + + + + org.glassfish.main.distributions + ${glassfish-artifact-id} + ${glassfish.version} + zip + true + ${project.build.directory} + + + + + + + copy-lib + pre-integration-test + + copy + + + + + jakarta.tck + dbprocedures + true + ${project.build.directory} + dbprocedures.jar + + + jakarta.persistence + jakarta.persistence-api + ${glassfish.module.dir} + true + jakarta.persistence-api.jar + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + initdb + pre-integration-test + + run + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + persistence-tests-1 + + integration-test + verify + + + ${project.groupId}:persistence-tck-spec-tests + + **/*Client*.* + **/*JPASigTest*.* + + !**/ee/jakarta/tck/persistence/se/entityManagerFactory/Client2#createEntityManagerFactoryNoBeanValidatorTest + + + ${jpa.classes} + ${jdbc.lib.classpath} + ${validator.classes} + + + + standalone + standalone + + JPATCK + JPATCK2 + ${jakarta.persistence.provider} + ${jakarta.persistence.jdbc.driver} + ${jakarta.persistence.jdbc.url} + ${jakarta.persistence.jdbc.user} + ${jakarta.persistence.jdbc.password} + ${jpa.provider.implementation.specific.properties} + ${persistence.second.level.caching.supported} + + /tmp + /tmp + + ${db.supports.sequence} + INSERT INTO PURCHASE_ORDER(ID, TOTAL, DESCRIPTION) VALUES(?, ?, null) + SELECT ID, TOTAL FROM PURCHASE_ORDER WHERE ID=? + ${jdbc.db} + + ${glassfish.module.dir}/jakarta.persistence-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 + + ${project.build.directory}/jdk11-bundle + + + + + + persistence-tests-2 + + integration-test + verify + + + ${project.groupId}:persistence-tck-spec-tests + **/ee/jakarta/tck/persistence/se/entityManagerFactory/Client2#createEntityManagerFactoryNoBeanValidatorTest + + ${jpa.classes} + ${jdbc.lib.classpath} + + + + standalone + standalone + + JPATCK + JPATCK2 + ${jakarta.persistence.provider} + ${jakarta.persistence.jdbc.driver} + ${jakarta.persistence.jdbc.url} + ${jakarta.persistence.jdbc.user} + ${jakarta.persistence.jdbc.password} + ${jpa.provider.implementation.specific.properties} + ${persistence.second.level.caching.supported} + + /tmp + /tmp + + ${db.supports.sequence} + INSERT INTO PURCHASE_ORDER(ID, TOTAL, DESCRIPTION) VALUES(?, ?, null) + SELECT ID, TOTAL FROM PURCHASE_ORDER WHERE ID=? + + ${jdbc.db} + + + + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + + false + + + + generate-failsafe-html-report + post-integration-test + + failsafe-report-only + + + ${project.build.directory}/test-reports + + + + + + + + + + full + + true + + + glassfish + + + + web + + web + + + + + eclipselink + + true + + + + glassfish + 9.7.0 + 5.0.0-B02 + org.eclipse.persistence.jpa.PersistenceProvider + eclipselink.logging.level=OFF${jpa.provider.implementation.specific.additional.properties} + + + + + org.eclipse.persistence + org.eclipse.persistence.core + ${eclipselink.version} + + + org.eclipse.persistence + org.eclipse.persistence.jpa + ${eclipselink.version} + + + org.eclipse.persistence + org.eclipse.persistence.jpa.jpql + ${eclipselink.version} + + + org.eclipse.persistence + org.eclipse.persistence.jpa.modelgen.processor + ${eclipselink.version} + + + org.eclipse.persistence + org.eclipse.persistence.moxy + ${eclipselink.version} + + + org.eclipse.persistence + org.eclipse.persistence.dbws + ${eclipselink.version} + + + org.eclipse.persistence + org.eclipse.persistence.oracle + ${eclipselink.version} + + + org.eclipse.persistence + org.eclipse.persistence.asm + ${eclipselink.asm.version} + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-eclipselink-lib + pre-integration-test + + copy + + + ${glassfish.module.dir} + + + org.eclipse.persistence + org.eclipse.persistence.core + true + org.eclipse.persistence.core.jar + + + org.eclipse.persistence + org.eclipse.persistence.jpa + true + org.eclipse.persistence.jpa.jar + + + org.eclipse.persistence + org.eclipse.persistence.jpa.jpql + true + org.eclipse.persistence.jpa.jpql.jar + + + org.eclipse.persistence + org.eclipse.persistence.jpa.modelgen.processor + true + org.eclipse.persistence.jpa.modelgen.processor.jar + + + org.eclipse.persistence + org.eclipse.persistence.moxy + true + org.eclipse.persistence.moxy.jar + + + org.eclipse.persistence + org.eclipse.persistence.dbws + true + org.eclipse.persistence.dbws.jar + + + org.eclipse.persistence + org.eclipse.persistence.oracle + true + org.eclipse.persistence.oracle.jar + + + org.eclipse.persistence + org.eclipse.persistence.asm + true + org.eclipse.persistence.asm.jar + + + + + + + + + + + + derby + + true + + + + 10.15.2.0 + derby + org.apache.derby.jdbc.ClientDriver + + + + + org.apache.derby + derbyclient + ${derby.jdbc.version} + + + org.apache.derby + derbytools + ${derby.jdbc.version} + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + stop-database-init + pre-integration-test + + exec + + + ${exec.asadmin} + + stop-database + + + 0 + 1 + + + + + start-database + pre-integration-test + + exec + + + ${exec.asadmin} + + start-database + + + + + stop-database-final + post-integration-test + + exec + + + ${exec.asadmin} + + stop-database + + + 0 + 1 + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + install_java_procedures + pre-integration-test + + run + + + + + + + + CALL sqlj.remove_jar('APP.dbprocedures', 0); + CALL sqlj.install_jar('${project.build.directory}/dbprocedures.jar', 'APP.dbprocedures', 0); + CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.database.classpath', 'APP.dbprocedures'); + + + + + + + + + + + diff --git a/glassfish-runner/jpa-tck/sql/derby/derby.ddl.persistence.sprocs.sql b/glassfish-runner/persistence-tck/persistence-tck-run-se/sql/derby/derby.ddl.persistence.sprocs.sql similarity index 100% rename from glassfish-runner/jpa-tck/sql/derby/derby.ddl.persistence.sprocs.sql rename to glassfish-runner/persistence-tck/persistence-tck-run-se/sql/derby/derby.ddl.persistence.sprocs.sql diff --git a/glassfish-runner/jpa-tck/sql/derby/derby.ddl.persistence.sql b/glassfish-runner/persistence-tck/persistence-tck-run-se/sql/derby/derby.ddl.persistence.sql similarity index 100% rename from glassfish-runner/jpa-tck/sql/derby/derby.ddl.persistence.sql rename to glassfish-runner/persistence-tck/persistence-tck-run-se/sql/derby/derby.ddl.persistence.sql diff --git a/glassfish-runner/jpa-tck/sql/derby/derby.dml.jpa.sql b/glassfish-runner/persistence-tck/persistence-tck-run-se/sql/derby/derby.dml.jpa.sql similarity index 100% rename from glassfish-runner/jpa-tck/sql/derby/derby.dml.jpa.sql rename to glassfish-runner/persistence-tck/persistence-tck-run-se/sql/derby/derby.dml.jpa.sql diff --git a/glassfish-runner/persistence-tck/pom.xml b/glassfish-runner/persistence-tck/pom.xml new file mode 100644 index 0000000000..cc7542cfd6 --- /dev/null +++ b/glassfish-runner/persistence-tck/pom.xml @@ -0,0 +1,36 @@ + + + + + 4.0.0 + + + org.glassfish + standalone-tck + 11.0.0-SNAPSHOT + + + persistence-tck + 6.1.0-SNAPSHOT + pom + + + persistence-tck-install + persistence-tck-run-se + + diff --git a/glassfish-runner/pom.xml b/glassfish-runner/pom.xml index d82e1f0eec..a5bc74060a 100644 --- a/glassfish-runner/pom.xml +++ b/glassfish-runner/pom.xml @@ -34,6 +34,7 @@ jsonb-tck jsonp-tck servlet-tck + persistence-tck From 034722bfc98594208813582abcddf4e962e1d057 Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Thu, 30 May 2024 11:59:35 +0200 Subject: [PATCH 2/3] Sort modules Signed-off-by: Arjan Tijms --- glassfish-runner/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glassfish-runner/pom.xml b/glassfish-runner/pom.xml index a5bc74060a..07bdb559f9 100644 --- a/glassfish-runner/pom.xml +++ b/glassfish-runner/pom.xml @@ -33,8 +33,8 @@ concurrency-tck jsonb-tck jsonp-tck - servlet-tck persistence-tck + servlet-tck From b3cdde458c2117c9f70a0ccefc7d98ea27dc07d9 Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Thu, 30 May 2024 23:34:37 +0200 Subject: [PATCH 3/3] Use JDK 17 compatible GF Signed-off-by: Arjan Tijms --- glassfish-runner/persistence-tck/persistence-tck-run-se/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glassfish-runner/persistence-tck/persistence-tck-run-se/pom.xml b/glassfish-runner/persistence-tck/persistence-tck-run-se/pom.xml index 8d031dea52..17cbfce3ee 100644 --- a/glassfish-runner/persistence-tck/persistence-tck-run-se/pom.xml +++ b/glassfish-runner/persistence-tck/persistence-tck-run-se/pom.xml @@ -33,7 +33,7 @@ - 8.0.0-M6 + 8.0.0-JDK17-M6 ${project.build.directory}/glassfish8 ${glassfish.home}/glassfish/modules