This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit af6d3ed2ec73d566460f96c448cf8a4079453ed3
Author: David Blevins <dblev...@tomitribe.com>
AuthorDate: Wed Jan 11 17:43:33 2023 -0800
Initial Setup for Jakarta EE 10 Platform/WebProfile
---
pom.xml | 16 +++++++++-------
setup.sh | 16 ++++++++--------
src/test/script/openejb/tck/commands/SetupCommand.groovy | 6 +++---
3 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index a2e6325..30aae00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,13 +190,6 @@
<scope>system</scope>
<systemPath>${cts.home}/lib/tsharness.jar</systemPath>
</dependency>
- <dependency>
- <groupId>com.sun.javaee.tck</groupId>
- <artifactId>tssv</artifactId>
- <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>
@@ -672,6 +665,15 @@
<tck.version>9.1</tck.version>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.javaee.tck</groupId>
+ <artifactId>tssv</artifactId>
+ <version>${tck.version}</version>
+ <scope>system</scope>
+ <systemPath>${cts.home}/lib/tssv.jar</systemPath>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
diff --git a/setup.sh b/setup.sh
index 6e1c398..28a7a8c 100755
--- a/setup.sh
+++ b/setup.sh
@@ -10,8 +10,8 @@
TCKDIR="${1?Specify the directory where you would like the TCK to be
downloaded and setup}"
-TCK_URL="https://download.eclipse.org/jakartaee/platform/9.1/jakarta-jakartaeetck-9.1.0.zip";
-RI_URL="https://download.eclipse.org/ee4j/glassfish/glassfish-6.2.5.zip";
+TCK_URL="https://download.eclipse.org/jakartaee/platform/10/jakarta-jakartaeetck-10.0.1.zip";
+RI_URL="https://download.eclipse.org/ee4j/glassfish/glassfish-7.0.0-M8.zip";
ANT_URL="https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.9-bin.zip";
####################################################################
@@ -50,15 +50,15 @@ grep -q "<id>$TCK</id>" $M2 || perl -i -pe
"s,(<profiles>),\$1
<activeByDefault>true</activeByDefault>
</activation>
<properties>
- <jakartaee9.cts.home></jakartaee9.cts.home>
- <jakartaee9.ri.home></jakartaee9.ri.home>
+ <jakartaee10.cts.home></jakartaee10.cts.home>
+ <jakartaee10.ri.home></jakartaee10.ri.home>
</properties>
</profile>
," $M2
## Update paths in ~/.m2/settings.xml
-perl -i -pe "s,(<jakartaee9.cts.home>)[^<]*,\${1}$TCKDIR/$TCK," $M2
-perl -i -pe "s,(<jakartaee9.ri.home>)[^<]*,\${1}$TCKDIR/$RI/glassfish," $M2
+perl -i -pe "s,(<jakartaee10.cts.home>)[^<]*,\${1}$TCKDIR/$TCK," $M2
+perl -i -pe "s,(<jakartaee10.ri.home>)[^<]*,\${1}$TCKDIR/$RI/glassfish," $M2
################################################
@@ -81,13 +81,13 @@ cat > pom.xml <<EOF
<groupId>jakartaee-tck</groupId>
<artifactId>jakartaee-tck</artifactId>
- <version>9.1.0</version>
+ <version>10.0.1</version>
<dependencies>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>jakartaee-api</artifactId>
- <version>9.1.0</version>
+ <version>10.0.0-SNAPSHOT</version>
</dependency>
$(
for n in lib/*.jar; do
diff --git a/src/test/script/openejb/tck/commands/SetupCommand.groovy
b/src/test/script/openejb/tck/commands/SetupCommand.groovy
index 6c889b9..46798cc 100644
--- a/src/test/script/openejb/tck/commands/SetupCommand.groovy
+++ b/src/test/script/openejb/tck/commands/SetupCommand.groovy
@@ -147,9 +147,9 @@ class SetupCommand
// Create backups first.
def javaeeCtsHome = requireDirectory('cts.home')
- // Backup the original sig-test_se8.map, load in the new props, and
create
+ // Backup the original sig-test.map, load in the new props, and create
// the modified file
- def originalSe8File =
createOriginalFile("${javaeeCtsHome}/bin/sig-test_se8.map.orig",
"${javaeeCtsHome}/bin/sig-test_se8.map")
+ def originalSe8File =
createOriginalFile("${javaeeCtsHome}/bin/sig-test.map.orig",
"${javaeeCtsHome}/bin/sig-test.map")
// Load original properties
def props = loadProps(originalSe8File)
@@ -161,7 +161,7 @@ class SetupCommand
props.putAll(customProps)
// Save the new properties file
- storeProps(props, "${javaeeCtsHome}/bin/sig-test_se8.map")
+ storeProps(props, "${javaeeCtsHome}/bin/sig-test.map")
}
def createOriginalFile(newFileName, oldFileName) {
