Issue #3514 interpolation of versions from pom in mod files

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
jetty · Sep 16, 2021 · 0550774 · 0550774
1 parent cd71e47
commit 0550774
Show file tree

Hide file tree

Showing 11 changed files with 118 additions and 10 deletions.
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>
@@ -865,6 +871,46 @@
       <type>jar</type>
       <optional>true</optional>
     </dependency>
+    <!-- adding those dependencies to ensure they are resolved and even kick upgrade from dependabot -->
+    <dependency>
+      <groupId>io.hawt</groupId>
+      <artifactId>hawtio-default</artifactId>
+      <version>${hawtio.version}</version>
+      <type>war</type>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.jamonapi</groupId>
+      <artifactId>jamon</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.jamonapi</groupId>
+      <artifactId>jamon_war</artifactId>
+      <optional>true</optional>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>org.jolokia</groupId>
+      <artifactId>jolokia-war</artifactId>
+      <optional>true</optional>
+      <type>war</type>
+    </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/pom.xml b/pom.xml
@@ -21,6 +21,7 @@
     <build-support.version>1.5</build-support.version>
     <checkstyle.version>9.0</checkstyle.version>
     <slf4j.version>2.0.0-alpha5</slf4j.version>
+    <log4j.version>1.2.17</log4j.version>
     <log4j2.version>2.14.0</log4j2.version>
     <logback.version>1.3.0-alpha9</logback.version>
     <disruptor.version>3.4.2</disruptor.version>
@@ -32,6 +33,9 @@
     <infinispan.protostream.version>4.3.4.Final</infinispan.protostream.version>
     <gson.version>2.8.8</gson.version>
     <grpc.version>1.40.1</grpc.version>
+    <hawtio.version>2.13.5</hawtio.version>
+    <jamon.version>2.81</jamon.version>
+    <jolokia.version>1.3.3</jolokia.version>
     <google.errorprone.version>2.9.0</google.errorprone.version>
     <alpn.agent.version>2.0.10</alpn.agent.version>
     <hazelcast.version>4.2.2</hazelcast.version>
@@ -1245,6 +1249,7 @@
         <artifactId>jetty-perf-helper</artifactId>
         <version>${jetty.perf-helper.version}</version>
       </dependency>
+      <!-- logging -->
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>jcl104-over-slf4j</artifactId>
@@ -1271,11 +1276,26 @@
         <version>${slf4j.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>${log4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-api</artifactId>
+        <version>${log4j2.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.jboss.logging</groupId>
         <artifactId>jboss-logging</artifactId>
         <version>${jboss.logging.version}</version>
       </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-core</artifactId>
+        <version>${logback.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.asciidoctor</groupId>
         <artifactId>asciidoctor-maven-plugin</artifactId>
@@ -1332,6 +1352,42 @@
         <artifactId>commons-lang3</artifactId>
         <version>3.12.0</version>
       </dependency>
+      <!-- some modules use those artifacts so we can manage version from here -->
+      <dependency>
+        <groupId>io.hawt</groupId>
+        <artifactId>hawtio-default</artifactId>
+        <version>${hawtio.version}</version>
+        <type>war</type>
+      </dependency>
+      <dependency>
+        <groupId>com.jamonapi</groupId>
+        <artifactId>jamon</artifactId>
+        <version>${jamon.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>com.jamonapi</groupId>
+        <artifactId>jamon_war</artifactId>
+        <version>${jamon.version}</version>
+        <type>war</type>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.jolokia</groupId>
+        <artifactId>jolokia-war</artifactId>
+        <version>${jolokia.version}</version>
+        <type>war</type>
+      </dependency>
     </dependencies>
   </dependencyManagement>