You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2020/11/04 19:40:11 UTC
[tomee-tck] branch jakartaee9-tck updated: Add missing jars to
client because of jakarta namespace change
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch jakartaee9-tck
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
The following commit(s) were added to refs/heads/jakartaee9-tck by this push:
new 863b425 Add missing jars to client because of jakarta namespace change
863b425 is described below
commit 863b42550247b0af549842ac9e0572c34b6c552f
Author: Jean-Louis Monteiro <je...@gmail.com>
AuthorDate: Wed Nov 4 20:35:46 2020 +0100
Add missing jars to client because of jakarta namespace change
---
pom.xml | 52 +++++++++++++++++++---
.../openejb/tck/commands/CommandSupport.groovy | 3 +-
2 files changed, 48 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index fc89f17..0aa827b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<tomee.zip.groupId>org.apache.tomee.jakarta</tomee.zip.groupId>
<tomee.zip.version>9.0.0-M3-SNAPSHOT</tomee.zip.version>
- <tomcat.version>9.0.30</tomcat.version>
+ <tomcat.version>9.0.39</tomcat.version>
<derby.version>10.7.1.1</derby.version>
@@ -96,12 +96,13 @@
</properties>
<dependencies>
+
<dependency>
- <groupId>${openejb.groupId}</groupId>
- <artifactId>openejb-lite</artifactId>
- <version>${openejb.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
@@ -767,6 +768,7 @@
<artifactId>maven-dependency-plugin</artifactId>
<version>3.0.1</version>
<executions>
+ <!-- this gets overridden based on the profile with whatever distribution pulled -->
<execution>
<id>unpack</id>
<phase>pre-integration-test</phase>
@@ -785,6 +787,13 @@
</artifactItems>
</configuration>
</execution>
+
+ <!--
+ This basically adds into the lib directory for the client the necessary jars
+ Do not add any TomEE, Tomcat jar because they have to come from the lib above.
+ Otherwise, they won't be jakartized
+ ActiveMQ is a bit special because it's old and still requires Geronimo Spec for JMS 1.1 which is not Jakarta compliant
+ -->
<execution>
<id>copy-dependencies</id>
<phase>pre-integration-test</phase>
@@ -796,9 +805,11 @@
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
<excludeTransitive>true</excludeTransitive>
- <includeArtifactIds>hawtbuf,tomcat-websocket,tomcat-util,tomcat-util-scan,tomcat-juli,tomcat-catalina,tomee-security,tomcat-api,openejb-lite,activemq-client,tsharness,tssv,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient,webdeployer</includeArtifactIds>
+ <includeArtifactIds>hawtbuf,geronimo-jms_1.1_spec,activemq-client,tsharness,tssv,cts,whitebox,dbprocedures,geronimo-mail,derby,derbynet,derbyclient,webdeployer</includeArtifactIds>
</configuration>
</execution>
+
+ <!-- This has extra libraries required to run the TCK -->
<execution>
<id>copy-dependencies-tomee-lib</id>
<phase>pre-integration-test</phase>
@@ -826,6 +837,35 @@
<version>1.8</version>
<executions>
<execution>
+ <id>copy-tomee-libs-to-tck-javatest</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <copy todir="${project.build.directory}/lib">
+ <fileset dir="${openejb.home}/lib">
+ <include name="tomcat-websocket*.jar"/>
+ <include name="tomcat-util*.jar"/>
+ <include name="tomcat-juli*.jar"/>
+ <include name="tomcat-catalina*.jar"/>
+ <include name="jaspic-api*.jar"/>
+ <include name="tomcat-api*.jar"/>
+ <include name="websocket-api*.jar"/>
+ <include name="jsp-api*.jar"/>
+ <include name="el-api*.jar"/>
+ <include name="javaee-api*.jar"/>
+ <include name="tomee-security*.jar"/>
+ <include name="openejb-core*.jar"/>
+ <include name="openejb-derbynet*.jar"/>
+ <exclude name="openejb-core-eclipselink*.jar" />
+ </fileset>
+ </copy>
+ </target>
+ </configuration>
+ </execution>
+ <execution>
<id>remove-apps-and-copy-libs-from-tck</id>
<phase>pre-integration-test</phase>
<goals>
diff --git a/src/test/script/openejb/tck/commands/CommandSupport.groovy b/src/test/script/openejb/tck/commands/CommandSupport.groovy
index e34b978..a7a8b8e 100644
--- a/src/test/script/openejb/tck/commands/CommandSupport.groovy
+++ b/src/test/script/openejb/tck/commands/CommandSupport.groovy
@@ -268,7 +268,8 @@ abstract class CommandSupport {
builder.directory = "${project.build.directory}"
builder.append("openejb-tck-*.jar")
builder.directory = "${project.build.directory}/lib"
- builder.append("openejb-lite*.jar")
+ builder.append("javaee-api*.jar")
+ builder.append("openejb-core*.jar")
builder.directory = "${javaeetckHome}/lib"
builder.append("javatest.jar")
builder.append("tsharness.jar")