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/19 10:18:04 UTC
[tomee-tck] branch master updated: Make sure we can easily backport
changes to the other branch for Jakarta EE 9
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
The following commit(s) were added to refs/heads/master by this push:
new 3a43e64 Make sure we can easily backport changes to the other branch for Jakarta EE 9
3a43e64 is described below
commit 3a43e6416a44a1a798a92181e7eeaf290f2bc965
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Thu Nov 19 11:16:30 2020 +0100
Make sure we can easily backport changes to the other branch for Jakarta EE 9
---
pom.xml | 18 +++++++++---------
.../script/openejb/tck/commands/CommandSupport.groovy | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index a0b5621..cfa466e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
-->
<cts.home>${javaee8.cts.home}</cts.home>
<ri.home>${javaee8.ri.home}</ri.home>
- <javaee.tck.version>8.0</javaee.tck.version>
+ <tck.version>8.0</tck.version>
<localRepository>${settings.localRepository}</localRepository>
<examples.version>1.1-SNAPSHOT</examples.version>
@@ -145,7 +145,7 @@
<!--<dependency>-->
<!--<groupId>com.test</groupId>-->
<!--<artifactId>jar-to-test</artifactId>-->
- <!--<version>${javaee.tck.version}</version>-->
+ <!--<version>${tck.version}</version>-->
<!--<scope>system</scope>-->
<!--<type>jar</type>-->
<!--<systemPath>${cts.home}/dist/com/sun/ts/tests/websocket/ee/javax/websocket/clientendpoint/wsc_ee_clientendpoint_Client_nodeploy.jar_client</systemPath>-->
@@ -154,21 +154,21 @@
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>tsharness</artifactId>
- <version>${javaee.tck.version}</version>
+ <version>${tck.version}</version>
<scope>system</scope>
<systemPath>${cts.home}/lib/tsharness.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>tssv</artifactId>
- <version>${javaee.tck.version}</version>
+ <version>${tck.version}</version>
<scope>system</scope>
<systemPath>${cts.home}/lib/tssv.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>tsprovider</artifactId>
- <version>${javaee.tck.version}</version>
+ <version>${tck.version}</version>
<scope>system</scope>
<systemPath>${cts.home}/lib/tsprovider.jar</systemPath>
</dependency>
@@ -176,7 +176,7 @@
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>javatest</artifactId>
- <version>${javaee.tck.version}</version>
+ <version>${tck.version}</version>
<scope>system</scope>
<systemPath>${cts.home}/lib/javatest.jar</systemPath>
</dependency>
@@ -184,7 +184,7 @@
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>cts</artifactId>
- <version>${javaee.tck.version}</version>
+ <version>${tck.version}</version>
<scope>system</scope>
<systemPath>${cts.home}/lib/cts.jar</systemPath>
</dependency>
@@ -192,7 +192,7 @@
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>whitebox</artifactId>
- <version>${javaee.tck.version}</version>
+ <version>${tck.version}</version>
<scope>system</scope>
<systemPath>${cts.home}/dist/com/sun/ts/tests/common/connector/whitebox/whitebox.jar</systemPath>
</dependency>
@@ -200,7 +200,7 @@
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>dbprocedures</artifactId>
- <version>${javaee.tck.version}</version>
+ <version>${tck.version}</version>
<scope>system</scope>
<systemPath>${cts.home}/lib/dbprocedures.jar</systemPath>
</dependency>
diff --git a/src/test/script/openejb/tck/commands/CommandSupport.groovy b/src/test/script/openejb/tck/commands/CommandSupport.groovy
index 4e52b90..a8ddfaa 100644
--- a/src/test/script/openejb/tck/commands/CommandSupport.groovy
+++ b/src/test/script/openejb/tck/commands/CommandSupport.groovy
@@ -300,7 +300,7 @@ abstract class CommandSupport {
return;
}
- log.info("TCK pom version: " + require('javaee.tck.version'))
+ log.info("TCK pom version: " + require('tck.version'))
log.info("Start - Container libraries")
if (lib.exists() && lib.isDirectory()) {
lib.listFiles().grep(~/.*.jar/).sort { it.name }.each {