Issue #11263 - Reduce usage of glob lib/foo/*.jar in modules (#11264)

* Using @foo.version@ technique and proper
  lib lists to allow arbitrary version
  updates from properties
* Fix spotless
* Remove duplicate entries
* Only replace System property "jetty.version" with manifest-ver if blank/null
* Fixing bad module definitions

jetty-core/jetty-http2/jetty-http2-server/src/main/config/modules/http2.mod

@@ -12,7 +12,9 @@ ssl
 alpn
 
 [lib]
-lib/http2/*.jar
+lib/http2/jetty-http2-common-${jetty.version}.jar
+lib/http2/jetty-http2-hpack-${jetty.version}.jar
+lib/http2/jetty-http2-server-${jetty.version}.jar
 
 [xml]
 etc/jetty-http2.xml

jetty-core/jetty-http2/jetty-http2-server/src/main/config/modules/http2c.mod

@@ -10,7 +10,9 @@ http
 http
 
 [lib]
-lib/http2/*.jar
+lib/http2/jetty-http2-common-${jetty.version}.jar
+lib/http2/jetty-http2-hpack-${jetty.version}.jar
+lib/http2/jetty-http2-server-${jetty.version}.jar
 
 [xml]
 etc/jetty-http2c.xml

jetty-core/jetty-http3/jetty-http3-server/src/main/config/modules/http3.mod

@@ -15,7 +15,14 @@ quiche
 work
 
 [lib]
-lib/http3/*.jar
+lib/http3/jetty-http3-common-${jetty.version}.jar
+lib/http3/jetty-http3-qpack-${jetty.version}.jar
+lib/http3/jetty-http3-server-${jetty.version}.jar
+lib/http3/jetty-quic-common-${jetty.version}.jar
+lib/http3/jetty-quic-quiche-common-${jetty.version}.jar
+lib/http3/jetty-quic-quiche-foreign-incubator-${jetty.version}.jar
+lib/http3/jetty-quic-quiche-jna-${jetty.version}.jar
+lib/http3/jetty-quic-server-${jetty.version}.jar
 
 [xml]
 etc/jetty-http3.xml

jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java

@@ -67,7 +67,7 @@ public class StartArgs
         String tag = System.getProperty(JETTY_TAG_NAME_KEY);
 
         // Use META-INF/MANIFEST.MF versions
-        if (ver == null)
+        if (Utils.isBlank(ver))
         {
             ver = ManifestUtils.getManifest(StartArgs.class)
                 .map(Manifest::getMainAttributes)

jetty-core/jetty-unixdomain-server/src/main/config/modules/unixdomain-http.mod

@@ -9,7 +9,7 @@ unixdomain
 server
 
 [lib]
-lib/jetty-unixdomain-server-*.jar
+lib/jetty-unixdomain-server-${jetty.version}.jar
 
 [xml]
 etc/jetty-unixdomain-http.xml

jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod

@@ -9,9 +9,17 @@ ee10
 [depend]
 ee10-plus
 
+[ini]
+ee10.asm.version?=@asm.version@
+ee10.jakarta.annotation.api.version?=@jakarta.annotation.api.version@
+
 [lib]
 lib/jetty-ee10-annotations-${jetty.version}.jar
-lib/ee10-annotations/*.jar
+lib/ee10-annotations/asm-${ee10.asm.version}.jar
+lib/ee10-annotations/asm-analysis-${ee10.asm.version}.jar
+lib/ee10-annotations/asm-commons-${ee10.asm.version}.jar
+lib/ee10-annotations/asm-tree-${ee10.asm.version}.jar
+lib/ee10-annotations/jakarta.annotation-api-${ee10.jakarta.annotation.api.version}.jar
 
 [jpms]
 add-modules:org.objectweb.asm

jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod

@@ -10,7 +10,17 @@ ee10
 ee10-servlet
 ee10-annotations
 
+[ini]
+ee10.jakarta.el.api.version?=@jakarta.el.api.version@
+ee10.jakarta.servlet.jsp.api.version?=@jakarta.servlet.jsp.api.version@
+eclipse.jdt.ecj.version?=@eclipse.jdt.ecj.version@
+ee10.jsp.impl.version?=@jsp.impl.version@
+
 [lib]
-lib/ee10-apache-jsp/*.jar
+lib/ee10-apache-jsp/jakarta.el.jakarta.el-api-${ee10.jakarta.el.api.version}.jar
+lib/ee10-apache-jsp/jakarta.servlet.jsp.jakarta.servlet.jsp-api-${ee10.jakarta.servlet.jsp.api.version}.jar
+lib/ee10-apache-jsp/org.eclipse.jdt.ecj-${eclipse.jdt.ecj.version}.jar
+lib/ee10-apache-jsp/org.mortbay.jasper.apache-el-${ee10.jsp.impl.version}.jar
+lib/ee10-apache-jsp/org.mortbay.jasper.apache-jsp-${ee10.jsp.impl.version}.jar
 lib/jetty-ee10-apache-jsp-${jetty.version}.jar
 

jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod

@@ -9,5 +9,10 @@ ee10
 [depends]
 ee10-apache-jsp
 
+[ini]
+ee10.jakarta.servlet.jsp.jstl.api.version?=@jakarta.servlet.jsp.jstl.api.version@
+ee10.jakarta.servlet.jsp.jstl.impl.version?=@jakarta.servlet.jsp.jstl.impl.version@
+
 [lib]
-lib/ee10-glassfish-jstl/*.jar
+lib/ee10-glassfish-jstl/jakarta.servlet.jsp.jstl.jakarta.servlet.jsp.jstl-api-${ee10.jakarta.servlet.jsp.jstl.api.version}.jar
+lib/ee10-glassfish-jstl/org.glassfish.web.jakarta.servlet.jsp.jstl-${ee10.jakarta.servlet.jsp.jstl.impl.version}.jar

jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod

@@ -13,9 +13,12 @@ security
 ee10-security
 auth-config-factory
 
+[ini]
+ee10.jakarta.authentication.api.version?=@jakarta.authentication.api.version@
+
 [lib]
 lib/jetty-ee10-jaspi-${jetty.version}.jar
-lib/ee10-jaspi/*.jar
+lib/ee10-jaspi/jakarta.authentication-api-${ee10.jakarta.authentication.api.version}.jar
 
 [xml]
 etc/jaspi/jetty-ee10-jaspi-authmoduleconfig.xml

jetty-ee10/jetty-ee10-maven-plugin/src/main/resources/ee10-maven.mod

@@ -12,7 +12,7 @@ ee10-webapp
 ee10-annotations
 
 [lib]
-lib/maven-ee10/**.jar
+lib/maven-ee10/*.jar
 
 [xml]
 etc/jetty-ee10-maven.xml

jetty-ee8/jetty-ee8-annotations/src/main/config/modules/ee8-annotations.mod

@@ -10,9 +10,17 @@ ee8
 plus
 ee8-plus
 
+[ini]
+ee8.asm.version?=@asm.version@
+ee8.jakarta.annotation.api.version?=@jakarta.annotation.api.version@
+
 [lib]
 lib/jetty-ee8-annotations-${jetty.version}.jar
-lib/ee8-annotations/*.jar
+lib/ee8-annotations/asm-${ee8.asm.version}.jar
+lib/ee8-annotations/asm-analysis-${ee8.asm.version}.jar
+lib/ee8-annotations/asm-commons-${ee8.asm.version}.jar
+lib/ee8-annotations/asm-tree-${ee8.asm.version}.jar
+lib/ee8-annotations/jakarta.annotation-api-${ee8.jakarta.annotation.api.version}.jar
 
 [jpms]
 add-modules:org.objectweb.asm

jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod

@@ -10,6 +10,12 @@ ee8
 ee8-servlet
 ee8-annotations
 
+[ini]
+eclipse.jdt.ecj.version?=@eclipse.jdt.ecj.version@
+ee8.jsp.impl.version?=@jsp.impl.version@
+
 [lib]
-lib/ee8-apache-jsp/*.jar
+lib/ee8-apache-jsp/org.eclipse.jdt.ecj-${eclipse.jdt.ecj.version}.jar
+lib/ee8-apache-jsp/org.mortbay.jasper.apache-el-${ee8.jsp.impl.version}.jar
+lib/ee8-apache-jsp/org.mortbay.jasper.apache-jsp-${ee8.jsp.impl.version}.jar
 lib/jetty-ee8-apache-jsp-${jetty.version}.jar

jetty-ee8/jetty-ee8-glassfish-jstl/src/main/config/modules/ee8-glassfish-jstl.mod

@@ -6,5 +6,10 @@ Enables the glassfish version of JSTL for all webapps.
 [environment]
 ee8
 
+[ini]
+ee8.jakarta.servlet.jsp.jstl.api.version?=@jakarta.servlet.jsp.jstl.api.version@
+ee8.javax.servlet.jsp.jstl.impl.version?=@javax.servlet.jsp.jstl.impl.version@
+
 [lib]
-lib/ee8-glassfish-jstl/*.jar
+lib/ee8-glassfish-jstl/jakarta.servlet.jsp.jstl.jakarta.servlet.jsp.jstl-api-${ee8.jakarta.servlet.jsp.jstl.api.version}.jar
+lib/ee8-glassfish-jstl/org.glassfish.web.javax.servlet.jsp.jstl-${ee8.javax.servlet.jsp.jstl.impl.version}.jar

jetty-ee8/jetty-ee8-jaspi/src/main/config/modules/ee8-jaspi.mod

@@ -10,9 +10,12 @@ security
 ee8-security
 ee8-auth-config-factory
 
+[ini]
+ee8.jakarta.authentication.api.version?=@jakarta.authentication.api.version@
+
 [lib]
 lib/jetty-ee8-jaspi-${jetty.version}.jar
-lib/jaspi/*.jar
+lib/ee8-jaspi/jakarta.authentication-api-${ee8.jakarta.authentication.api.version}.jar
 
 [xml]
 etc/jaspi/jetty-ee8-jaspi-authmoduleconfig.xml

jetty-ee8/pom.xml

@@ -37,23 +37,21 @@
   </modules>
 
   <properties>
-    <!-- generated sources cannot follow exactly Jetty code style -->
-    <checkstyle.skip>true</checkstyle.skip>
-
     <!-- generated sources cannot follow exactly Jetty code style -->
     <checkstyle.skip>true</checkstyle.skip>
     <ee9.module></ee9.module>
     <ee9.module.path>${maven.multiModuleProjectDirectory}/jetty-ee9/${ee9.module}</ee9.module.path>
     <jakarta.annotation.api.version>1.3.5</jakarta.annotation.api.version>
+    <jakarta.servlet.jsp.jstl.api.version>1.2.7</jakarta.servlet.jsp.jstl.api.version>
     <jakarta.transaction-api.version>1.3.3</jakarta.transaction-api.version>
     <jakarta.websocket.api.version>1.1.2</jakarta.websocket.api.version>
     <javax.mail.glassfish.version>1.4.1.v201005082020</javax.mail.glassfish.version>
+    <javax.servlet.jsp.jstl.impl.version>1.2.5</javax.servlet.jsp.jstl.impl.version>
     <jetty.servlet.api.version>4.0.6</jetty.servlet.api.version>
     <jsp.impl.version>9.0.83.1</jsp.impl.version>
     <modify-sources-plugin.version>1.0.9</modify-sources-plugin.version>
     <sonar.skip>true</sonar.skip>
     <weld.version>3.1.9.Final</weld.version>
-
   </properties>
 
   <dependencyManagement>
@@ -78,7 +76,7 @@
       <dependency>
         <groupId>jakarta.servlet.jsp.jstl</groupId>
         <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-        <version>1.2.7</version>
+        <version>${jakarta.servlet.jsp.jstl.api.version}</version>
       </dependency>
       <dependency>
         <groupId>jakarta.transaction</groupId>
@@ -238,7 +236,7 @@
       <dependency>
         <groupId>org.glassfish.web</groupId>
         <artifactId>javax.servlet.jsp.jstl</artifactId>
-        <version>1.2.5</version>
+        <version>${javax.servlet.jsp.jstl.impl.version}</version>
       </dependency>
       <dependency>
         <groupId>org.mortbay.jasper</groupId>

jetty-ee9/jetty-ee9-annotations/src/main/config/modules/ee9-annotations.mod

@@ -9,9 +9,17 @@ ee9
 [depend]
 ee9-plus
 
+[ini]
+ee9.asm.version?=@asm.version@
+ee9.jakarta.annotation.api.version?=@jakarta.annotation.api.version@
+
 [lib]
 lib/jetty-ee9-annotations-${jetty.version}.jar
-lib/ee9-annotations/*.jar
+lib/ee9-annotations/asm-${ee9.asm.version}.jar
+lib/ee9-annotations/asm-analysis-${ee9.asm.version}.jar
+lib/ee9-annotations/asm-commons-${ee9.asm.version}.jar
+lib/ee9-annotations/asm-tree-${ee9.asm.version}.jar
+lib/ee9-annotations/jakarta.annotation-api-${ee9.jakarta.annotation.api.version}.jar
 
 [jpms]
 add-modules:org.objectweb.asm

jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod

@@ -10,6 +10,12 @@ ee9
 ee9-servlet
 ee9-annotations
 
+[ini]
+eclipse.jdt.ecj.version?=@eclipse.jdt.ecj.version@
+ee9.jsp.impl.version?=@jsp.impl.version@
+
 [lib]
-lib/ee9-apache-jsp/*.jar
+lib/ee9-apache-jsp/org.eclipse.jdt.ecj-${eclipse.jdt.ecj.version}.jar
+lib/ee9-apache-jsp/org.mortbay.jasper.apache-el-${ee9.jsp.impl.version}.jar
+lib/ee9-apache-jsp/org.mortbay.jasper.apache-jsp-${ee9.jsp.impl.version}.jar
 lib/jetty-ee9-apache-jsp-${jetty.version}.jar

jetty-ee9/jetty-ee9-glassfish-jstl/src/main/config/modules/ee9-glassfish-jstl.mod

@@ -6,5 +6,10 @@ Enables the glassfish version of JSTL for all webapps.
 [environment]
 ee9
 
+[ini]
+ee9.jakarta.servlet.jsp.jstl.api.version?=@jakarta.servlet.jsp.jstl.api.version@
+ee9.jakarta.servlet.jsp.jstl.impl.version?=@jakarta.servlet.jsp.jstl.impl.version@
+
 [lib]
-lib/ee9-glassfish-jstl/*.jar
+lib/ee9-glassfish-jstl/jakarta.servlet.jsp.jstl.jakarta.servlet.jsp.jstl-api-${ee9.jakarta.servlet.jsp.jstl.api.version}.jar
+lib/ee9-glassfish-jstl/org.glassfish.web.jakarta.servlet.jsp.jstl-${ee9.jakarta.servlet.jsp.jstl.impl.version}.jar

jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi.mod

@@ -10,9 +10,12 @@ security
 ee9-security
 ee9-auth-config-factory
 
+[ini]
+ee9.jakarta.authentication.api.version?=@jakarta.authentication.api.version@
+
 [lib]
 lib/jetty-ee9-jaspi-${jetty.version}.jar
-lib/jaspi/*.jar
+lib/ee9-jaspi/jakarta.authentication-api-${ee9.jakarta.authentication.api.version}.jar
 
 [xml]
 etc/jaspi/jetty-ee9-jaspi-authmoduleconfig.xml

jetty-home/src/main/resources/modules/conscrypt.mod

@@ -19,7 +19,8 @@ basehome:modules/conscrypt/conscrypt.xml|etc/conscrypt.xml
 etc/conscrypt.xml
 
 [lib]
-lib/conscrypt/**.jar
+lib/conscrypt/conscrypt-uber-${conscrypt.version}.jar
+lib/conscrypt/conscrypt-${conscrypt.version}-linux-x86_64.jar
 lib/jetty-alpn-conscrypt-server-${jetty.version}.jar
 
 [license]

jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod

@@ -18,7 +18,7 @@ xmemcached.version?=@xmemcached.version@
 
 [lib]
 lib/jetty-memcached-sessions-${jetty.version}.jar
-lib/xmemcached/*.jar
+lib/xmemcached/xmemcached-${xmemcached.version}.jar
 
 [license]
 Xmemcached is an open source project hosted on Github and released under the Apache 2.0 license.

jetty-integrations/jetty-nosql/src/main/config/modules/session-store-mongo.mod

@@ -18,7 +18,7 @@ maven://org.mongodb/mongo-java-driver/${mongodb.version}|lib/nosql/mongo-java-dr
 
 [lib]
 lib/jetty-nosql-${jetty.version}.jar
-lib/nosql/*.jar
+lib/nosql/mongo-java-driver-${mongodb.version}.jar
 
 [license]
 The java driver for the MongoDB document-based database system is hosted on GitHub and released under the Apache 2.0 license.

pom.xml

@@ -176,7 +176,7 @@
     <conscrypt.version>2.5.2</conscrypt.version>
     <cyclonedx.maven.plugin.version>2.7.10</cyclonedx.maven.plugin.version>
     <depends.maven.plugin.version>1.5.0</depends.maven.plugin.version>
-    <disruptor.version>3.4.2</disruptor.version>
+    <eclipse.jdt.ecj.version>3.33.0</eclipse.jdt.ecj.version>
     <felix.version>7.0.5</felix.version>
     <findbugs.jsr305.version>3.0.2</findbugs.jsr305.version>
     <flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
@@ -568,6 +568,11 @@
         <artifactId>conscrypt-openjdk-uber</artifactId>
         <version>${conscrypt.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jdt</groupId>
+        <artifactId>ecj</artifactId>
+        <version>${eclipse.jdt.ecj.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-alpn-client</artifactId>