Merge remote-tracking branch 'origin/jetty-9.4.x'

apache-jsp/pom.xml

@@ -89,6 +89,14 @@
       <artifactId>ecj</artifactId>
     </dependency>
 
+    <!-- Running in jetty needs annotations -->
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-annotations</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+
     <!-- tests -->
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java

@@ -22,12 +22,15 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.lang.management.ManagementFactory;
 
+import org.eclipse.jetty.annotations.AnnotationConfiguration;
 import org.eclipse.jetty.deploy.DeploymentManager;
 import org.eclipse.jetty.deploy.PropertiesConfigurationManager;
 import org.eclipse.jetty.deploy.bindings.DebugListenerBinding;
 import org.eclipse.jetty.deploy.providers.WebAppProvider;
 import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.jmx.MBeanContainer;
+import org.eclipse.jetty.plus.webapp.EnvConfiguration;
+import org.eclipse.jetty.plus.webapp.PlusConfiguration;
 import org.eclipse.jetty.rewrite.handler.RewriteHandler;
 import org.eclipse.jetty.security.HashLoginService;
 import org.eclipse.jetty.server.DebugListener;
@@ -171,7 +174,7 @@ public class LikeJettyXml
         deployer.setContexts(contexts);
         deployer.setContextAttribute(
                 "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern",
-                ".*/servlet-api-[^/]*\\.jar$");
+                ".*/[^/]*servlet-api-[^/]*\\.jar$|.*/javax.servlet.jsp.jstl-.*\\.jar$|.*/[^/]*taglibs.*\\.jar$");
 
         WebAppProvider webapp_provider = new WebAppProvider();
         webapp_provider.setMonitoredDirName(jetty_base + "/webapps");
@@ -184,7 +187,7 @@ public class LikeJettyXml
         server.addBean(deployer);
         
         // === setup jetty plus ==
-        Configurations.setServerDefault(server).add("org.eclipse.jetty.plus.webapp.EnvConfiguration","org.eclipse.jetty.plus.webapp.PlusConfiguration");
+        Configurations.setServerDefault(server).add(new EnvConfiguration(), new PlusConfiguration(), new AnnotationConfiguration());
 
         // === jetty-stats.xml ===
         StatisticsHandler stats = new StatisticsHandler();

jetty-home/pom.xml

@@ -248,7 +248,7 @@
             </goals>
             <configuration>
               <includeGroupIds>
-                org.eclipse.jetty,org.eclipse.jetty.toolchain,org.mortbay.jasper,org.eclipse.jetty.orbit,org.eclipse.jdt.core.compiler
+                org.eclipse.jetty,org.eclipse.jetty.toolchain,org.mortbay.jasper,org.eclipse.jdt.core.compiler
               </includeGroupIds>
               <includeArtifactIds>apache-jsp,apache-el,ecj</includeArtifactIds>
               <includeTypes>jar</includeTypes>
@@ -256,20 +256,6 @@
               <outputDirectory>${assembly-directory}/lib/apache-jsp</outputDirectory>
             </configuration>
           </execution>
-          <execution>
-            <id>copy-jstl-api</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds>
-              <includeArtifactIds>javax.servlet.jsp.jstl</includeArtifactIds>
-              <prependGroupId>true</prependGroupId>
-              <includeTypes>jar</includeTypes>
-              <outputDirectory>${assembly-directory}/lib/jsp</outputDirectory>
-            </configuration>
-          </execution>
           <execution>
             <id>copy-apache-jstl-deps</id>
             <phase>generate-resources</phase>

jetty-osgi/jetty-osgi-boot-jsp/pom.xml

@@ -31,12 +31,12 @@
       <groupId>org.eclipse.osgi</groupId>
       <artifactId>org.eclipse.osgi.services</artifactId>
     </dependency>
-    <!-- Orbit Servlet Deps -->
+    <!-- Servlet Deps -->
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
     </dependency>
-    <!-- Orbit JSP Deps -->
+    <!-- JSP Deps -->
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>apache-jsp</artifactId>

jetty-util/src/test/java/org/eclipse/jetty/util/TypeUtilTest.java

@@ -27,6 +27,7 @@ import java.nio.file.Paths;
 
 import org.eclipse.jetty.toolchain.test.JDK;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Test;
 
 public class TypeUtilTest
@@ -130,7 +131,10 @@ public class TypeUtilTest
     @Test
     public void testGetLocationOfClass() throws Exception
     {
-        Path mavenRepoPath = Paths.get( System.getProperty( "mavenRepoPath" ) );
+        String mavenRepoPathProperty = System.getProperty( "mavenRepoPath");
+        Assume.assumeNotNull(mavenRepoPathProperty);
+        Path mavenRepoPath = Paths.get( mavenRepoPathProperty );
+
         String mavenRepo = mavenRepoPath.toFile().getPath().replaceAll("\\\\", "/");
 
         // Classes from maven dependencies