Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes to make it work on latest JDK9 builds #483

Merged
merged 1 commit into from Feb 9, 2017
Merged

Fixes to make it work on latest JDK9 builds #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions core/pom.xml
View file
Open in desktop
Expand Up @@ -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>


Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/io/undertow/security/impl/SingleSignOnAuthenticationMechanism.java
View file
Open in desktop
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions parser-generator/src/main/java/io/undertow/annotationprocessor/AbstractParserGenerator.java
View file
Open in desktop
Expand Up @@ -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) {

Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion ...enerator/src/main/java/io/undertow/annotationprocessor/HttpParserAnnotationProcessor.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down
29 changes: 7 additions & 22 deletions pom.xml
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
<version>21</version>
<version>22</version>
</parent>

<groupId>io.undertow</groupId>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down