Merge pull request #6839 from eclipse/jetty-10.0.x_modfiles_filtering

Issue #3514 interpolation of mod files to avoid hardcoding version in mod files
jetty · Sep 22, 2021 · 9c06dc2 · 9c06dc2
2 parents 9a14de0 + 7d52cd5
commit 9c06dc2
Show file tree

Hide file tree

Showing 31 changed files with 225 additions and 126 deletions.
diff --git a/demos/demo-jndi-webapp/src/main/config/modules/demo-jndi.mod b/demos/demo-jndi-webapp/src/main/config/modules/demo-jndi.mod
@@ -17,5 +17,5 @@ demo-mock-resources
 [files]
 basehome:modules/demo.d/demo-jndi.xml|webapps/demo-jndi.xml
 maven://org.eclipse.jetty.demos/demo-jndi-webapp/${jetty.version}/war|webapps/demo-jndi.war
-maven://org.eclipse.jetty.orbit/javax.mail.glassfish/1.4.1.v201005082020/jar|lib/ext/javax.mail.glassfish-1.4.1.v201005082020.jar
-maven://jakarta.transaction/jakarta.transaction-api/1.3.2/jar|lib/ext/jakarta.transaction-api-1.3.2.jar
+maven://org.eclipse.jetty.orbit/javax.mail.glassfish/@javax.mail.glassfish.version@/jar|lib/ext/javax.mail.glassfish-@javax.mail.glassfish.version@.jar
+maven://jakarta.transaction/jakarta.transaction-api/@jakarta.transaction-api.version@/jar|lib/ext/jakarta.transaction-api-@jakarta.transaction-api.version@.jar
diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
@@ -140,31 +140,14 @@
             <configuration>
               <target>
                 <concat destfile="${project.build.directory}/gcloud-datastore.mod">
-                  <fileset file="src/main/config-template/modules/gcloud-datastore.mod" />
+                  <fileset file="${project.build.directory}/jetty-config-files/modules/gcloud-datastore.mod" />
                   <fileset file="${project.build.directory}/deps.txt" />
                 </concat>
               </target>
             </configuration>
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/config.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 

diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/assembly/config.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/assembly/config.xml
@@ -7,7 +7,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>src/main/config-template</directory>
+      <directory>${project.build.directory}/jetty-config-files</directory>
       <outputDirectory></outputDirectory>
       <includes>
         <include>**</include>
@@ -17,7 +17,7 @@
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>target</directory>
+      <directory>${project.build.directory}</directory>
       <outputDirectory>modules</outputDirectory>
       <includes>
         <include>gcloud-datastore.mod</include>

diff --git a/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod b/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod
@@ -23,7 +23,7 @@ lib/jetty-hazelcast-${jetty.version}.jar
 lib/hazelcast/hazelcast-${hazelcast.version}.jar
 
 [ini]
-hazelcast.version?=4.2.2
+hazelcast.version?=@hazelcast.version@
 
 [license]
 Hazelcast is an open source project hosted on Github and released under the Apache 2.0 license.

diff --git a/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod b/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod
@@ -23,7 +23,7 @@ lib/jetty-hazelcast-${jetty.version}.jar
 lib/hazelcast/hazelcast-${hazelcast.version}.jar
 
 [ini]
-hazelcast.version?=4.2.2
+hazelcast.version?=@hazelcast.version@
 
 [license]
 Hazelcast is an open source project hosted on Github and released under the Apache 2.0 license.

diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
@@ -33,9 +33,15 @@
               <useBuildFilters>false</useBuildFilters>
               <includeEmptyDirs>true</includeEmptyDirs>
               <outputDirectory>${assembly-directory}</outputDirectory>
+              <encoding>UTF-8</encoding>
+              <useDefaultDelimiters>false</useDefaultDelimiters>
+              <delimiters>
+                <delimiter>@</delimiter>
+              </delimiters>
               <resources>
                 <resource>
                   <directory>${basedir}/src/main/resources</directory>
+                  <filtering>true</filtering>
                 </resource>
               </resources>
             </configuration>
@@ -871,6 +877,21 @@
       <type>jar</type>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/jetty-home/src/main/resources/modules/conscrypt.mod b/jetty-home/src/main/resources/modules/conscrypt.mod
@@ -27,5 +27,5 @@ Conscrypt is distributed under the Apache Licence 2.0
 https://github.com/google/conscrypt/blob/master/LICENSE
 
 [ini]
-conscrypt.version?=2.5.1
+conscrypt.version?=@conscrypt.version@
 jetty.sslContext.provider?=Conscrypt
diff --git a/jetty-home/src/main/resources/modules/hawtio.mod b/jetty-home/src/main/resources/modules/hawtio.mod
@@ -27,7 +27,7 @@ http://github.com/hawtio/hawtio
 http://www.apache.org/licenses/LICENSE-2.0.html
 
 [ini]
-hawtio.version?=2.13.5
+hawtio.version?=@hawtio.version@
 
 [ini-template]
 ## Hawt.io configuration

