svn commit: r1790535 - in /openwebbeans/meecrowave/trunk: meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java meecrowave-maven-plugin/src/test/java/org/apache/meecrowave/maven/MeecrowaveRunMojoTest.java

[rmannibucau]

Author: rmannibucau
Date: Fri Apr  7 11:37:45 2017
New Revision: 1790535

URL: http://svn.apache.org/viewvc?rev=1790535&view=rev
Log:
removing j9 workaround for now, waiting for final to see what we do about it

Modified:
    
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
    
openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/test/java/org/apache/meecrowave/maven/MeecrowaveRunMojoTest.java

Modified: 
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java?rev=1790535&r1=1790534&r2=1790535&view=diff
==============================================================================
--- 
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
 (original)
+++ 
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
 Fri Apr  7 11:37:45 2017
@@ -828,8 +828,9 @@ public class Meecrowave implements AutoC
         @CliOption(name = "pid-file", description = "A file path to write the 
process id if the server starts")
         private File pidFile;
 
+        @Deprecated // waiting final release to see if we really need it, got 
broken in between
         @CliOption(name = "java9-skip-workarounds", description = "Should the 
java9 workarounds be skipped, default to false if on java 9")
-        private boolean java9SkipWorkarounds;
+        private boolean java9SkipWorkarounds = true;
 
         @CliOption(name = "http", description = "HTTP port")
         private int httpPort = 8080;

Modified: 
openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/test/java/org/apache/meecrowave/maven/MeecrowaveRunMojoTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/test/java/org/apache/meecrowave/maven/MeecrowaveRunMojoTest.java?rev=1790535&r1=1790534&r2=1790535&view=diff
==============================================================================
--- 
openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/test/java/org/apache/meecrowave/maven/MeecrowaveRunMojoTest.java
 (original)
+++ 
openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/test/java/org/apache/meecrowave/maven/MeecrowaveRunMojoTest.java
 Fri Apr  7 11:37:45 2017
@@ -27,7 +27,6 @@ import org.apache.maven.plugin.testing.M
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.meecrowave.hack.Java9WorkArounds;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
@@ -48,10 +47,6 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.fail;
 
 public class MeecrowaveRunMojoTest {
-    static { // if not that eager then we can't run the test on java 9
-        Java9WorkArounds.execute();
-    }
-
     @Rule
     public final MojoRule mojo = new MojoRule();