You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/09/04 16:22:13 UTC
[3/4] tomee git commit: Removed hardcoded TomEE version from tests.
Removed hardcoded TomEE version from tests.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/84d8dd1b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/84d8dd1b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/84d8dd1b
Branch: refs/heads/master
Commit: 84d8dd1bbe272f30deaf117113d2eab302e0efa4
Parents: 0fa0703
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Tue Sep 4 16:22:28 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Sep 4 16:22:28 2018 +0100
----------------------------------------------------------------------
.../moviefun/DeployInWebAppsDirectoryTest.java | 2 +-
examples/connector-ear/pom.xml | 15 +++++++++++++++
.../moviefun/DeployInWebAppsDirectoryTest.java | 2 +-
examples/simple-ear/pom.xml | 9 +++++++++
4 files changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/84d8dd1b/examples/connector-ear/connector-sample-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
----------------------------------------------------------------------
diff --git a/examples/connector-ear/connector-sample-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java b/examples/connector-ear/connector-sample-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
index 072d925..d0f38c8 100644
--- a/examples/connector-ear/connector-sample-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
+++ b/examples/connector-ear/connector-sample-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
@@ -105,7 +105,7 @@ public class DeployInWebAppsDirectoryTest {
configuration.setGroupId("org.apache.tomee");
configuration.setArtifactId("apache-tomee");
configuration.setClassifier("plus");
- configuration.setVersion("7.0.5-SNAPSHOT");
+ configuration.setVersion(System.getProperty("tomee.version"));
// configuration.setDebug(true);
configuration.setHttpPort(-1);
http://git-wip-us.apache.org/repos/asf/tomee/blob/84d8dd1b/examples/connector-ear/pom.xml
----------------------------------------------------------------------
diff --git a/examples/connector-ear/pom.xml b/examples/connector-ear/pom.xml
index 97067b0..ca2b152 100644
--- a/examples/connector-ear/pom.xml
+++ b/examples/connector-ear/pom.xml
@@ -77,6 +77,21 @@
</plugin>
</plugins>
</pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>tomee.version</name>
+ <value>${tomee.version}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<!-- This section allows you to configure where to publish libraries for
http://git-wip-us.apache.org/repos/asf/tomee/blob/84d8dd1b/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
----------------------------------------------------------------------
diff --git a/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java b/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
index 1d5658e..7dd38e3 100644
--- a/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
+++ b/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
@@ -46,7 +46,7 @@ public class DeployInWebAppsDirectoryTest {
configuration.setGroupId("org.apache.tomee");
configuration.setArtifactId("apache-tomee");
configuration.setClassifier("plus");
- configuration.setVersion("7.0.5-SNAPSHOT");
+ configuration.setVersion(System.getProperty("tomee.version"));
configuration.setHttpPort(-1);
final RemoteTomEEContainer container = new RemoteTomEEContainer();
http://git-wip-us.apache.org/repos/asf/tomee/blob/84d8dd1b/examples/simple-ear/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-ear/pom.xml b/examples/simple-ear/pom.xml
index 6aeae89..bcd0596 100644
--- a/examples/simple-ear/pom.xml
+++ b/examples/simple-ear/pom.xml
@@ -37,6 +37,7 @@
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <tomee.version>8.0.0-SNAPSHOT</tomee.version>
</properties>
<repositories>
<repository>
@@ -62,6 +63,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>tomee.version</name>
+ <value>${tomee.version}</value>
+ </property>
+ </systemProperties>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>