Author: rmannibucau
Date: Tue Jun 6 21:26:26 2017
New Revision: 1797827
URL: http://svn.apache.org/viewvc?rev=1797827&view=rev
Log:
MEECROWAVE-38 dropping java 9 workarounds - no more accurate with recent j9
releases
Removed:
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/hack/
Modified:
openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveConfiguration.java
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveExtension.java
openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveTask.java
openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/java/org/apache/meecrowave/maven/MeecrowaveRunMojo.java
Modified:
openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveConfiguration.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveConfiguration.java?rev=1797827&r1=1797826&r2=1797827&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveConfiguration.java
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveConfiguration.java
Tue Jun 6 21:26:26 2017
@@ -94,7 +94,6 @@ public class MeecrowaveConfiguration imp
private String jsonbBinaryStrategy;
private String jsonbNamingStrategy;
private String jsonbOrderStrategy;
- private boolean java9SkipWorkarounds = false;
private String scanningIncludes;
private String scanningExcludes;
private String scanningPackageIncludes;
@@ -695,14 +694,6 @@ public class MeecrowaveConfiguration imp
this.jsonbOrderStrategy = jsonbOrderStrategy;
}
- public boolean isJava9SkipWorkarounds() {
- return java9SkipWorkarounds;
- }
-
- public void setJava9SkipWorkarounds(final boolean java9SkipWorkarounds) {
- this.java9SkipWorkarounds = java9SkipWorkarounds;
- }
-
public String getScanningPackageIncludes() {
return scanningPackageIncludes;
}
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=1797827&r1=1797826&r2=1797827&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
Tue Jun 6 21:26:26 2017
@@ -39,7 +39,6 @@ import org.apache.commons.lang3.text.Str
import org.apache.coyote.http2.Http2Protocol;
import org.apache.johnzon.core.BufferStrategy;
import org.apache.meecrowave.cxf.CxfCdiAutoSetup;
-import org.apache.meecrowave.hack.Java9WorkArounds;
import org.apache.meecrowave.io.IO;
import org.apache.meecrowave.logging.jul.Log4j2Logger;
import org.apache.meecrowave.logging.openwebbeans.Log4j2LoggerFactory;
@@ -134,9 +133,6 @@ public class Meecrowave implements AutoC
public Meecrowave(final Builder builder) {
this.configuration = builder;
this.ownedTempDir = new File(configuration.tempDir, "meecrowave_" +
System.nanoTime());
- if (!builder.isJava9SkipWorkarounds()) {
- Java9WorkArounds.execute();
- }
}
public Builder getConfiguration() {
@@ -835,10 +831,6 @@ 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 = true;
-
@CliOption(name = "watcher-bouncing", description = "Activate
redeployment on directories update using this bouncing.")
private int watcherBouncing = 500;
@@ -1145,14 +1137,6 @@ public class Meecrowave implements AutoC
this.scanningExcludes = scanningExcludes;
}
- public boolean isJava9SkipWorkarounds() {
- return java9SkipWorkarounds;
- }
-
- public void setJava9SkipWorkarounds(final boolean
java9SkipWorkarounds) {
- this.java9SkipWorkarounds = java9SkipWorkarounds;
- }
-
public String getJsonpBufferStrategy() {
return jsonpBufferStrategy;
}
Modified:
openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveExtension.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveExtension.java?rev=1797827&r1=1797826&r2=1797827&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveExtension.java
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveExtension.java
Tue Jun 6 21:26:26 2017
@@ -85,7 +85,6 @@ public class MeecrowaveExtension {
private String jsonbBinaryStrategy;
private String jsonbNamingStrategy;
private String jsonbOrderStrategy;
- private boolean java9SkipWorkarounds = false;
private String scanningIncludes;
private String scanningExcludes;
private String scanningPackageIncludes;
@@ -104,14 +103,6 @@ public class MeecrowaveExtension {
this.meecrowaveProperties = meecrowaveProperties;
}
- public boolean isJava9SkipWorkarounds() {
- return java9SkipWorkarounds;
- }
-
- public void setJava9SkipWorkarounds(final boolean java9SkipWorkarounds) {
- this.java9SkipWorkarounds = java9SkipWorkarounds;
- }
-
public String getJsonpBufferStrategy() {
return jsonpBufferStrategy;
}
Modified:
openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveTask.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveTask.java?rev=1797827&r1=1797826&r2=1797827&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveTask.java
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveTask.java
Tue Jun 6 21:26:26 2017
@@ -310,10 +310,6 @@ public class MeecrowaveTask extends Defa
@Input
@Optional
- private boolean java9SkipWorkarounds = false;
-
- @Input
- @Optional
private String scanningIncludes;
@Input
@@ -981,14 +977,6 @@ public class MeecrowaveTask extends Defa
this.useLog4j2JulLogManager = useLog4j2JulLogManager;
}
- public boolean isJava9SkipWorkarounds() {
- return java9SkipWorkarounds;
- }
-
- public void setJava9SkipWorkarounds(final boolean java9SkipWorkarounds) {
- this.java9SkipWorkarounds = java9SkipWorkarounds;
- }
-
public String getScanningIncludes() {
return scanningIncludes;
}
Modified:
openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/java/org/apache/meecrowave/maven/MeecrowaveRunMojo.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/java/org/apache/meecrowave/maven/MeecrowaveRunMojo.java?rev=1797827&r1=1797826&r2=1797827&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/java/org/apache/meecrowave/maven/MeecrowaveRunMojo.java
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/java/org/apache/meecrowave/maven/MeecrowaveRunMojo.java
Tue Jun 6 21:26:26 2017
@@ -106,9 +106,6 @@ public class MeecrowaveRunMojo extends A
@Parameter(property = "meecrowave.tomcatAutoSetup", defaultValue = "true")
private boolean tomcatAutoSetup;
- @Parameter(property = "meecrowave.java9SkipWorkarounds")
- private boolean java9SkipWorkarounds;
-
@Parameter(property = "meecrowave.skipHttp")
private boolean skipHttp;