diff --git a/jetty-home/src/main/resources/modules/jamon.mod b/jetty-home/src/main/resources/modules/jamon.mod
@@ -17,8 +17,8 @@ etc/jamon.xml
 
 [files]
 lib/jamon/
-maven://com.jamonapi/jamon/2.81|lib/jamon/jamon-2.81.jar
-maven://com.jamonapi/jamon_war/2.81/war|lib/jamon/jamon.war
+maven://com.jamonapi/jamon/${jamon.version}|lib/jamon/jamon-${jamon.version}.jar
+maven://com.jamonapi/jamon_war/${jamon.version}/war|lib/jamon/jamon.war
 basehome:modules/jamon/jamon.xml|etc/jamon.xml
 
 [lib]
@@ -29,6 +29,9 @@ JAMon is a source forge hosted project released under a BSD derived license.
 http://jamonapi.sourceforge.net
 http://jamonapi.sourceforge.net/JAMonLicense.html
 
+[ini]
+jamon.version?=@jamon.version@
+
 [ini-template]
 ## Jamon Configuration
 # jamon.summaryLabels=demo

diff --git a/jetty-home/src/main/resources/modules/jolokia.mod b/jetty-home/src/main/resources/modules/jolokia.mod
@@ -15,9 +15,12 @@ jmx
 etc/jolokia.xml
 
 [files]
-maven://org.jolokia/jolokia-war/1.3.3/war|lib/jolokia/jolokia.war
+maven://org.jolokia/jolokia-war/${jolokia.version}/war|lib/jolokia/jolokia.war
 basehome:modules/jolokia/jolokia.xml|etc/jolokia.xml
 
+[ini]
+jolokia.version?=@jolokia.version@
+
 [license]
 Jolokia is released under the Apache License 2.0
 http://www.jolokia.org

diff --git a/jetty-home/src/main/resources/modules/logging-jul.mod b/jetty-home/src/main/resources/modules/logging-jul.mod
@@ -26,7 +26,7 @@ lib/logging/slf4j-jdk14-${slf4j.version}.jar
 -Djava.util.logging.config.file=${jetty.base}/resources/java-util-logging.properties
 
 [ini]
-slf4j.version?=2.0.0-alpha5
+slf4j.version?=@slf4j.version@
 
 [license]
 SLF4J is distributed under the MIT License.

diff --git a/jetty-home/src/main/resources/modules/logging-log4j1.mod b/jetty-home/src/main/resources/modules/logging-log4j1.mod
@@ -25,7 +25,7 @@ lib/logging/slf4j-log4j12-${slf4j.version}.jar
 lib/logging/log4j-${log4j.version}.jar
 
 [ini]
-log4j.version?=1.2.17
+log4j.version?=@log4j.version@
 jetty.webapp.addServerClasses+=,org.apache.log4j.
 
 

diff --git a/jetty-home/src/main/resources/modules/logging-log4j2.mod b/jetty-home/src/main/resources/modules/logging-log4j2.mod
@@ -27,7 +27,7 @@ lib/logging/log4j-api-${log4j.version}.jar
 lib/logging/log4j-core-${log4j.version}.jar
 
 [ini]
-log4j.version?=2.14.0
+log4j.version?=@log4j2.version@
 jetty.webapp.addServerClasses+=,org.apache.logging.log4j.
 
 [license]

diff --git a/jetty-home/src/main/resources/modules/logging-logback.mod b/jetty-home/src/main/resources/modules/logging-logback.mod
@@ -24,7 +24,7 @@ lib/logging/logback-classic-${logback.version}.jar
 lib/logging/logback-core-${logback.version}.jar
 
 [ini]
-logback.version?=1.3.0-alpha9
+logback.version?=@logback.version@
 jetty.webapp.addServerClasses+=,ch.qos.logback.
 
 [license]

diff --git a/jetty-home/src/main/resources/modules/logging/slf4j.mod b/jetty-home/src/main/resources/modules/logging/slf4j.mod
@@ -15,5 +15,5 @@ slf4j
 lib/logging/slf4j-api-${slf4j.version}.jar
 
 [ini]
-slf4j.version?=2.0.0-alpha5
+slf4j.version?=@slf4j.version@
 jetty.webapp.addServerClasses+=,org.slf4j.
