From 19c326eb53d70e38e3e873045c83e2698988735d Mon Sep 17 00:00:00 2001
From: Alwin Joseph <44426046+alwin-joseph@users.noreply.github.com>
Date: Wed, 5 Feb 2025 15:54:08 +0530
Subject: [PATCH] update persistence platform runner (#1880)

---
 .../persistence-platform-tck-install/pom.xml  | 126 +++++
 .../j2ee.pass                                 |   0
 .../bin/certificates/clientcert.jks           | Bin
 .../bin/certificates/clientcert.p12           | Bin
 .../jakartaeetck/bin/certificates/cts_cert    | Bin
 .../jakartaeetck/bin/ts.jte                   |   0
 .../javajoe.pass                              |   0
 .../persistence-platform-tck-run/pom.xml      | 511 ++++++++++++++++++
 .../derby/derby.ddl.persistence.sprocs.sql    |   0
 .../sql/derby/derby.ddl.sql                   |   0
 .../sql/derby/derby.dml.sql                   |   0
 .../sql/derby/password.txt                    |   0
 .../core/tck/GlassfishLoadableExtension.java  |   0
 .../tck/GlassfishTestArchiveProcessor.java    |   0
 ...boss.arquillian.core.spi.LoadableExtension |   0
 .../test/resources/appclient-arquillian.xml   |   0
 .../src/test/resources/arquillian.xml         |   0
 .../src/test/resources/rest-arquillian.xml    |   0
 .../persistence-platform-tck/pom.xml          | 496 +----------------
 release/artifact-install.pom                  |  31 ++
 release/pom.xml                               |  23 +
 release/src/main/assembly/assembly.xml        |   2 +
 22 files changed, 704 insertions(+), 485 deletions(-)
 create mode 100644 glassfish-runner/persistence-platform-tck/persistence-platform-tck-install/pom.xml
 rename glassfish-runner/persistence-platform-tck/{ => persistence-platform-tck-run}/j2ee.pass (100%)
 rename glassfish-runner/persistence-platform-tck/{ => persistence-platform-tck-run}/jakartaeetck/bin/certificates/clientcert.jks (100%)
 rename glassfish-runner/persistence-platform-tck/{ => persistence-platform-tck-run}/jakartaeetck/bin/certificates/clientcert.p12 (100%)
 rename glassfish-runner/persistence-platform-tck/{ => persistence-platform-tck-run}/jakartaeetck/bin/certificates/cts_cert (100%)
 rename glassfish-runner/persistence-platform-tck/{ => persistence-platform-tck-run}/jakartaeetck/bin/ts.jte (100%)
 rename glassfish-runner/persistence-platform-tck/{ => persistence-platform-tck-run}/javajoe.pass (100%)
 create mode 100644 glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/pom.xml
 rename glassfish-runner/persistence-platform-tck/{ => persistence-platform-tck-run}/sql/derby/derby.ddl.persistence.sprocs.sql (100%)
 rename glassfish-runner/persistence-platform-tck/{ => persistence-platform-tck-run}/sql/derby/derby.ddl.sql (100%)
 rename glassfish-runner/persistence-platform-tck/{ => persistence-platform-tck-run}/sql/derby/derby.dml.sql (100%)
 rename glassfish-runner/persistence-platform-tck/{ => persistence-platform-tck-run}/sql/derby/password.txt (100%)
 rename glassfish-runner/persistence-platform-tck/{ => persistence-platform-tck-run}/src/main/java/org/glassfish/transactions/core/tck/GlassfishLoadableExtension.java (100%)
 rename glassfish-runner/persistence-platform-tck/{ => persistence-platform-tck-run}/src/main/java/org/glassfish/transactions/core/tck/GlassfishTestArchiveProcessor.java (100%)
 rename glassfish-runner/persistence-platform-tck/{ => persistence-platform-tck-run}/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension (100%)
 rename glassfish-runner/persistence-platform-tck/{ => persistence-platform-tck-run}/src/test/resources/appclient-arquillian.xml (100%)
 rename glassfish-runner/persistence-platform-tck/{ => persistence-platform-tck-run}/src/test/resources/arquillian.xml (100%)
 rename glassfish-runner/persistence-platform-tck/{ => persistence-platform-tck-run}/src/test/resources/rest-arquillian.xml (100%)

diff --git a/glassfish-runner/persistence-platform-tck/persistence-platform-tck-install/pom.xml b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-install/pom.xml
new file mode 100644
index 0000000000..1a059ed7ef
--- /dev/null
+++ b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-install/pom.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+    <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+        <groupId>org.eclipse.ee4j</groupId>
+        <artifactId>project</artifactId>
+        <version>1.0.9</version>
+        <relativePath />
+    </parent>
+
+    <artifactId>persistence-platform-tck-install</artifactId>
+    <packaging>pom</packaging>
+
+    <name>TCK: Install Jakarta persistence Platform Tests</name>
+
+    <properties>
+        <tck.test.persistence.file>jakartaeetck-${tck.test.persistence.version}.zip</tck.test.persistence.file>
+        <tck.test.persistence.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee11/staged/eftl/${tck.test.persistence.file}</tck.test.persistence.url>
+        <tck.test.persistence.version>11.0.0-SNAPSHOT</tck.test.persistence.version>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.googlecode.maven-download-plugin</groupId>
+                <artifactId>download-maven-plugin</artifactId>
+                <version>1.9.0</version>
+                <configuration>
+                    <url>${tck.test.persistence.url}</url>
+                    <unpack>true</unpack>
+                    <outputDirectory>${project.build.directory}</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>download-persistence-tck</id>
+                        <goals>
+                            <goal>wget</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-install-plugin</artifactId>
+                <executions>
+
+                    <!-- Persistence Platform TCK Common -->
+
+                    <execution>
+                        <id>install-persistence-platform-tck-common-jar</id>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <file>${project.build.directory}/jakartaeetck/artifacts/persistence-platform-tck-common-${tck.test.persistence.version}.jar</file>
+                            <groupId>jakarta.tck</groupId>
+                            <artifactId>persistence-platform-tck-common</artifactId>
+                            <version>${tck.test.persistence.version}</version>
+                            <sources>${project.build.directory}/jakartaeetck/artifacts/persistence-platform-tck-common-${tck.test.persistence.version}-sources.jar</sources>
+                            <packaging>jar</packaging>
+                        </configuration>
+                    </execution>
+
+
+                    <!-- Persistence Platform TCK Spec tests -->
+
+                    <execution>
+                        <id>install-persistence-platform-tck-spec-tests-jar</id>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <file>${project.build.directory}/jakartaeetck/artifacts/persistence-platform-tck-spec-tests-${tck.test.persistence.version}.jar</file>
+                            <groupId>jakarta.tck</groupId>
+                            <artifactId>persistence-platform-tck-spec-tests</artifactId>
+                            <version>${tck.test.persistence.version}</version>
+                            <sources>${project.build.directory}/jakartaeetck/artifacts/persistence-platform-tck-spec-tests-${tck.test.persistence.version}-sources.jar</sources>
+                            <packaging>jar</packaging>
+                        </configuration>
+                    </execution>
+
+                    <!-- Persistence Platform TCK tests -->
+
+                    <execution>
+                        <id>install-persistence-platform-tck-tests-jar</id>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <file>${project.build.directory}/jakartaeetck/artifacts/persistence-platform-tck-tests-${tck.test.persistence.version}.jar</file>
+                            <groupId>jakarta.tck</groupId>
+                            <artifactId>persistence-platform-tck-tests</artifactId>
+                            <version>${tck.test.persistence.version}</version>
+                            <sources>${project.build.directory}/jakartaeetck/artifacts/persistence-platform-tck-tests-${tck.test.persistence.version}-sources.jar</sources>
+                            <packaging>jar</packaging>
+                        </configuration>
+                    </execution>
+
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+</project>
diff --git a/glassfish-runner/persistence-platform-tck/j2ee.pass b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/j2ee.pass
similarity index 100%
rename from glassfish-runner/persistence-platform-tck/j2ee.pass
rename to glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/j2ee.pass
diff --git a/glassfish-runner/persistence-platform-tck/jakartaeetck/bin/certificates/clientcert.jks b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/jakartaeetck/bin/certificates/clientcert.jks
similarity index 100%
rename from glassfish-runner/persistence-platform-tck/jakartaeetck/bin/certificates/clientcert.jks
rename to glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/jakartaeetck/bin/certificates/clientcert.jks
diff --git a/glassfish-runner/persistence-platform-tck/jakartaeetck/bin/certificates/clientcert.p12 b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/jakartaeetck/bin/certificates/clientcert.p12
similarity index 100%
rename from glassfish-runner/persistence-platform-tck/jakartaeetck/bin/certificates/clientcert.p12
rename to glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/jakartaeetck/bin/certificates/clientcert.p12
diff --git a/glassfish-runner/persistence-platform-tck/jakartaeetck/bin/certificates/cts_cert b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/jakartaeetck/bin/certificates/cts_cert
similarity index 100%
rename from glassfish-runner/persistence-platform-tck/jakartaeetck/bin/certificates/cts_cert
rename to glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/jakartaeetck/bin/certificates/cts_cert
diff --git a/glassfish-runner/persistence-platform-tck/jakartaeetck/bin/ts.jte b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/jakartaeetck/bin/ts.jte
similarity index 100%
rename from glassfish-runner/persistence-platform-tck/jakartaeetck/bin/ts.jte
rename to glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/jakartaeetck/bin/ts.jte
diff --git a/glassfish-runner/persistence-platform-tck/javajoe.pass b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/javajoe.pass
similarity index 100%
rename from glassfish-runner/persistence-platform-tck/javajoe.pass
rename to glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/javajoe.pass
diff --git a/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/pom.xml b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/pom.xml
new file mode 100644
index 0000000000..b65795e5c9
--- /dev/null
+++ b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/pom.xml
@@ -0,0 +1,511 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2024, 2025 Contributors to the Eclipse Foundation.
+    Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved.
+    
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+    
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+    
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.eclipse.ee4j</groupId>
+        <artifactId>project</artifactId>
+        <version>1.0.9</version>
+        <relativePath />
+    </parent>
+
+    <groupId>jakarta</groupId>
+    <artifactId>glassfish.jpa-platform-tck</artifactId>
+    <version>11.0.0-SNAPSHOT</version>
+
+    <properties>
+        <!-- Require at least Java 17 to compile -->
+        <maven.compiler.release>17</maven.compiler.release>
+        
+        <arquillian.junit>1.9.1.Final</arquillian.junit>
+
+        <glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
+        <glassfish.lib.dir>${glassfish.home}/glassfish/lib</glassfish.lib.dir>
+        <!-- Use JDK21 to run with GF 8.0.0-M9 -->
+        <!-- <glassfish.version>8.0.0-M9</glassfish.version> -->
+        <glassfish.toplevel.dir>glassfish8</glassfish.toplevel.dir>
+        <!-- Use JDK17 to run with GF 8.0.0-JDK17-M5 -->
+        <glassfish.version>8.0.0-JDK17-M9</glassfish.version>
+        <jakarta.platform.version>11.0.0-M2</jakarta.platform.version>
+
+        <junit.jupiter.version>5.11.3</junit.jupiter.version>
+        <tck.version>11.0.0-SNAPSHOT</tck.version>
+        <ts.home>./jakartaeetck</ts.home>
+        <version.jakarta.inject>2.0.1.MR</version.jakarta.inject>
+        <version.jakarta.persistence>3.2.0</version.jakarta.persistence>
+        <jakarta.tck.tools.version>11.0.0-RC4</jakarta.tck.tools.version>
+        <version.persistence.tck>11.0.0-SNAPSHOT</version.persistence.tck>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit.jupiter.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.arquillian</groupId>
+                <artifactId>arquillian-bom</artifactId>
+                <version>${arquillian.junit}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>3.5.2</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <!-- Jakarta EE dependencies -->
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <version>${jakarta.platform.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <version>${version.jakarta.inject}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>${version.jakarta.persistence}</version>
+        </dependency>
+
+        <!-- The TCK itself -->
+        <dependency>
+            <groupId>jakarta.tck</groupId>
+            <artifactId>persistence-platform-tck-common</artifactId>
+            <version>${version.persistence.tck}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.tck</groupId>
+            <artifactId>persistence-platform-tck-spec-tests</artifactId>
+            <version>${version.persistence.tck}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.tck</groupId>
+            <artifactId>persistence-platform-tck-tests</artifactId>
+            <version>${version.persistence.tck}</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <!-- TCK tools dependencies (the TCK above depends on these-->
+        <dependency>
+            <groupId>jakarta.tck</groupId>
+            <artifactId>common</artifactId>
+            <version>${jakarta.tck.tools.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.tck</groupId>
+            <artifactId>dbprocedures</artifactId>
+            <version>3.2.0</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>jakarta.persistence</groupId>
+                    <artifactId>jakarta.persistence-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- Junit -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Arquillian -->
+        <dependency>
+            <groupId>org.jboss.arquillian.container</groupId>
+            <artifactId>arquillian-container-test-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.arquillian.container</groupId>
+            <artifactId>arquillian-container-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.arquillian.core</groupId>
+            <artifactId>arquillian-core-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.arquillian.test</groupId>
+            <artifactId>arquillian-test-impl-base</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.arquillian.junit5</groupId>
+            <artifactId>arquillian-junit5-container</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.arquillian.junit</groupId>
+            <artifactId>arquillian-junit-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.arquillian.junit5</groupId>
+            <artifactId>arquillian-junit5-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.tck.arquillian</groupId>
+            <artifactId>arquillian-protocol-appclient</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.omnifaces.arquillian</groupId>
+            <artifactId>arquillian-glassfish-server-managed</artifactId>
+            <version>1.7</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.omnifaces.arquillian</groupId>
+            <artifactId>glassfish-client-ee11</artifactId>
+            <version>1.7.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.shrinkwrap.resolver</groupId>
+            <artifactId>shrinkwrap-resolver-api</artifactId>
+            <version>3.3.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap.resolver</groupId>
+            <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+            <version>3.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap.resolver</groupId>
+            <artifactId>shrinkwrap-resolver-api-maven</artifactId>
+            <version>3.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap.resolver</groupId>
+            <artifactId>shrinkwrap-resolver-spi-maven</artifactId>
+            <version>3.2.0</version>
+        </dependency>
+
+        <!-- Arquillian extensions for TCK  -->
+        <dependency>
+            <groupId>jakarta.tck.arquillian</groupId>
+            <artifactId>arquillian-protocol-javatest</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jboss.shrinkwrap.resolver</groupId>
+                    <artifactId>shrinkwrap-resolver-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jboss.shrinkwrap.resolver</groupId>
+                    <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jboss.shrinkwrap.resolver</groupId>
+                    <artifactId>shrinkwrap-resolver-api-maven</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jboss.shrinkwrap.resolver</groupId>
+                    <artifactId>shrinkwrap-resolver-spi-maven</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.tck.arquillian</groupId>
+            <artifactId>arquillian-protocol-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.tck.arquillian</groupId>
+            <artifactId>arquillian-protocol-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.tck.arquillian</groupId>
+            <artifactId>tck-porting-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <targetPath>${project.build.directory}/sql</targetPath>
+                <filtering>true</filtering>
+                <directory>${project.basedir}/sql/derby</directory>
+                <includes>
+                    <include>*.sql</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.7.1</version>
+                <executions>
+                    <execution>
+                        <id>001-unpack</id>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.glassfish.main.distributions</groupId>
+                                    <artifactId>${glassfish-artifact-id}</artifactId>
+                                    <version>${glassfish.version}</version>
+                                    <type>zip</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>003-copy-protocol-lib</id>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>jakarta.tck.arquillian</groupId>
+                                    <artifactId>arquillian-protocol-lib</artifactId>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/protocol</outputDirectory>
+                                    <destFileName>protocol.jar</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>004-copy-lib</id>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>jakarta.tck</groupId>
+                                    <artifactId>common</artifactId>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                                    <destFileName>common.jar</destFileName>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>jakarta.tck.arquillian</groupId>
+                                    <artifactId>tck-porting-lib</artifactId>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                                    <destFileName>tck-porting-lib.jar</destFileName>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>jakarta.tck</groupId>
+                                    <artifactId>persistence-platform-tck-tests</artifactId>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                                    <destFileName>persistence-platform-tck-tests.jar</destFileName>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>jakarta.tck.arquillian</groupId>
+                                    <artifactId>arquillian-protocol-lib</artifactId>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                                    <destFileName>arquillian-protocol-lib.jar</destFileName>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>jakarta.tck</groupId>
+                                    <artifactId>dbprocedures</artifactId>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <destFileName>dbprocedures.jar</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>3.5.0</version>
+                <configuration>
+                    <trimStackTrace>false</trimStackTrace>
+                    <dependenciesToScan>jakarta.tck:persistence-platform-tck-tests</dependenciesToScan>
+
+                    <systemPropertyVariables>
+                        <glassfish.enableDerby>true</glassfish.enableDerby>
+                        <glassfish.derbyDatabaseName>${glassfish.home}/glassfish/domains/domain1/config/derbyDB;create=true</glassfish.derbyDatabaseName>
+                        <glassfish.derbySQLFile>${project.build.directory}/sql/derby.ddl.sql</glassfish.derbySQLFile>
+                        <glassfish.derbyUser>cts1</glassfish.derbyUser>
+                        <glassfish.derbyPasswordFile>${basedir}/sql/derby/password.txt</glassfish.derbyPasswordFile>
+
+                        <glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
+                        <glassfish.postBootCommands>set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true
+                            create-file-user --groups guest --passwordfile ${project.basedir}/javajoe.pass javajoe
+                            create-file-user --groups staff:mgr --passwordfile ${project.basedir}/j2ee.pass j2ee
+                            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-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_no_tx
+                            create-jdbc-resource --connectionpoolid cts-derby-pool jdbc/DB1
+                            create-jdbc-resource --connectionpoolid cts-derby-pool_no_tx jdbc/DB_no_tx
+                            list-jdbc-connection-pools
+                            list-jdbc-resources
+                            list-file-users</glassfish.postBootCommands>
+                        <junit.log.traceflag>true</junit.log.traceflag>
+                        <harness.log.traceflag>true</harness.log.traceflag>
+                        <cts.harness.debug>true</cts.harness.debug>
+                        <project.basedir>${project.basedir}</project.basedir>
+                    </systemPropertyVariables>
+                </configuration>
+
+                <executions>
+                    <execution>
+                        <id>jpa-tests-cdi</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>ee/jakarta/tck/persistence/ee/cdi/*Test.java</include>
+                            </includes>
+
+                            <skipITs>${cdi.skip}</skipITs>
+
+                            <systemPropertyVariables>
+                                <arquillian.xml>rest-arquillian.xml</arquillian.xml>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>jta-tests-javatest</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>ee/jakarta/tck/persistence/**/*Test.java</include>
+                            </includes>
+                            <groups>tck-javatest</groups>
+
+                            <systemPropertyVariables>
+                                <arquillian.xml>arquillian.xml</arquillian.xml>
+                                <ts.home>${ts.home}</ts.home>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>3.5.2</version>
+                <configuration>
+                    <linkXRef>false</linkXRef>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>generate-failsafe-html-report</id>
+                        <goals>
+                            <goal>failsafe-report-only</goal>
+                        </goals>
+                        <phase>post-integration-test</phase>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/test-reports</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>full</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <glassfish-artifact-id>glassfish</glassfish-artifact-id>
+            </properties>
+        </profile>
+        <profile>
+            <id>web</id>
+            <properties>
+                <glassfish-artifact-id>web</glassfish-artifact-id>
+            </properties>
+        </profile>
+        <profile>
+            <id>appclient</id>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>3.5.0</version>
+                        <executions>
+                            <execution>
+                                <id>jpa-tests-appclient</id>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                                <configuration>
+                                    <includes>
+                                        <include>ee/jakarta/tck/persistence/**/*Test.java</include>
+                                    </includes>
+                                    <groups>tck-appclient</groups>
+
+                                    <systemPropertyVariables>
+                                        <arquillian.xml>appclient-arquillian.xml</arquillian.xml>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/glassfish-runner/persistence-platform-tck/sql/derby/derby.ddl.persistence.sprocs.sql b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/sql/derby/derby.ddl.persistence.sprocs.sql
similarity index 100%
rename from glassfish-runner/persistence-platform-tck/sql/derby/derby.ddl.persistence.sprocs.sql
rename to glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/sql/derby/derby.ddl.persistence.sprocs.sql
diff --git a/glassfish-runner/persistence-platform-tck/sql/derby/derby.ddl.sql b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/sql/derby/derby.ddl.sql
similarity index 100%
rename from glassfish-runner/persistence-platform-tck/sql/derby/derby.ddl.sql
rename to glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/sql/derby/derby.ddl.sql
diff --git a/glassfish-runner/persistence-platform-tck/sql/derby/derby.dml.sql b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/sql/derby/derby.dml.sql
similarity index 100%
rename from glassfish-runner/persistence-platform-tck/sql/derby/derby.dml.sql
rename to glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/sql/derby/derby.dml.sql
diff --git a/glassfish-runner/persistence-platform-tck/sql/derby/password.txt b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/sql/derby/password.txt
similarity index 100%
rename from glassfish-runner/persistence-platform-tck/sql/derby/password.txt
rename to glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/sql/derby/password.txt
diff --git a/glassfish-runner/persistence-platform-tck/src/main/java/org/glassfish/transactions/core/tck/GlassfishLoadableExtension.java b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/src/main/java/org/glassfish/transactions/core/tck/GlassfishLoadableExtension.java
similarity index 100%
rename from glassfish-runner/persistence-platform-tck/src/main/java/org/glassfish/transactions/core/tck/GlassfishLoadableExtension.java
rename to glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/src/main/java/org/glassfish/transactions/core/tck/GlassfishLoadableExtension.java
diff --git a/glassfish-runner/persistence-platform-tck/src/main/java/org/glassfish/transactions/core/tck/GlassfishTestArchiveProcessor.java b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/src/main/java/org/glassfish/transactions/core/tck/GlassfishTestArchiveProcessor.java
similarity index 100%
rename from glassfish-runner/persistence-platform-tck/src/main/java/org/glassfish/transactions/core/tck/GlassfishTestArchiveProcessor.java
rename to glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/src/main/java/org/glassfish/transactions/core/tck/GlassfishTestArchiveProcessor.java
diff --git a/glassfish-runner/persistence-platform-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
similarity index 100%
rename from glassfish-runner/persistence-platform-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
rename to glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
diff --git a/glassfish-runner/persistence-platform-tck/src/test/resources/appclient-arquillian.xml b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/src/test/resources/appclient-arquillian.xml
similarity index 100%
rename from glassfish-runner/persistence-platform-tck/src/test/resources/appclient-arquillian.xml
rename to glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/src/test/resources/appclient-arquillian.xml
diff --git a/glassfish-runner/persistence-platform-tck/src/test/resources/arquillian.xml b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/src/test/resources/arquillian.xml
similarity index 100%
rename from glassfish-runner/persistence-platform-tck/src/test/resources/arquillian.xml
rename to glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/src/test/resources/arquillian.xml
diff --git a/glassfish-runner/persistence-platform-tck/src/test/resources/rest-arquillian.xml b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/src/test/resources/rest-arquillian.xml
similarity index 100%
rename from glassfish-runner/persistence-platform-tck/src/test/resources/rest-arquillian.xml
rename to glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/src/test/resources/rest-arquillian.xml
diff --git a/glassfish-runner/persistence-platform-tck/pom.xml b/glassfish-runner/persistence-platform-tck/pom.xml
index b65795e5c9..1fe1a4018e 100644
--- a/glassfish-runner/persistence-platform-tck/pom.xml
+++ b/glassfish-runner/persistence-platform-tck/pom.xml
@@ -2,20 +2,21 @@
 <!--
     Copyright (c) 2024, 2025 Contributors to the Eclipse Foundation.
     Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved.
-    
+
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
     http://www.eclipse.org/legal/epl-2.0.
-    
+
     This Source Code may also be made available under the following Secondary
     Licenses when the conditions for such availability set forth in the
     Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
     version 2 with the GNU Classpath Exception, which is available at
     https://www.gnu.org/software/classpath/license.html.
-    
+
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -25,487 +26,12 @@
         <relativePath />
     </parent>
 
-    <groupId>jakarta</groupId>
-    <artifactId>glassfish.jpa-platform-tck</artifactId>
+    <artifactId>persistence-platform-tck</artifactId>
     <version>11.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-    <properties>
-        <!-- Require at least Java 17 to compile -->
-        <maven.compiler.release>17</maven.compiler.release>
-        
-        <arquillian.junit>1.9.1.Final</arquillian.junit>
-
-        <glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
-        <glassfish.lib.dir>${glassfish.home}/glassfish/lib</glassfish.lib.dir>
-        <!-- Use JDK21 to run with GF 8.0.0-M9 -->
-        <!-- <glassfish.version>8.0.0-M9</glassfish.version> -->
-        <glassfish.toplevel.dir>glassfish8</glassfish.toplevel.dir>
-        <!-- Use JDK17 to run with GF 8.0.0-JDK17-M5 -->
-        <glassfish.version>8.0.0-JDK17-M9</glassfish.version>
-        <jakarta.platform.version>11.0.0-M2</jakarta.platform.version>
-
-        <junit.jupiter.version>5.11.3</junit.jupiter.version>
-        <tck.version>11.0.0-SNAPSHOT</tck.version>
-        <ts.home>./jakartaeetck</ts.home>
-        <version.jakarta.inject>2.0.1.MR</version.jakarta.inject>
-        <version.jakarta.persistence>3.2.0</version.jakarta.persistence>
-        <jakarta.tck.tools.version>11.0.0-RC4</jakarta.tck.tools.version>
-        <version.persistence.tck>11.0.0-SNAPSHOT</version.persistence.tck>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.junit</groupId>
-                <artifactId>junit-bom</artifactId>
-                <version>${junit.jupiter.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.arquillian</groupId>
-                <artifactId>arquillian-bom</artifactId>
-                <version>${arquillian.junit}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>3.5.2</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <dependencies>
-        <!-- Jakarta EE dependencies -->
-        <dependency>
-            <groupId>jakarta.platform</groupId>
-            <artifactId>jakarta.jakartaee-api</artifactId>
-            <version>${jakarta.platform.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.inject</groupId>
-            <artifactId>jakarta.inject-api</artifactId>
-            <version>${version.jakarta.inject}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta.persistence}</version>
-        </dependency>
-
-        <!-- The TCK itself -->
-        <dependency>
-            <groupId>jakarta.tck</groupId>
-            <artifactId>persistence-platform-tck-common</artifactId>
-            <version>${version.persistence.tck}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.tck</groupId>
-            <artifactId>persistence-platform-tck-spec-tests</artifactId>
-            <version>${version.persistence.tck}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.tck</groupId>
-            <artifactId>persistence-platform-tck-tests</artifactId>
-            <version>${version.persistence.tck}</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <!-- TCK tools dependencies (the TCK above depends on these-->
-        <dependency>
-            <groupId>jakarta.tck</groupId>
-            <artifactId>common</artifactId>
-            <version>${jakarta.tck.tools.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jakarta.tck</groupId>
-            <artifactId>dbprocedures</artifactId>
-            <version>3.2.0</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>jakarta.persistence</groupId>
-                    <artifactId>jakarta.persistence-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- Junit -->
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Arquillian -->
-        <dependency>
-            <groupId>org.jboss.arquillian.container</groupId>
-            <artifactId>arquillian-container-test-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.arquillian.container</groupId>
-            <artifactId>arquillian-container-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.arquillian.core</groupId>
-            <artifactId>arquillian-core-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.arquillian.test</groupId>
-            <artifactId>arquillian-test-impl-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.arquillian.junit5</groupId>
-            <artifactId>arquillian-junit5-container</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.arquillian.junit</groupId>
-            <artifactId>arquillian-junit-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.arquillian.junit5</groupId>
-            <artifactId>arquillian-junit5-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.tck.arquillian</groupId>
-            <artifactId>arquillian-protocol-appclient</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.omnifaces.arquillian</groupId>
-            <artifactId>arquillian-glassfish-server-managed</artifactId>
-            <version>1.7</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.omnifaces.arquillian</groupId>
-            <artifactId>glassfish-client-ee11</artifactId>
-            <version>1.7.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.shrinkwrap.resolver</groupId>
-            <artifactId>shrinkwrap-resolver-api</artifactId>
-            <version>3.3.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.shrinkwrap.resolver</groupId>
-            <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
-            <version>3.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.shrinkwrap.resolver</groupId>
-            <artifactId>shrinkwrap-resolver-api-maven</artifactId>
-            <version>3.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.shrinkwrap.resolver</groupId>
-            <artifactId>shrinkwrap-resolver-spi-maven</artifactId>
-            <version>3.2.0</version>
-        </dependency>
-
-        <!-- Arquillian extensions for TCK  -->
-        <dependency>
-            <groupId>jakarta.tck.arquillian</groupId>
-            <artifactId>arquillian-protocol-javatest</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss.shrinkwrap.resolver</groupId>
-                    <artifactId>shrinkwrap-resolver-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jboss.shrinkwrap.resolver</groupId>
-                    <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jboss.shrinkwrap.resolver</groupId>
-                    <artifactId>shrinkwrap-resolver-api-maven</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jboss.shrinkwrap.resolver</groupId>
-                    <artifactId>shrinkwrap-resolver-spi-maven</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.tck.arquillian</groupId>
-            <artifactId>arquillian-protocol-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.tck.arquillian</groupId>
-            <artifactId>arquillian-protocol-lib</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.tck.arquillian</groupId>
-            <artifactId>tck-porting-lib</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <targetPath>${project.build.directory}/sql</targetPath>
-                <filtering>true</filtering>
-                <directory>${project.basedir}/sql/derby</directory>
-                <includes>
-                    <include>*.sql</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.7.1</version>
-                <executions>
-                    <execution>
-                        <id>001-unpack</id>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.glassfish.main.distributions</groupId>
-                                    <artifactId>${glassfish-artifact-id}</artifactId>
-                                    <version>${glassfish.version}</version>
-                                    <type>zip</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>003-copy-protocol-lib</id>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>jakarta.tck.arquillian</groupId>
-                                    <artifactId>arquillian-protocol-lib</artifactId>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/protocol</outputDirectory>
-                                    <destFileName>protocol.jar</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>004-copy-lib</id>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>jakarta.tck</groupId>
-                                    <artifactId>common</artifactId>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                                    <destFileName>common.jar</destFileName>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>jakarta.tck.arquillian</groupId>
-                                    <artifactId>tck-porting-lib</artifactId>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                                    <destFileName>tck-porting-lib.jar</destFileName>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>jakarta.tck</groupId>
-                                    <artifactId>persistence-platform-tck-tests</artifactId>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                                    <destFileName>persistence-platform-tck-tests.jar</destFileName>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>jakarta.tck.arquillian</groupId>
-                                    <artifactId>arquillian-protocol-lib</artifactId>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                                    <destFileName>arquillian-protocol-lib.jar</destFileName>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>jakarta.tck</groupId>
-                                    <artifactId>dbprocedures</artifactId>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}</outputDirectory>
-                                    <destFileName>dbprocedures.jar</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.5.0</version>
-                <configuration>
-                    <trimStackTrace>false</trimStackTrace>
-                    <dependenciesToScan>jakarta.tck:persistence-platform-tck-tests</dependenciesToScan>
-
-                    <systemPropertyVariables>
-                        <glassfish.enableDerby>true</glassfish.enableDerby>
-                        <glassfish.derbyDatabaseName>${glassfish.home}/glassfish/domains/domain1/config/derbyDB;create=true</glassfish.derbyDatabaseName>
-                        <glassfish.derbySQLFile>${project.build.directory}/sql/derby.ddl.sql</glassfish.derbySQLFile>
-                        <glassfish.derbyUser>cts1</glassfish.derbyUser>
-                        <glassfish.derbyPasswordFile>${basedir}/sql/derby/password.txt</glassfish.derbyPasswordFile>
-
-                        <glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
-                        <glassfish.postBootCommands>set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true
-                            create-file-user --groups guest --passwordfile ${project.basedir}/javajoe.pass javajoe
-                            create-file-user --groups staff:mgr --passwordfile ${project.basedir}/j2ee.pass j2ee
-                            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-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_no_tx
-                            create-jdbc-resource --connectionpoolid cts-derby-pool jdbc/DB1
-                            create-jdbc-resource --connectionpoolid cts-derby-pool_no_tx jdbc/DB_no_tx
-                            list-jdbc-connection-pools
-                            list-jdbc-resources
-                            list-file-users</glassfish.postBootCommands>
-                        <junit.log.traceflag>true</junit.log.traceflag>
-                        <harness.log.traceflag>true</harness.log.traceflag>
-                        <cts.harness.debug>true</cts.harness.debug>
-                        <project.basedir>${project.basedir}</project.basedir>
-                    </systemPropertyVariables>
-                </configuration>
-
-                <executions>
-                    <execution>
-                        <id>jpa-tests-cdi</id>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                        <configuration>
-                            <includes>
-                                <include>ee/jakarta/tck/persistence/ee/cdi/*Test.java</include>
-                            </includes>
-
-                            <skipITs>${cdi.skip}</skipITs>
-
-                            <systemPropertyVariables>
-                                <arquillian.xml>rest-arquillian.xml</arquillian.xml>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>jta-tests-javatest</id>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                        <configuration>
-                            <includes>
-                                <include>ee/jakarta/tck/persistence/**/*Test.java</include>
-                            </includes>
-                            <groups>tck-javatest</groups>
-
-                            <systemPropertyVariables>
-                                <arquillian.xml>arquillian.xml</arquillian.xml>
-                                <ts.home>${ts.home}</ts.home>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>3.5.2</version>
-                <configuration>
-                    <linkXRef>false</linkXRef>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>generate-failsafe-html-report</id>
-                        <goals>
-                            <goal>failsafe-report-only</goal>
-                        </goals>
-                        <phase>post-integration-test</phase>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/test-reports</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>full</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <glassfish-artifact-id>glassfish</glassfish-artifact-id>
-            </properties>
-        </profile>
-        <profile>
-            <id>web</id>
-            <properties>
-                <glassfish-artifact-id>web</glassfish-artifact-id>
-            </properties>
-        </profile>
-        <profile>
-            <id>appclient</id>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>3.5.0</version>
-                        <executions>
-                            <execution>
-                                <id>jpa-tests-appclient</id>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <includes>
-                                        <include>ee/jakarta/tck/persistence/**/*Test.java</include>
-                                    </includes>
-                                    <groups>tck-appclient</groups>
-
-                                    <systemPropertyVariables>
-                                        <arquillian.xml>appclient-arquillian.xml</arquillian.xml>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <modules>
+        <module>persistence-platform-tck-install</module>
+        <module>persistence-platform-tck-run</module>
+    </modules>
 </project>
diff --git a/release/artifact-install.pom b/release/artifact-install.pom
index 4b4319756f..b751d44365 100644
--- a/release/artifact-install.pom
+++ b/release/artifact-install.pom
@@ -238,6 +238,37 @@
                             <generatePom>false</generatePom>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>install-persistence-platform-tck-common</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <configuration>
+                            <groupId>jakarta.tck</groupId>
+                            <artifactId>persistence-platform-tck-common</artifactId>
+                            <version>${project.version}</version>
+                            <packaging>jar</packaging>
+                            <file>persistence-platform-tck-common-${project.version}.jar</file>
+                            <generatePom>false</generatePom>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>install-persistence-platform-tck-spec-tests</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <configuration>
+                            <groupId>jakarta.tck</groupId>
+                            <artifactId>persistence-platform-tck-spec-tests</artifactId>
+                            <version>${project.version}</version>
+                            <packaging>jar</packaging>
+                            <file>persistence-platform-tck-spec-tests-${project.version}.jar</file>
+                            <generatePom>false</generatePom>
+                        </configuration>
+                    </execution>
+
                     <execution>
                         <id>install-jsonb-platform-tck</id>
                         <phase>package</phase>
diff --git a/release/pom.xml b/release/pom.xml
index 95a69ff089..81c716e23b 100644
--- a/release/pom.xml
+++ b/release/pom.xml
@@ -148,6 +148,29 @@
             <version>${project.version}</version>
             <classifier>sources</classifier>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>persistence-platform-tck-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>persistence-platform-tck-common</artifactId>
+            <version>${project.version}</version>
+            <classifier>sources</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>persistence-platform-tck-spec-tests</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>persistence-platform-tck-spec-tests</artifactId>
+            <version>${project.version}</version>
+            <classifier>sources</classifier>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>jsonb-platform-tck</artifactId>
diff --git a/release/src/main/assembly/assembly.xml b/release/src/main/assembly/assembly.xml
index b7ec0c671d..aa98630ae3 100644
--- a/release/src/main/assembly/assembly.xml
+++ b/release/src/main/assembly/assembly.xml
@@ -126,6 +126,8 @@
                 <include>${project.groupId}:jms-tck</include>
                 <include>${project.groupId}:project</include>
                 <include>${project.groupId}:persistence-platform-tck-tests</include>
+                <include>${project.groupId}:persistence-platform-tck-common</include>
+                <include>${project.groupId}:persistence-platform-tck-spec-tests</include>
                 <include>${project.groupId}:jsonb-platform-tck</include>
                 <include>${project.groupId}:jsonp-platform-tck</include>
                 <include>${project.groupId}:pages-platform-tck</include>