diff --git a/aggregates/jetty-all-compact3/pom.xml b/aggregates/jetty-all-compact3/pom.xml index c47df531495..9afc7dbf2fe 100644 --- a/aggregates/jetty-all-compact3/pom.xml +++ b/aggregates/jetty-all-compact3/pom.xml @@ -20,8 +20,6 @@ org.apache.maven.plugins maven-compiler-plugin - 8 - 8 -profile compact3 diff --git a/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-alpn/jetty-alpn-java-client/pom.xml index 226cacf62da..12814d9e49e 100644 --- a/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -24,6 +24,7 @@ 1.9 1.9 + 9 diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml index b7ec1001ea6..60f03af946b 100644 --- a/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -23,6 +23,7 @@ 1.9 1.9 + 9 diff --git a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/ClasspathPatternTest.java b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/ClasspathPatternTest.java index 1298a3578d0..26561839de0 100644 --- a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/ClasspathPatternTest.java +++ b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/ClasspathPatternTest.java @@ -30,8 +30,6 @@ import org.junit.Assume; import org.junit.Before; import org.junit.Test; -import sun.security.provider.Sun; - public class ClasspathPatternTest { private final ClasspathPattern _pattern = new ClasspathPattern(); @@ -134,7 +132,6 @@ public class ClasspathPatternTest ClasspathPattern pattern = new ClasspathPattern(); pattern.include("something"); Assert.assertThat(pattern.match(String.class), Matchers.is(false)); - Assert.assertThat(pattern.match(Sun.class), Matchers.is(false)); Assert.assertThat(pattern.match(Test.class), Matchers.is(false)); Assert.assertThat(pattern.match(JDK.class), Matchers.is(false)); Assert.assertThat(pattern.match(ClasspathPatternTest.class), Matchers.is(false)); @@ -146,15 +143,12 @@ public class ClasspathPatternTest pattern.include(loc_junit.toString(), loc_test.toString()); Assert.assertThat(pattern.match(String.class), Matchers.is(true)); - Assert.assertThat(pattern.match(Sun.class), Matchers.is(true)); Assert.assertThat(pattern.match(Test.class), Matchers.is(true)); Assert.assertThat(pattern.match(JDK.class), Matchers.is(false)); Assert.assertThat(pattern.match(ClasspathPatternTest.class), Matchers.is(true)); - // exclude by package name still works - pattern.add("-sun.security.provider.Sun"); - Assert.assertThat(pattern.match(String.class), Matchers.is(true)); - Assert.assertThat(pattern.match(Sun.class), Matchers.is(false)); + pattern.add("-java.lang.String"); + Assert.assertThat(pattern.match(String.class), Matchers.is(false)); Assert.assertThat(pattern.match(Test.class), Matchers.is(true)); Assert.assertThat(pattern.match(JDK.class), Matchers.is(false)); Assert.assertThat(pattern.match(ClasspathPatternTest.class), Matchers.is(true)); @@ -184,7 +178,6 @@ public class ClasspathPatternTest pattern.include("."); Assert.assertThat(pattern.match(String.class), Matchers.is(true)); - Assert.assertThat(pattern.match(Sun.class), Matchers.is(true)); Assert.assertThat(pattern.match(Test.class), Matchers.is(true)); Assert.assertThat(pattern.match(JDK.class), Matchers.is(true)); Assert.assertThat(pattern.match(ClasspathPatternTest.class), Matchers.is(true)); @@ -196,7 +189,6 @@ public class ClasspathPatternTest pattern.exclude(loc_junit.toString(), loc_test.toString()); Assert.assertThat(pattern.match(String.class), Matchers.is(false)); - Assert.assertThat(pattern.match(Sun.class), Matchers.is(false)); Assert.assertThat(pattern.match(Test.class), Matchers.is(false)); Assert.assertThat(pattern.match(JDK.class), Matchers.is(true)); Assert.assertThat(pattern.match(ClasspathPatternTest.class), Matchers.is(false)); diff --git a/pom.xml b/pom.xml index 4cb255aff6c..ef01338ce86 100644 --- a/pom.xml +++ b/pom.xml @@ -1490,6 +1490,22 @@ 8.1.11.v20170118 + + jdk9 + + [1.9,) + + + + + maven-compiler-plugin + + 8 + + + + + diff --git a/tests/test-webapps/test-mock-resources/pom.xml b/tests/test-webapps/test-mock-resources/pom.xml index 9aa5f62922e..98ccb39d40f 100644 --- a/tests/test-webapps/test-mock-resources/pom.xml +++ b/tests/test-webapps/test-mock-resources/pom.xml @@ -13,12 +13,6 @@ - - maven-compiler-plugin - - false - - org.apache.felix maven-bundle-plugin diff --git a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml index 21722e8cdbb..562096ba370 100644 --- a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml +++ b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml @@ -5,23 +5,15 @@ test-servlet-spec-parent 9.4.7-SNAPSHOT + Jetty Tests :: WebApp :: Servlet Spec :: Fragment Jar - org.eclipse.jetty.tests test-web-fragment jar + ${project.groupId}.fragment - - - - maven-compiler-plugin - - false - - - - + javax.servlet