diff --git a/...ispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod b/...ispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod
@@ -13,7 +13,7 @@ lib/infinispan-common-${jetty.version}.jar
 lib/infinispan/*.jar
 
 [ini]
-infinispan.version?=11.0.11.Final
+infinispan.version?=@infinispan.version@
 
 [license]
 Infinispan is an open source project hosted on Github and released under the Apache 2.0 license.

diff --git a/jetty-infinispan/infinispan-embedded-query/pom.xml b/jetty-infinispan/infinispan-embedded-query/pom.xml
@@ -60,31 +60,14 @@
             <configuration>
               <target>
                 <concat destfile="${project.build.directory}/infinispan-embedded-query-libs.mod">
-                  <fileset file="src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-query-libs.mod" />
+                  <fileset file="${project.build.directory}/jetty-config-files/modules/sessions/infinispan/embedded/infinispan-embedded-query-libs.mod" />
                   <fileset file="${project.build.directory}/deps.txt" />
                 </concat>
               </target>
             </configuration>
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/config.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <dependencies>

diff --git a/jetty-infinispan/infinispan-embedded-query/src/main/assembly/config.xml b/jetty-infinispan/infinispan-embedded-query/src/main/assembly/config.xml
@@ -7,7 +7,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>src/main/config-template</directory>
+      <directory>${project.build.directory}/jetty-config-files</directory>
       <outputDirectory></outputDirectory>
       <includes>
         <include>**</include>
@@ -17,7 +17,7 @@
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>target</directory>
+      <directory>${project.build.directory}</directory>
       <outputDirectory>modules/sessions/infinispan/embedded</outputDirectory>
       <includes>
         <include>infinispan-embedded-query-libs.mod</include>

diff --git a/...finispan-embedded/src/main/config-templates/modules/session-store-infinispan-embedded.mod b/...finispan-embedded/src/main/config-templates/modules/session-store-infinispan-embedded.mod
@@ -16,7 +16,7 @@ sessions/infinispan/embedded/infinispan-embedded-libs
 basehome:modules/sessions/infinispan/embedded/infinispan.xml|etc/infinispan.xml
 
 [ini]
-infinispan.version?=11.0.11.Final
+infinispan.version?=@infinispan.version@
 
 [ini-template]
 #jetty.session.infinispan.idleTimeout.seconds=0

diff --git a/jetty-infinispan/infinispan-remote-query/pom.xml b/jetty-infinispan/infinispan-remote-query/pom.xml
@@ -61,31 +61,14 @@
             <configuration>
               <target>
                 <concat destfile="${project.build.directory}/infinispan-remote-query-libs.mod">
-                  <fileset file="src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-query-libs.mod" />
+                  <fileset file="${project.build.directory}/jetty-config-files/modules/sessions/infinispan/remote/infinispan-remote-query-libs.mod" />
                   <fileset file="${project.build.directory}/deps.txt" />
                 </concat>
               </target>
             </configuration>
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/config.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>

diff --git a/jetty-infinispan/infinispan-remote-query/src/main/assembly/config.xml b/jetty-infinispan/infinispan-remote-query/src/main/assembly/config.xml
@@ -7,7 +7,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>src/main/config-template</directory>
+      <directory>${project.build.directory}/jetty-config-files</directory>
       <outputDirectory></outputDirectory>
       <includes>
         <include>**</include>
@@ -17,7 +17,7 @@
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>target</directory>
+      <directory>${project.build.directory}</directory>
       <outputDirectory>modules/sessions/infinispan/remote</outputDirectory>
       <includes>
         <include>infinispan-remote-query-libs.mod</include>

diff --git a/jetty-infinispan/infinispan-remote/pom.xml b/jetty-infinispan/infinispan-remote/pom.xml
@@ -62,32 +62,14 @@
             <configuration>
               <target>
                 <concat destfile="${project.build.directory}/infinispan-remote-libs.mod">
-                  <fileset file="src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-libs.mod" />
+                  <fileset file="${project.build.directory}/jetty-config-files/modules/sessions/infinispan/remote/infinispan-remote-libs.mod" />
                   <fileset file="${project.build.directory}/deps.txt" />
                 </concat>
               </target>
             </configuration>
           </execution>
         </executions>
       </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/config.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <dependencies>

diff --git a/jetty-infinispan/infinispan-remote/src/main/assembly/config.xml b/jetty-infinispan/infinispan-remote/src/main/assembly/config.xml
@@ -7,7 +7,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>src/main/config-template</directory>
+      <directory>${project.build.directory}/jetty-config-files</directory>
       <outputDirectory></outputDirectory>
       <includes>
         <include>**</include>
@@ -17,7 +17,7 @@
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>target</directory>
+      <directory>${project.build.directory}</directory>
       <outputDirectory>modules/sessions/infinispan/remote</outputDirectory>
       <includes>
         <include>infinispan-remote-libs.mod</include>

diff --git a/...an/infinispan-remote/src/main/config-template/modules/session-store-infinispan-remote.mod b/...an/infinispan-remote/src/main/config-template/modules/session-store-infinispan-remote.mod
@@ -16,7 +16,7 @@ sessions/infinispan/remote/infinispan-remote-libs
 basehome:modules/sessions/infinispan/remote/resources/hotrod-client.properties|resources/hotrod-client.properties
 
 [ini]
-infinispan.version?=11.0.11.Final
+infinispan.version?=@infinispan.version@
 
 
 [license]

diff --git a/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-memcached/jetty-memcached-sessions/pom.xml
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>com.googlecode.xmemcached</groupId>
       <artifactId>xmemcached</artifactId>
-      <version>2.4.7</version>
+      <version>${xmemcached.version}</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>