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

jetty · Nov 17, 2020 · e9c6c94 · e9c6c94
2 parents ac6444f + 1448444
commit e9c6c94
Show file tree

Hide file tree

Showing 10 changed files with 927 additions and 148 deletions.
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
@@ -170,6 +170,7 @@ public static List<Option> coreJettyDependencies()
             .start());
         res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-slf4j-impl").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-util").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-util-ajax").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-deploy").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-server").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-servlet").versionAsInProject().start());

diff --git a/jetty-server/src/main/config/modules/stats.mod b/jetty-server/src/main/config/modules/stats.mod
@@ -8,6 +8,10 @@ server
 
 [depend]
 server
+servlet
+
+[lib]
+lib/jetty-util-ajax-${jetty.version}.jar
 
 [xml]
 etc/jetty-stats.xml

diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml
@@ -17,6 +17,15 @@
 
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>
+            @{argLine} ${jetty.surefire.argLine}
+            --add-modules org.eclipse.jetty.util.ajax
+          </argLine>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -49,6 +58,12 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util-ajax</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jmx</artifactId>

diff --git a/jetty-servlet/src/main/java/module-info.java b/jetty-servlet/src/main/java/module-info.java
@@ -27,6 +27,7 @@
 
     // Only required if using StatisticsServlet.
     requires static java.management;
+    requires static org.eclipse.jetty.util.ajax;
     // Only required if using IntrospectorCleaner.
     requires static java.desktop;
     // Only required if using JMX.
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,10 @@ server @@
     [depend]
     server
+    servlet
+    [lib]
+    lib/jetty-util-ajax-${jetty.version}.jar
     [xml]
     etc/jetty-stats.xml
@@ Expand Down @@