Merged branch 'jetty-9.4.x' into 'master'.

aggregates/jetty-all-compact3/pom.xml

@@ -20,8 +20,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>8</source>
-          <target>8</target>
           <compilerArgs>
             <arg>-profile</arg>
             <arg>compact3</arg>

jetty-alpn/jetty-alpn-java-client/pom.xml

@@ -24,6 +24,7 @@
                 <configuration>
                     <source>1.9</source>
                     <target>1.9</target>
+                    <release>9</release>
                 </configuration>
             </plugin>
         </plugins>

jetty-alpn/jetty-alpn-java-server/pom.xml

@@ -23,6 +23,7 @@
                 <configuration>
                     <source>1.9</source>
                     <target>1.9</target>
+                    <release>9</release>
                 </configuration>
             </plugin>
         </plugins>

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("-java.lang.String");
-        pattern.add("-sun.security.provider.Sun");
+        Assert.assertThat(pattern.match(String.class), Matchers.is(false));
-        Assert.assertThat(pattern.match(String.class), Matchers.is(true));
-        Assert.assertThat(pattern.match(Sun.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));

pom.xml

@@ -1487,6 +1487,22 @@
         <alpn.version>8.1.11.v20170118</alpn.version>
       </properties>
     </profile>
+    <profile>
+      <id>jdk9</id>
+      <activation>
+        <jdk>[1.9,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <release>8</release>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 
   <issueManagement>

tests/test-webapps/test-mock-resources/pom.xml

@@ -13,12 +13,6 @@
   </properties>
   <build>
     <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <verbose>false</verbose>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>

tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml

@@ -5,23 +5,15 @@
     <artifactId>test-servlet-spec-parent</artifactId>
     <version>10.0.0-SNAPSHOT</version>
   </parent>
+
   <name>Jetty Tests :: WebApp :: Servlet Spec :: Fragment Jar</name>
-  <groupId>org.eclipse.jetty.tests</groupId>
   <artifactId>test-web-fragment</artifactId>
   <packaging>jar</packaging>
+
   <properties>
     <bundle-symbolic-name>${project.groupId}.fragment</bundle-symbolic-name>
   </properties>
-  <build>
+
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <verbose>false</verbose>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
   <dependencies>
       <dependency>
          <groupId>javax.servlet</groupId>