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

…5832-WebSocketShutdownThread
jetty · Jan 18, 2021 · 29f1859 · 29f1859
2 parents 2f61766 + e1f62c4
commit 29f1859
Show file tree

Hide file tree

Showing 112 changed files with 4,283 additions and 4,199 deletions.
diff --git a/javadoc/pom.xml b/javadoc/pom.xml
@@ -14,43 +14,26 @@
   <properties>
     <sources-directory>${project.build.directory}/jetty-sources</sources-directory>
     <sonar.skip>true</sonar.skip>
+    <pmd.skip>true</pmd.skip>
+    <spotbugs.skip>true</spotbugs.skip>
+    <checkstyle.skip>true</checkstyle.skip>
   </properties>
 
   <build>
     <sourceDirectory>${sources-directory}</sourceDirectory>
+    <pluginManagement>
+      <plugins>
+        <!-- No point performing Deploying the javadoc project -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
-      <!-- No point performing Checkstyle in javadoc project -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <!-- No point performing PMD in javadoc project -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <!-- No point performing Findbugs in javadoc project -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <!-- No point performing Deploying the javadoc project -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>

diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
@@ -709,11 +709,10 @@ public boolean isFromExcludedJar(WebAppContext context, ServletContainerInitiali
         }
 
         //Check if it is excluded by an ordering
-        URI loadingJarURI = sciResource.getURI();
         boolean included = false;
         for (Resource r : orderedJars)
         {
-            included = r.getURI().equals(loadingJarURI);
+            included = r.equals(sciResource);
             if (included)
                 break;
         }