diff --git a/manager/base/pom.xml b/manager/base/pom.xml
index 9f29bd0d266..909d02088d8 100644
--- a/manager/base/pom.xml
+++ b/manager/base/pom.xml
@@ -35,64 +35,6 @@
WildFly Elytron - Security Manager
WildFly Security Security Manager
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.7.0-jboss-1
-
-
- default-compile
- compile
-
- compile
-
-
- 8
- ${project.build.directory}
- ${project.compileSourceRoots}
- ${project.build.outputDirectory}
-
- ${project.build.directory}/jdk-misc.jar
-
-
-
-
- compile-java9
- compile
-
- compile
-
-
- 9
- ${project.build.directory}
- ${project.basedir}/src/main/java9
- ${project.build.directory}/classes/META-INF/versions/9
-
- ${project.build.outputDirectory}
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- ${version.jar.plugin}
-
-
-
- true
- ${project.version}
- ${project.artifactId}
-
-
-
-
-
-
-
org.wildfly.security
diff --git a/manager/base/src/main/java/org/wildfly/security/manager/JDKSpecific.java b/manager/base/src/main/java/org/wildfly/security/manager/JDKSpecific.java
index ed18e4960e4..6f2f9cce7b3 100644
--- a/manager/base/src/main/java/org/wildfly/security/manager/JDKSpecific.java
+++ b/manager/base/src/main/java/org/wildfly/security/manager/JDKSpecific.java
@@ -17,42 +17,43 @@
*/
package org.wildfly.security.manager;
-import sun.reflect.Reflection;
+import static java.security.AccessController.doPrivileged;
+
+import java.lang.StackWalker.Option;
+import java.security.PrivilegedAction;
+import java.util.List;
+import java.util.stream.Collectors;
/**
- * JDK-specific classes which are replaced for different JDK major versions. This class is for JDK 8.
+ * JDK-specific classes which are replaced for different JDK major versions. This class is for JDK 9.
* @author Justin Cook
*/
final class JDKSpecific {
- private static boolean active;
- private static int offset;
-
- static {
-
- boolean active = false;
- int offset = 0;
- try {
- // JDK-8014925 - An additional Reflection call may be on the call stack so check the offset needed.
- active = Reflection.getCallerClass(1) == WildFlySecurityManager.class || Reflection.getCallerClass(2) == WildFlySecurityManager.class;
- offset = Reflection.getCallerClass(1) == Reflection.class ? 2 : 1;
- } catch (Throwable ignored) {}
-
- JDKSpecific.active = active;
- // JDKSpecific.getCallerClass will also add 1 to the stack.
- JDKSpecific.offset = offset + 1;
+ /*
+ * Using StackWalker the OFFSET is the minimum number of StackFrames, the first will always be
+ * JDKSpecific,getCallerClass(int), the second will always be the caller of this class.
+ */
+ private static final int OFFSET = 2;
+
+ public static Class> getCallerClass(int n){
+ // Although we know WildFlySecurityManager is making the call it may not be the actual SecurityManager
+ // so we need to use doPrivileged instead of a doUnchecked unless we can be sure checking has been switched off.
+ final StackWalker stackWalker = WildFlySecurityManager.isChecking() ?
+ doPrivileged((PrivilegedAction)JDKSpecific::getStackWalker) : getStackWalker();
+
+ List frames = stackWalker.walk(s ->
+ s.limit(n + OFFSET).collect(Collectors.toList())
+ );
+ return frames.get(frames.size() - 1).getDeclaringClass();
}
- public static Class> getCallerClass(int n) {
- if (active) {
- return Reflection.getCallerClass(n + offset);
- } else {
- throw new IllegalStateException("sun.reflect.Reflect.getCallerClass(int) not available.");
- }
+ private static StackWalker getStackWalker() {
+ return StackWalker.getInstance(Option.RETAIN_CLASS_REFERENCE);
}
public static boolean usingStackWalker() {
- return false;
+ return true;
}
}
diff --git a/manager/base/src/main/java9/org/wildfly/security/manager/JDKSpecific.java b/manager/base/src/main/java9/org/wildfly/security/manager/JDKSpecific.java
deleted file mode 100644
index 6f2f9cce7b3..00000000000
--- a/manager/base/src/main/java9/org/wildfly/security/manager/JDKSpecific.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Copyright 2018 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.wildfly.security.manager;
-
-import static java.security.AccessController.doPrivileged;
-
-import java.lang.StackWalker.Option;
-import java.security.PrivilegedAction;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * JDK-specific classes which are replaced for different JDK major versions. This class is for JDK 9.
- * @author Justin Cook
- */
-final class JDKSpecific {
-
- /*
- * Using StackWalker the OFFSET is the minimum number of StackFrames, the first will always be
- * JDKSpecific,getCallerClass(int), the second will always be the caller of this class.
- */
- private static final int OFFSET = 2;
-
- public static Class> getCallerClass(int n){
- // Although we know WildFlySecurityManager is making the call it may not be the actual SecurityManager
- // so we need to use doPrivileged instead of a doUnchecked unless we can be sure checking has been switched off.
- final StackWalker stackWalker = WildFlySecurityManager.isChecking() ?
- doPrivileged((PrivilegedAction)JDKSpecific::getStackWalker) : getStackWalker();
-
- List frames = stackWalker.walk(s ->
- s.limit(n + OFFSET).collect(Collectors.toList())
- );
- return frames.get(frames.size() - 1).getDeclaringClass();
- }
-
- private static StackWalker getStackWalker() {
- return StackWalker.getInstance(Option.RETAIN_CLASS_REFERENCE);
- }
-
- public static boolean usingStackWalker() {
- return true;
- }
-
-}
diff --git a/pom.xml b/pom.xml
index 19b82ac1e99..e99a90c7478 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,9 @@
- 11
+ 11
+ 11
+ 11
2.15.4
${version.com.fasterxml.jackson}
1.6.0
@@ -102,10 +104,6 @@
INFO
false
-
-
-
-
@@ -140,7 +138,6 @@
compile
- 8
${project.build.directory}
${project.compileSourceRoots}
${project.build.outputDirectory}
@@ -194,17 +191,6 @@
false
${project.build.directory}/surefire-reports
-
-
- default-test
-
- ${project.build.directory}/classes/META-INF/versions/9
-
- ${project.build.directory}/classes
-
-
-
-
@@ -238,7 +224,7 @@
true
false
- -javaagent:${settings.localRepository}/org/jmockit/jmockit/${version.jmockit}/jmockit-${version.jmockit}.jar ${modular.jdk.args} ${modular.jdk.props}
+ -javaagent:${settings.localRepository}/org/jmockit/jmockit/${version.jmockit}/jmockit-${version.jmockit}.jar
@@ -295,7 +281,6 @@
${project.basedir}/json-util/src/main/java/;
${project.basedir}/keystore/src/main/java/;
${project.basedir}/manager/action/src/main/java/;
- ${project.basedir}/manager/base/src/main/java9/;
${project.basedir}/manager/base/src/main/java/;
${project.basedir}/mechanism/base/src/main/java/;
${project.basedir}/mechanism/digest/src/main/java/;
@@ -1240,21 +1225,6 @@
-
- modularizedJdk
-
- [9,)
-
-
-
- --add-modules java.sql --illegal-access=permit
-
- -Djdk.attach.allowAttachSelf=true
-
- 2.19.1
-
-
-
skip-default-tests
@@ -1271,78 +1241,6 @@
-
- java8-test-profile
-
-
- java8.home
-
-
-
-
-
-
-
-
-
- maven-surefire-plugin
-
-
- java8-test
- test
-
- test
-
-
- ${project.build.directory}/surefire-reports/java8
- ${java8.home}/bin/java
-
- ${java8.home}/lib/tools.jar
-
-
-
-
-
-
-
-
-
- java9-test-profile
-
-
- java9.home
-
-
-
-
-
-
-
-
-
- maven-surefire-plugin
-
-
- java9-test
- test
-
- test
-
-
- ${project.build.directory}/surefire-reports/java9
- ${java9.home}/bin/java
- ${project.build.directory}/classes/META-INF/versions/9
-
- ${project.build.outputDirectory}
- ${java9.home}/lib/tools.jar
-
-
-
-
-
-
-
-
diff --git a/ssl/pom.xml b/ssl/pom.xml
index f811ab4ae5b..2ba5446453d 100644
--- a/ssl/pom.xml
+++ b/ssl/pom.xml
@@ -34,64 +34,6 @@
WildFly Elytron - SSL
WildFly Security SSL
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.7.0-jboss-1
-
-
- default-compile
- compile
-
- compile
-
-
- 8
- ${project.build.directory}
- ${project.compileSourceRoots}
- ${project.build.outputDirectory}
-
- ${project.build.directory}/jdk-misc.jar
-
-
-
-
- compile-java9
- compile
-
- compile
-
-
- 9
- ${project.build.directory}
- ${project.basedir}/src/main/java9
- ${project.build.directory}/classes/META-INF/versions/9
-
- ${project.build.outputDirectory}
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- ${version.jar.plugin}
-
-
-
- true
- ${project.version}
- ${project.artifactId}
-
-
-
-
-
-
-
org.wildfly.security
diff --git a/ssl/src/main/java/org/wildfly/security/ssl/JDKSpecific.java b/ssl/src/main/java/org/wildfly/security/ssl/JDKSpecific.java
index b3b0ababdb0..d504b12de6d 100644
--- a/ssl/src/main/java/org/wildfly/security/ssl/JDKSpecific.java
+++ b/ssl/src/main/java/org/wildfly/security/ssl/JDKSpecific.java
@@ -18,10 +18,6 @@
package org.wildfly.security.ssl;
-import static org.wildfly.security.ssl.ElytronMessages.tls;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.util.List;
import java.util.function.BiFunction;
@@ -29,91 +25,27 @@
import javax.net.ssl.SSLParameters;
import javax.net.ssl.SSLSocket;
-final class JDKSpecific {
-
- // SSLEngine Methods
-
- private static final Method SSLENGINE_GET_APPLICATION_PROTOCOL = getMethodOrNull(SSLEngine.class, "getApplicationProtocol");
- private static final Method SSLENGINE_GET_HANDSHAKE_APPLICATION_PROTOCOL = getMethodOrNull(SSLEngine.class, "getHandshakeApplicationProtocol");
- private static final Method SSLENGINE_SET_HANDSHAKE_APPLICATION_PROTOCOL_SELECTOR = getMethodOrNull(SSLEngine.class, "setHandshakeApplicationProtocolSelector", BiFunction.class);
- private static final Method SSLENGINE_GET_HANDSHAKE_APPLICATION_PROTOCOL_SELECTOR = getMethodOrNull(SSLEngine.class, "getHandshakeApplicationProtocolSelector");
-
- // SSLParameters Methods
-
- private static final Method SSLPARAMETERS_GET_APPLICATION_PROTOCOLS = getMethodOrNull(SSLParameters.class, "getApplicationProtocols");
- private static final Method SSLPARAMETERS_SET_APPLICATION_PROTOCOLS = getMethodOrNull(SSLParameters.class, "setApplicationProtocols", String[].class);
-
- // SSLSocket Methods
-
- private static final Method SSLSOCKET_GET_APPLICATION_PROTOCOL = getMethodOrNull(SSLSocket.class, "getApplicationProtocol");
- private static final Method SSLSOCKET_GET_HANDSHAKE_APPLICATION_PROTOCOL = getMethodOrNull(SSLSocket.class, "getHandshakeApplicationProtocol");
- private static final Method SSLSOCKET_SET_HANDSHAKE_APPLICATION_PROTOCOL_SELECTOR = getMethodOrNull(SSLSocket.class, "setHandshakeApplicationProtocolSelector", BiFunction.class);
- private static final Method SSLSOCKET_GET_HANDSHAKE_APPLICATION_PROTOCOL_SELECTOR = getMethodOrNull(SSLSocket.class, "getHandshakeApplicationProtocolSelector");
-
- private static Method getMethodOrNull(Class clazz, String methodName, Class... parameterTypes) {
- try {
- return clazz.getMethod(methodName, parameterTypes);
- } catch (Exception e) {
- if (tls.isTraceEnabled()) {
- tls.tracef(e, "Unable to getMethod %s on class %s", methodName, clazz.getName());
- } else if (tls.isDebugEnabled()) {
- tls.debugf("Unable to getMethod %s on class %s", methodName, clazz.getName());
- }
- return null;
- }
- }
+final class JDKSpecific {
/*
* SSLEngine
*/
static String getApplicationProtocol(SSLEngine sslEngine) {
- if (SSLENGINE_GET_APPLICATION_PROTOCOL != null) {
- try {
- return (String) SSLENGINE_GET_APPLICATION_PROTOCOL.invoke(sslEngine);
- } catch (IllegalAccessException | InvocationTargetException e) {
- throw new UnsupportedOperationException(e);
- }
- }
-
- throw new UnsupportedOperationException();
+ return sslEngine.getApplicationProtocol();
}
static String getHandshakeApplicationProtocol(SSLEngine sslEngine) {
- if (SSLENGINE_GET_HANDSHAKE_APPLICATION_PROTOCOL != null) {
- try {
- return (String) SSLENGINE_GET_HANDSHAKE_APPLICATION_PROTOCOL.invoke(sslEngine);
- } catch (IllegalAccessException | InvocationTargetException e) {
- throw new UnsupportedOperationException(e);
- }
- }
-
- throw new UnsupportedOperationException();
+ return sslEngine.getHandshakeApplicationProtocol();
}
static void setHandshakeApplicationProtocolSelector(SSLEngine sslEngine, BiFunction, String> selector) {
- if (SSLENGINE_SET_HANDSHAKE_APPLICATION_PROTOCOL_SELECTOR != null) {
- try {
- SSLENGINE_SET_HANDSHAKE_APPLICATION_PROTOCOL_SELECTOR.invoke(sslEngine, selector);
- } catch (IllegalAccessException | InvocationTargetException e) {
- throw new UnsupportedOperationException(e);
- }
- }
-
- throw new UnsupportedOperationException();
+ sslEngine.setHandshakeApplicationProtocolSelector(selector);
}
static BiFunction, String> getHandshakeApplicationProtocolSelector(SSLEngine sslEngine) {
- if (SSLENGINE_GET_HANDSHAKE_APPLICATION_PROTOCOL_SELECTOR != null) {
- try {
- return (BiFunction, String>) SSLENGINE_GET_HANDSHAKE_APPLICATION_PROTOCOL_SELECTOR.invoke(sslEngine);
- } catch (IllegalAccessException | InvocationTargetException e) {
- throw new UnsupportedOperationException(e);
- }
- }
-
- throw new UnsupportedOperationException();
+ return sslEngine.getHandshakeApplicationProtocolSelector();
}
/*
@@ -121,31 +53,15 @@ static BiFunction, String> getHandshakeApplicationProtoc
*/
static String[] getApplicationProtocols(SSLParameters parameters) {
- if (SSLPARAMETERS_GET_APPLICATION_PROTOCOLS != null) {
- try {
- return (String[]) SSLPARAMETERS_GET_APPLICATION_PROTOCOLS.invoke(parameters);
- } catch (IllegalAccessException | InvocationTargetException e) {
- throw new UnsupportedOperationException(e);
- }
- }
-
- throw new UnsupportedOperationException();
+ return parameters.getApplicationProtocols();
}
static void setApplicationProtocols(SSLParameters parameters, String[] protocols) {
- if (SSLPARAMETERS_SET_APPLICATION_PROTOCOLS != null) {
- try {
- SSLPARAMETERS_SET_APPLICATION_PROTOCOLS.invoke(parameters, (Object) protocols);
- } catch (IllegalAccessException | InvocationTargetException e) {
- throw new UnsupportedOperationException(e);
- }
- }
-
- throw new UnsupportedOperationException();
+ parameters.setApplicationProtocols(protocols);
}
/**
- * Copies SSLParameters' fields available in java 8.
+ * Copies SSLParameters' fields available in Java 9.
*
* @param original SSLParameters that should be applied to new instance
* @return instance of SSLParameters with fields copied from original
@@ -164,13 +80,10 @@ static SSLParameters setSSLParameters(SSLParameters original) {
} else if (original.getNeedClientAuth()) {
params.setNeedClientAuth(original.getNeedClientAuth());
}
-
- try {
- if (SSLPARAMETERS_GET_APPLICATION_PROTOCOLS != null && SSLPARAMETERS_SET_APPLICATION_PROTOCOLS != null) {
- setApplicationProtocols(params, getApplicationProtocols(original));
- }
- } catch (Exception ignored) {}
-
+ // set java9 parameters
+ params.setEnableRetransmissions(original.getEnableRetransmissions());
+ params.setApplicationProtocols(original.getApplicationProtocols());
+ params.setMaximumPacketSize(original.getMaximumPacketSize());
return params;
}
@@ -179,51 +92,18 @@ static SSLParameters setSSLParameters(SSLParameters original) {
*/
static String getApplicationProtocol(SSLSocket socket) {
- if (SSLSOCKET_GET_APPLICATION_PROTOCOL != null) {
- try {
- return (String) SSLSOCKET_GET_APPLICATION_PROTOCOL.invoke(socket);
- } catch (IllegalAccessException | InvocationTargetException e) {
- throw new UnsupportedOperationException(e);
- }
- }
-
- throw new UnsupportedOperationException();
+ return socket.getApplicationProtocol();
}
static String getHandshakeApplicationProtocol(SSLSocket socket) {
- if (SSLSOCKET_GET_HANDSHAKE_APPLICATION_PROTOCOL != null) {
- try {
- return (String) SSLSOCKET_GET_HANDSHAKE_APPLICATION_PROTOCOL.invoke(socket);
- } catch (IllegalAccessException | InvocationTargetException e) {
- throw new UnsupportedOperationException(e);
- }
- }
-
- throw new UnsupportedOperationException();
+ return socket.getHandshakeApplicationProtocol();
}
static void setHandshakeApplicationProtocolSelector(SSLSocket socket, BiFunction, String> selector) {
- if (SSLSOCKET_SET_HANDSHAKE_APPLICATION_PROTOCOL_SELECTOR != null) {
- try {
- SSLSOCKET_SET_HANDSHAKE_APPLICATION_PROTOCOL_SELECTOR.invoke(socket, selector);
- } catch (IllegalAccessException | InvocationTargetException e) {
- throw new UnsupportedOperationException(e);
- }
- }
-
- throw new UnsupportedOperationException();
+ socket.setHandshakeApplicationProtocolSelector(selector);
}
static BiFunction, String> getHandshakeApplicationProtocolSelector(SSLSocket socket) {
- if (SSLSOCKET_GET_HANDSHAKE_APPLICATION_PROTOCOL_SELECTOR != null) {
- try {
- return (BiFunction, String>) SSLSOCKET_GET_HANDSHAKE_APPLICATION_PROTOCOL_SELECTOR.invoke(socket);
- } catch (IllegalAccessException | InvocationTargetException e) {
- throw new UnsupportedOperationException(e);
- }
- }
-
- throw new UnsupportedOperationException();
+ return socket.getHandshakeApplicationProtocolSelector();
}
-
}
diff --git a/ssl/src/main/java9/org/wildfly/security/ssl/JDKSpecific.java b/ssl/src/main/java9/org/wildfly/security/ssl/JDKSpecific.java
deleted file mode 100644
index 1dec7a9b650..00000000000
--- a/ssl/src/main/java9/org/wildfly/security/ssl/JDKSpecific.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2020 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.wildfly.security.ssl;
-
-import java.util.List;
-import java.util.function.BiFunction;
-
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLParameters;
-import javax.net.ssl.SSLSocket;
-
-
-final class JDKSpecific {
-
- /*
- * SSLEngine
- */
-
- static String getApplicationProtocol(SSLEngine sslEngine) {
- return sslEngine.getApplicationProtocol();
- }
-
- static String getHandshakeApplicationProtocol(SSLEngine sslEngine) {
- return sslEngine.getHandshakeApplicationProtocol();
- }
-
- static void setHandshakeApplicationProtocolSelector(SSLEngine sslEngine, BiFunction, String> selector) {
- sslEngine.setHandshakeApplicationProtocolSelector(selector);
- }
-
- static BiFunction, String> getHandshakeApplicationProtocolSelector(SSLEngine sslEngine) {
- return sslEngine.getHandshakeApplicationProtocolSelector();
- }
-
- /*
- * SSLParameters
- */
-
- static String[] getApplicationProtocols(SSLParameters parameters) {
- return parameters.getApplicationProtocols();
- }
-
- static void setApplicationProtocols(SSLParameters parameters, String[] protocols) {
- parameters.setApplicationProtocols(protocols);
- }
-
- /**
- * Copies SSLParameters' fields available in java 8 and java 9.
- *
- * @param original SSLParameters that should be applied to new instance
- * @return instance of SSLParameters with fields copied from original
- */
- static SSLParameters setSSLParameters(SSLParameters original) {
- SSLParameters params = new SSLParameters();
- params.setProtocols(original.getProtocols());
- params.setCipherSuites(original.getCipherSuites());
- params.setUseCipherSuitesOrder(original.getUseCipherSuitesOrder());
- params.setServerNames(original.getServerNames());
- params.setSNIMatchers(original.getSNIMatchers());
- params.setAlgorithmConstraints(original.getAlgorithmConstraints());
- params.setEndpointIdentificationAlgorithm(original.getEndpointIdentificationAlgorithm());
- if (original.getWantClientAuth()) {
- params.setWantClientAuth(original.getWantClientAuth());
- } else if (original.getNeedClientAuth()) {
- params.setNeedClientAuth(original.getNeedClientAuth());
- }
- // set java9 parameters
- params.setEnableRetransmissions(original.getEnableRetransmissions());
- params.setApplicationProtocols(original.getApplicationProtocols());
- params.setMaximumPacketSize(original.getMaximumPacketSize());
- return params;
- }
-
- /*
- * SSLSocket
- */
-
- static String getApplicationProtocol(SSLSocket socket) {
- return socket.getApplicationProtocol();
- }
-
- static String getHandshakeApplicationProtocol(SSLSocket socket) {
- return socket.getHandshakeApplicationProtocol();
- }
-
- static void setHandshakeApplicationProtocolSelector(SSLSocket socket, BiFunction, String> selector) {
- socket.setHandshakeApplicationProtocolSelector(selector);
- }
-
- static BiFunction, String> getHandshakeApplicationProtocolSelector(SSLSocket socket) {
- return socket.getHandshakeApplicationProtocolSelector();
- }
-}
diff --git a/tests/base/pom.xml b/tests/base/pom.xml
index 0570237d5af..7a18d677e56 100644
--- a/tests/base/pom.xml
+++ b/tests/base/pom.xml
@@ -183,46 +183,6 @@
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.7.0-jboss-1
-
-
- default-compile
- compile
-
- compile
-
-
- 8
- ${project.build.directory}
- ${project.compileSourceRoots}
- ${project.build.outputDirectory}
-
- ${project.build.directory}/jdk-misc.jar
-
-
-
-
- compile-java9
- compile
-
- compile
-
-
- 9
- ${project.build.directory}
- ${project.basedir}/src/main/java9
- ${project.build.directory}/classes/META-INF/versions/9
-
- ${project.build.outputDirectory}
-
-
-
-
-
org.apache.maven.plugins
maven-jar-plugin
@@ -230,7 +190,6 @@
- true
${project.version}
${project.artifactId}
@@ -244,6 +203,7 @@
+
org.apache.maven.plugins
@@ -266,17 +226,6 @@
false
${project.build.directory}/surefire-reports
-
-
- default-test
-
- ${project.build.directory}/classes/META-INF/versions/9
-
- ${project.build.directory}/classes
-
-
-
-
@@ -303,7 +252,7 @@
true
false
- -javaagent:${settings.localRepository}/org/jmockit/jmockit/${version.jmockit}/jmockit-${version.jmockit}.jar ${modular.jdk.args} ${modular.jdk.props}
+ -javaagent:${settings.localRepository}/org/jmockit/jmockit/${version.jmockit}/jmockit-${version.jmockit}.jar
@@ -792,20 +741,6 @@
-
- modularizedJdk
-
- [9,)
-
-
-
- --add-modules java.sql --illegal-access=permit
-
- -Djdk.attach.allowAttachSelf=true
-
- 2.19.1
-
-
compatibilityCheck
diff --git a/tool/pom.xml b/tool/pom.xml
index 602edf0acfe..02da04a1f7d 100644
--- a/tool/pom.xml
+++ b/tool/pom.xml
@@ -121,9 +121,6 @@
org.wildfly.security.tool.ElytronTool
-
- true
-
${project.artifactId}-shaded-${project.version}
@@ -154,7 +151,6 @@
true
false
- ${modular.jdk.args}
@@ -319,40 +315,6 @@
-
-
- modularizedJdk
-
- 9
-
-
-
- --add-modules java.corba,java.sql --add-exports java.security.sasl/com.sun.security.sasl.digest=ALL-UNNAMED
- --add-exports java.security.sasl/com.sun.security.sasl=ALL-UNNAMED --add-exports jdk.unsupported/sun.reflect=ALL-UNNAMED
- --add-exports java.base/sun.security.x509=ALL-UNNAMED
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- ${version.compiler.plugin}
-
-
- true
-
- -J--add-modules
- -Jjava.annotations.common
-
-
-
-
-
-
-
-
-
public-jboss
diff --git a/wildfly-elytron/pom.xml b/wildfly-elytron/pom.xml
index 6973cb1cc06..125120adaac 100644
--- a/wildfly-elytron/pom.xml
+++ b/wildfly-elytron/pom.xml
@@ -103,59 +103,6 @@
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.7.0-jboss-1
-
-
- default-compile
- compile
-
- compile
-
-
- 8
- ${project.build.directory}
- ${project.compileSourceRoots}
- ${project.build.outputDirectory}
-
- ${project.build.directory}/jdk-misc.jar
-
-
-
-
- compile-java9
- compile
-
- compile
-
-
- 9
- ${project.build.directory}
- ${project.basedir}/src/main/java9
- ${project.build.directory}/classes/META-INF/versions/9
-
- ${project.build.outputDirectory}
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- ${version.jar.plugin}
-
-
-
- true
- ${project.version}
- ${project.artifactId}
-
-
-
-
org.apache.maven.plugins
maven-shade-plugin
@@ -519,21 +466,6 @@
-
- modularizedJdk
-
- [9,)
-
-
-
- --add-modules java.sql --illegal-access=permit
-
- -Djdk.attach.allowAttachSelf=true
-
- 2.19.1
-
-
-
compatibilityCheck