diff --git a/glassfish-runner/transactions-tck/transactions-tck-install/pom.xml b/glassfish-runner/transactions-tck/transactions-tck-install/pom.xml index d090237b71..0cecee2d33 100644 --- a/glassfish-runner/transactions-tck/transactions-tck-install/pom.xml +++ b/glassfish-runner/transactions-tck/transactions-tck-install/pom.xml @@ -1,7 +1,7 @@ - tck_full_build + install-transactions-tck-pom - run - - generate-resources - - true - ${project.build.directory}/platform-tck-main - - pom.xml - - clean install - - - - - - tools_build - - run + install-file process-resources - true - ${project.build.directory}/jakartaee-tck-tools-master/arquillian - - pom.xml - - clean source:jar install -DskipTests + ${project.build.directory}/transactions-tck-${tck.test.transactions.version}.jar + ${project.build.directory}/transactions-tck-${tck.test.transactions.version}-sources.jar + jakarta.tck + transactions-tck + ${tck.test.transactions.version} + jar + diff --git a/glassfish-runner/transactions-tck/transactions-tck-run/pom.xml b/glassfish-runner/transactions-tck/transactions-tck-run/pom.xml index 61d62be6ee..2b2c4277b1 100644 --- a/glassfish-runner/transactions-tck/transactions-tck-run/pom.xml +++ b/glassfish-runner/transactions-tck/transactions-tck-run/pom.xml @@ -1,7 +1,8 @@ jakarta.tck - jta-tck - ${tck.version} - - - jakarta.tck - ejb30 - ${tck.version} + transactions-tck + ${jakarta.tck.transactions.version} @@ -111,11 +115,6 @@ - - jakarta.tck.arquillian - arquillian-protocol-appclient - ${project.version} - org.jboss.shrinkwrap.resolver shrinkwrap-resolver-spi-maven @@ -129,6 +128,19 @@ org.jboss.shrinkwrap.descriptors shrinkwrap-descriptors-impl-base + 2.0.0 + + + + + jakarta.tck + runtime + ${jakarta.tck.tools.version} + + + jakarta.tck + common + ${jakarta.tck.tools.version} - - jakarta.tck.arquillian - tck-porting-lib - true - ${project.build.directory}/lib - tck-porting-lib.jar - - - jakarta.tck.arquillian - arquillian-protocol-lib - true - ${project.build.directory}/lib - arquillian-protocol-lib.jar - - - - - jakarta.tck.arquillian - arquillian-protocol-lib - true - ${project.build.directory}/protocol - protocol.jar - - - - @@ -255,51 +224,13 @@ 3.5.0 - jta-tests-appclient - - integration-test - verify - - - jakarta.tck:jta-tck - - tck-appclient - - com/sun/ts/tests/jta/ee/txpropagationtest/*Ejb*.java - com/sun/ts/tests/jta/ee/usertransaction/**/*EjbTest*.java - - - - ${ts.home} - - true - ${glassfish.home}/glassfish/domains/domain1/config/derbyDB;create=true - ${basedir}/sql/derby/derby.ddl.sql - cts1 - ${basedir}/sql/derby/password.txt - - ${glassfish.home} - set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true - create-jdbc-connection-pool --restype javax.sql.DataSource --datasourceclassname org.apache.derby.jdbc.ClientDataSource --property databaseName=${glassfish.home}/glassfish/domains/domain1/config/derbyDB:serverName=localhost:portNumber=1527:user=cts1:password=cts1 --steadypoolsize 32 --maxpoolsize 64 cts-derby-pool - create-jdbc-resource --connectionpoolid cts-derby-pool jdbc/DB1 - list-jdbc-connection-pools - list-jdbc-resources - list-file-users - true - true - ${project.basedir} - appclient-arquillian.xml - - - - - jta-tests-javatest + transactions-tests-javatest integration-test verify - jakarta.tck:jta-tck + jakarta.tck:transactions-tck ${javatest-testGroups} @@ -358,5 +289,102 @@ web + + appclient + + + + + maven-dependency-plugin + + + 002-copy-lib + + copy + + generate-resources + + + + + + jakarta.tck.arquillian + tck-porting-lib + true + ${project.build.directory}/lib + tck-porting-lib.jar + + + jakarta.tck.arquillian + arquillian-protocol-lib + true + ${project.build.directory}/lib + arquillian-protocol-lib.jar + + + + + jakarta.tck.arquillian + arquillian-protocol-lib + true + ${project.build.directory}/protocol + protocol.jar + + + + + + + + + maven-failsafe-plugin + 3.5.0 + + + transactions-tests-appclient + + integration-test + verify + + + jakarta.tck:transactions-tck + + tck-appclient + + com/sun/ts/tests/jta/ee/txpropagationtest/*Ejb*.java + com/sun/ts/tests/jta/ee/usertransaction/**/*EjbTest*.java + + + + ${ts.home} + + true + ${glassfish.home}/glassfish/domains/domain1/config/derbyDB;create=true + ${basedir}/sql/derby/derby.ddl.sql + cts1 + ${basedir}/sql/derby/password.txt + + ${glassfish.home} + set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true + create-jdbc-connection-pool --restype javax.sql.DataSource --datasourceclassname org.apache.derby.jdbc.ClientDataSource --property databaseName=${glassfish.home}/glassfish/domains/domain1/config/derbyDB:serverName=localhost:portNumber=1527:user=cts1:password=cts1 --steadypoolsize 32 --maxpoolsize 64 cts-derby-pool + create-jdbc-resource --connectionpoolid cts-derby-pool jdbc/DB1 + list-jdbc-connection-pools + list-jdbc-resources + list-file-users + true + true + ${project.basedir} + appclient-arquillian.xml + + + + + + + +