Merge pull request #483 from ctomc/jdk9

Fixes to make it work on latest JDK9 builds
undertow-io · Feb 9, 2017 · e57fc34 · e57fc34
2 parents 1766107 + e122855
commit e57fc34
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 34 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -146,13 +146,6 @@
             <version>${version.org.wildfly.openssl}</version>
             <scope>test</scope>
         </dependency>
-
-        <!-- Needed for javax.annotation.Generated on JDK9-->
-        <dependency>
-            <groupId>org.jboss.spec.javax.annotation</groupId>
-            <artifactId>jboss-annotations-api_1.2_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
 

diff --git a/core/src/main/java/io/undertow/security/impl/SingleSignOnAuthenticationMechanism.java b/core/src/main/java/io/undertow/security/impl/SingleSignOnAuthenticationMechanism.java
@@ -88,7 +88,7 @@ public AuthenticationMechanismOutcome authenticate(HttpServerExchange exchange,
         if (cookie != null) {
             final String ssoId = cookie.getValue();
             log.tracef("Found SSO cookie %s", ssoId);
-            try (final SingleSignOn sso = this.singleSignOnManager.findSingleSignOn(ssoId)) {
+            try (SingleSignOn sso = this.singleSignOnManager.findSingleSignOn(ssoId)) {
                 if (sso != null) {
                     if(log.isTraceEnabled()) {
                         log.tracef("SSO session with ID: %s found.", ssoId);

diff --git a/parser-generator/src/main/java/io/undertow/annotationprocessor/AbstractParserGenerator.java b/parser-generator/src/main/java/io/undertow/annotationprocessor/AbstractParserGenerator.java
@@ -114,7 +114,7 @@ public byte[] createTokenizer(final String[] httpVerbs, String[] httpVersions, S
         return file.toBytecode();
     }
 
-    protected abstract void createStateMachines(final String[] httpVerbs, final String[] httpVersions, final String[] standardHeaders, final String className, final ClassFile file, final ClassMethod sctor, final AtomicInteger fieldCounter);
+    protected abstract void createStateMachines(String[] httpVerbs, String[] httpVersions, String[] standardHeaders, String className, ClassFile file, ClassMethod sctor, AtomicInteger fieldCounter);
 
     protected void createStateMachine(final String[] originalItems, final String className, final ClassFile file, final ClassMethod sctor, final AtomicInteger fieldCounter, final String methodName, final CustomStateMachine stateMachine) {
 
@@ -732,9 +732,9 @@ public interface CustomStateMachine {
 
         boolean isHeader();
 
-        void handleStateMachineMatchedToken(final CodeAttribute c);
+        void handleStateMachineMatchedToken(CodeAttribute c);
 
-        void handleOtherToken(final CodeAttribute c);
+        void handleOtherToken(CodeAttribute c);
 
         void updateParseState(CodeAttribute c);
 

diff --git a/...enerator/src/main/java/io/undertow/annotationprocessor/HttpParserAnnotationProcessor.java b/...enerator/src/main/java/io/undertow/annotationprocessor/HttpParserAnnotationProcessor.java
@@ -40,7 +40,7 @@
 @SupportedAnnotationTypes("io.undertow.annotationprocessor.HttpParserConfig")
 @SupportedOptions({
 })
-@SupportedSourceVersion(SourceVersion.RELEASE_7)
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
 public class HttpParserAnnotationProcessor extends AbstractProcessor {
 
     private Filer filer;

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>21</version>
+        <version>22</version>
     </parent>
 
     <groupId>io.undertow</groupId>
@@ -64,7 +64,7 @@
         <version.easymock>3.2</version.easymock>
         <version.io.undertow.jastow>2.0.0.Beta2</version.io.undertow.jastow>
         <version.junit>4.12</version.junit>
-        <version.netty>4.1.4.Final</version.netty>
+        <version.netty>4.1.8.Final</version.netty>
         <version.org.apache.directory.server>2.0.0-M15</version.org.apache.directory.server>
         <version.org.apache.httpmime>4.2.6</version.org.apache.httpmime>
         <version.org.apache.httpcomponents>4.2.6</version.org.apache.httpcomponents>
@@ -90,8 +90,7 @@
         <!-- Checkstyle configuration -->
         <linkXRef>false</linkXRef>
         <version.io.undertow.build.checkstyle-config>1.0.1.Final</version.io.undertow.build.checkstyle-config>
-        <version.org.codehaus.mojo.findbugs-maven-plugin>2.5.5</version.org.codehaus.mojo.findbugs-maven-plugin>
-        <version.org.codehaus.mojo.findbugs-maven-plugin_java8>3.0.4</version.org.codehaus.mojo.findbugs-maven-plugin_java8>
+        <version.org.codehaus.mojo.findbugs-maven-plugin>3.0.4</version.org.codehaus.mojo.findbugs-maven-plugin>
         <version.org.mortbay.jetty.alpn.jdk7>7.0.0.v20140317</version.org.mortbay.jetty.alpn.jdk7>
         <version.org.mortbay.jetty.alpn.jdk8>8.0.0.v20140317</version.org.mortbay.jetty.alpn.jdk8>
         <version.org.mortbay.jetty.alpn.jdk8.25>8.1.2.v20141202</version.org.mortbay.jetty.alpn.jdk8.25>
@@ -103,15 +102,11 @@
         <version.org.mortbay.jetty.alpn>8.1.7.v20160121</version.org.mortbay.jetty.alpn>
         <version.org.eclipse.jetty.alpn>1.0.0</version.org.eclipse.jetty.alpn>
 
-        <jdk.min.version>1.8</jdk.min.version>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
         <version.com.twitter.hpack>0.10.1</version.com.twitter.hpack>
 
         <!-- Non-default maven plugin versions and configuration -->
-        <version.org.zanata.plugin>3.7.4</version.org.zanata.plugin>
         <version.org.wildfly.openssl>1.0.0.Alpha1</version.org.wildfly.openssl>
-        <version.jar.plugin>3.0.2</version.jar.plugin>
+        <version.checkstyle>7.1</version.checkstyle>
     </properties>
 
     <modules>
@@ -134,7 +129,7 @@
             <plugin>
                 <groupId>org.zanata</groupId>
                 <artifactId>zanata-maven-plugin</artifactId>
-                <version>${version.org.zanata.plugin}</version>
+                <version>${version.zanata.plugin}</version>
                 <configuration>
                     <!-- Process sub-modules separately, sharing parent config -->
                     <enableModules>true</enableModules>
@@ -496,8 +491,8 @@
                                 <!-- fork is needed so compiler args can be used -->
                                 <fork>true</fork>
                                 <compilerArgs>
-                                    <arg>-J--add-modules</arg>
-                                    <arg>-Jjava.annotations.common</arg>
+                                    <arg>-J--add-modules=java.annotations.common</arg>
+                                    <arg>-J--add-opens=java.base/java.lang=ALL-UNNAMED</arg>
                                 </compilerArgs>
                             </configuration>
                         </plugin>
@@ -506,16 +501,6 @@
             </build>
         </profile>
 
-        <profile>
-            <id>jdk8</id>
-            <activation>
-                <jdk>[1.8,)</jdk>
-            </activation>
-            <properties>
-                <version.org.codehaus.mojo.findbugs-maven-plugin>${version.org.codehaus.mojo.findbugs-maven-plugin_java8}</version.org.codehaus.mojo.findbugs-maven-plugin>
-            </properties>
-        </profile>
-
         <profile>
             <id>dist</id>
             <activation>