add persistence-platform-tck-dbprocedures jar (#1916)

jakartaee · Feb 10, 2025 · 28599d9 · 28599d9
1 parent 8554237
commit 28599d9
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 4 deletions.
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
@@ -100,6 +100,26 @@
                         </configuration>
                     </execution>
 
+                    <!-- Persistence Platform TCK dbprocedures -->
+
+                    <execution>
+                        <id>install-persistence-platform-tck-dbprocedures-jar</id>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <file>${project.build.directory}/jakartaeetck/artifacts/persistence-platform-tck-dbprocedures-${tck.test.persistence.version}.jar</file>
+                            <groupId>jakarta.tck</groupId>
+                            <artifactId>persistence-platform-tck-dbprocedures</artifactId>
+                            <version>${tck.test.persistence.version}</version>
+                            <sources>${project.build.directory}/jakartaeetck/artifacts/persistence-platform-tck-dbprocedures-${tck.test.persistence.version}-sources.jar</sources>
+                            <packaging>jar</packaging>
+                        </configuration>
+                    </execution>
+
+
+
                     <!-- Persistence Platform TCK tests -->
 
                     <execution>

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
@@ -108,7 +108,7 @@
             <version>${version.persistence.tck}</version>
             <scope>test</scope>
         </dependency>
-        <!-- <dependency>
+        <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>persistence-platform-tck-dbprocedures</artifactId>
             <version>${version.persistence.tck}</version>
@@ -119,7 +119,7 @@
                     <artifactId>jakarta.persistence-api</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency> -->
+        </dependency>
 
         <!-- TCK tools dependencies (the TCK above depends on these) -->
         <dependency>
@@ -265,7 +265,7 @@
                             </artifactItems>
                         </configuration>
                     </execution>
-                    <!-- <execution>
+                    <execution>
                         <id>004-copy-lib</id>
                         <goals>
                             <goal>copy</goal>
@@ -282,7 +282,7 @@
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
-                    </execution> -->
+                    </execution>
                 </executions>
             </plugin>
 

diff --git a/release/artifact-install.pom b/release/artifact-install.pom
@@ -253,6 +253,22 @@
                             <generatePom>false</generatePom>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>install-persistence-platform-tck-dbprocedures</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <configuration>
+                            <groupId>jakarta.tck</groupId>
+                            <artifactId>persistence-platform-tck-dbprocedures</artifactId>
+                            <version>${project.version}</version>
+                            <packaging>jar</packaging>
+                            <file>persistence-platform-tck-dbprocedures-${project.version}.jar</file>
+                            <generatePom>false</generatePom>
+                        </configuration>
+                    </execution>
+
                     <execution>
                         <id>install-persistence-platform-tck-spec-tests</id>
                         <phase>package</phase>

diff --git a/release/pom.xml b/release/pom.xml
@@ -159,6 +159,17 @@
             <version>${project.version}</version>
             <classifier>sources</classifier>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>persistence-platform-tck-dbprocedures</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>persistence-platform-tck-dbprocedures</artifactId>
+            <version>${project.version}</version>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>persistence-platform-tck-spec-tests</artifactId>

diff --git a/release/src/main/assembly/assembly.xml b/release/src/main/assembly/assembly.xml
@@ -127,6 +127,7 @@
                 <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-dbprocedures</include>
                 <include>${project.groupId}:persistence-platform-tck-spec-tests</include>
                 <include>${project.groupId}:jsonb-platform-tck</include>
                 <include>${project.groupId}:jsonp-platform-tck</include>