This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch javaee6-tck
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit f72d73954268d10b7221c091d249c23ae27921db
Author: Jean-Louis Monteiro <jeano...@gmail.com>
AuthorDate: Fri Feb 1 17:57:04 2019 +0100
Add JDK definition and fix some issues from master
---
ec2jdk10 | 7 +++++++
ec2jdk11 | 7 +++++++
ec2jdk6 | 4 ++++
ec2jdk7 | 4 ++++
ec2jdk8 | 4 ++++
ec2jdk9 | 7 +++++++
profiles/web/webprofile.now.properties | 9 ++++++---
.../java/org/apache/openejb/cts/DeploymentImpl.java | 1 +
.../repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.jar | Bin 263563 -> 0 bytes
.../repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.pom | 8 --------
.../tck/dbprocedures/6.0a/dbprocedures-6.0a.jar | Bin 10253 -> 0 bytes
.../tck/dbprocedures/6.0a/dbprocedures-6.0a.pom | 8 --------
.../sun/javaee/tck/javatest/6.0a/javatest-6.0a.jar | Bin 3529415 -> 0 bytes
.../sun/javaee/tck/javatest/6.0a/javatest-6.0a.pom | 8 --------
.../sun/javaee/tck/tsharness/6.0a/tsharness-6.0a.jar | Bin 173253 -> 0 bytes
.../sun/javaee/tck/tsharness/6.0a/tsharness-6.0a.pom | 8 --------
.../sun/javaee/tck/whitebox/6.0a/whitebox-6.0a.jar | Bin 143051 -> 0 bytes
.../sun/javaee/tck/whitebox/6.0a/whitebox-6.0a.pom | 8 --------
18 files changed, 40 insertions(+), 43 deletions(-)
diff --git a/ec2jdk10 b/ec2jdk10
new file mode 100644
index 0000000..40aa5d4
--- /dev/null
+++ b/ec2jdk10
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# for the runner
+source "$(dirname $(readlink -f $0))/ec2jdk7"
+
+# for the standalone tomee
+export MAVEN_OPTS="-Dtck.java.home=$HOME/jdk10 -Dtck.java.version=10
$MAVEN_OPTS"
diff --git a/ec2jdk11 b/ec2jdk11
new file mode 100644
index 0000000..f9f8948
--- /dev/null
+++ b/ec2jdk11
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# for the runner
+source "$(dirname $(readlink -f $0))/ec2jdk7"
+
+# for the standalone tomee
+export MAVEN_OPTS="-Dtck.java.home=$HOME/jdk11 -Dtck.java.version=11
$MAVEN_OPTS"
diff --git a/ec2jdk6 b/ec2jdk6
new file mode 100644
index 0000000..f12a118
--- /dev/null
+++ b/ec2jdk6
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export JAVA_HOME=$HOME/jdk6
+export PATH=$JAVA_HOME/bin:$PATH
diff --git a/ec2jdk7 b/ec2jdk7
new file mode 100644
index 0000000..2f4405e
--- /dev/null
+++ b/ec2jdk7
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export JAVA_HOME=$HOME/jdk7
+export PATH=$JAVA_HOME/bin:$PATH
diff --git a/ec2jdk8 b/ec2jdk8
new file mode 100644
index 0000000..ea629f0
--- /dev/null
+++ b/ec2jdk8
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export JAVA_HOME=$HOME/jdk8
+export PATH=$JAVA_HOME/bin:$PATH
diff --git a/ec2jdk9 b/ec2jdk9
new file mode 100644
index 0000000..a8437b3
--- /dev/null
+++ b/ec2jdk9
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# for the runner
+source "$(dirname $(readlink -f $0))/ec2jdk7"
+
+# for the standalone tomee
+export MAVEN_OPTS="-Dtck.java.home=$HOME/jdk9 -Dtck.java.version=1.9
$MAVEN_OPTS"
diff --git a/profiles/web/webprofile.now.properties
b/profiles/web/webprofile.now.properties
index 680de9b..48eefd1 100644
--- a/profiles/web/webprofile.now.properties
+++ b/profiles/web/webprofile.now.properties
@@ -1,10 +1,13 @@
project.name= webprofile-7.x
-project.version = 7.0.4-SNAPSHOT
-project.id = 71
+project.version = 7.0.4
+project.id = 704
project.jdk = jdk7
+project.container= tomee
+fire.on.submit = true
#project.cron = * 23 45
#This is the TCK repo URL
-project.scmUrl = scm:svn:https://svn.apache.org/repos/tck/tomee-tck/trunk
+project.scmUrl = scm:git:g...@github.com:apache/tomee-tck.git
+project.gitBranch = javaee6-tck
project.buildFile= runtests
include.f.javatest.log= target/logs/javatest.log
include.d.logs=.*target/(apache|openejb).*/logs/.*
diff --git a/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
b/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
index 0ef72e0..ec118a4 100644
--- a/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
+++ b/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
@@ -42,6 +42,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
+@SuppressWarnings("unchecked")
public class DeploymentImpl implements TSDeploymentInterface2 {
private static final String HEAD = "OpenEJB - ";
private static final String FILENAME = "filename";
diff --git a/src/test/repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.jar
b/src/test/repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.jar
deleted file mode 100644
index f92c22f..0000000
Binary files a/src/test/repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.jar and
/dev/null differ
diff --git a/src/test/repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.pom
b/src/test/repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.pom
deleted file mode 100644
index d43fcf9..0000000
--- a/src/test/repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.sun.javaee.tck</groupId>
- <artifactId>cts</artifactId>
- <version>6.0a</version>
-</project>
diff --git
a/src/test/repo/com/sun/javaee/tck/dbprocedures/6.0a/dbprocedures-6.0a.jar
b/src/test/repo/com/sun/javaee/tck/dbprocedures/6.0a/dbprocedures-6.0a.jar
deleted file mode 100644
index e50a7c9..0000000
Binary files
a/src/test/repo/com/sun/javaee/tck/dbprocedures/6.0a/dbprocedures-6.0a.jar and
/dev/null differ
diff --git
a/src/test/repo/com/sun/javaee/tck/dbprocedures/6.0a/dbprocedures-6.0a.pom
b/src/test/repo/com/sun/javaee/tck/dbprocedures/6.0a/dbprocedures-6.0a.pom
deleted file mode 100644
index 374d257..0000000
--- a/src/test/repo/com/sun/javaee/tck/dbprocedures/6.0a/dbprocedures-6.0a.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.sun.javaee.tck</groupId>
- <artifactId>dbprocedures</artifactId>
- <version>6.0a</version>
-</project>
diff --git a/src/test/repo/com/sun/javaee/tck/javatest/6.0a/javatest-6.0a.jar
b/src/test/repo/com/sun/javaee/tck/javatest/6.0a/javatest-6.0a.jar
deleted file mode 100644
index 338f985..0000000
Binary files a/src/test/repo/com/sun/javaee/tck/javatest/6.0a/javatest-6.0a.jar
and /dev/null differ
diff --git a/src/test/repo/com/sun/javaee/tck/javatest/6.0a/javatest-6.0a.pom
b/src/test/repo/com/sun/javaee/tck/javatest/6.0a/javatest-6.0a.pom
deleted file mode 100644
index e1005f9..0000000
--- a/src/test/repo/com/sun/javaee/tck/javatest/6.0a/javatest-6.0a.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.sun.javaee.tck</groupId>
- <artifactId>javatest</artifactId>
- <version>6.0a</version>
-</project>
diff --git a/src/test/repo/com/sun/javaee/tck/tsharness/6.0a/tsharness-6.0a.jar
b/src/test/repo/com/sun/javaee/tck/tsharness/6.0a/tsharness-6.0a.jar
deleted file mode 100644
index 810bde3..0000000
Binary files
a/src/test/repo/com/sun/javaee/tck/tsharness/6.0a/tsharness-6.0a.jar and
/dev/null differ
diff --git a/src/test/repo/com/sun/javaee/tck/tsharness/6.0a/tsharness-6.0a.pom
b/src/test/repo/com/sun/javaee/tck/tsharness/6.0a/tsharness-6.0a.pom
deleted file mode 100644
index c760d8f..0000000
--- a/src/test/repo/com/sun/javaee/tck/tsharness/6.0a/tsharness-6.0a.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.sun.javaee.tck</groupId>
- <artifactId>tsharness</artifactId>
- <version>6.0a</version>
-</project>
diff --git a/src/test/repo/com/sun/javaee/tck/whitebox/6.0a/whitebox-6.0a.jar
b/src/test/repo/com/sun/javaee/tck/whitebox/6.0a/whitebox-6.0a.jar
deleted file mode 100644
index 1e60b25..0000000
Binary files a/src/test/repo/com/sun/javaee/tck/whitebox/6.0a/whitebox-6.0a.jar
and /dev/null differ
diff --git a/src/test/repo/com/sun/javaee/tck/whitebox/6.0a/whitebox-6.0a.pom
b/src/test/repo/com/sun/javaee/tck/whitebox/6.0a/whitebox-6.0a.pom
deleted file mode 100644
index 26702a9..0000000
--- a/src/test/repo/com/sun/javaee/tck/whitebox/6.0a/whitebox-6.0a.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.sun.javaee.tck</groupId>
- <artifactId>whitebox</artifactId>
- <version>6.0a</version>
-</project>
