tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject tomee git commit: trying to ensure we build on j7 even using j8 features in some tests
Date Fri, 14 Oct 2016 09:43:31 GMT
Repository: tomee
Updated Branches:
  refs/heads/master c31477cf6 -> b95c9292c


trying to ensure we build on j7 even using j8 features in some tests


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b95c9292
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b95c9292
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b95c9292

Branch: refs/heads/master
Commit: b95c9292c00bfa9816908ab1c38abc8524847a38
Parents: c31477c
Author: rmannibucau <rmannibucau@apache.org>
Authored: Fri Oct 14 11:43:24 2016 +0200
Committer: rmannibucau <rmannibucau@apache.org>
Committed: Fri Oct 14 11:43:24 2016 +0200

----------------------------------------------------------------------
 .../org/apache/openejb/maven/plugins/TomEEEmbeddedMojoTest.java   | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/b95c9292/maven/tomee-embedded-maven-plugin/src/test/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojoTest.java
----------------------------------------------------------------------
diff --git a/maven/tomee-embedded-maven-plugin/src/test/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojoTest.java
b/maven/tomee-embedded-maven-plugin/src/test/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojoTest.java
index e7e617e..5022bd8 100644
--- a/maven/tomee-embedded-maven-plugin/src/test/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojoTest.java
+++ b/maven/tomee-embedded-maven-plugin/src/test/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojoTest.java
@@ -23,6 +23,7 @@ import org.apache.openejb.config.DeploymentFilterable;
 import org.apache.openejb.loader.IO;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.util.NetworkUtil;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -207,6 +208,8 @@ public class TomEEEmbeddedMojoTest {
 
     @Test
     public void customScript() throws Exception {
+        Assume.assumeFalse(System.getProperty("java.version").startsWith("1.7"));
+
         // we use a dynamic InputStream to be able to simulate commands without hacking System.in
         final Input input = new Input();
         final Semaphore reloaded = new Semaphore(0);


Mime
View raw message