From 78b4ef2f10c846d0124d87472f12c3065a73dc9f Mon Sep 17 00:00:00 2001
From: Olivier Lamy <oliver.lamy@gmail.com>
Date: Tue, 14 Sep 2021 15:31:55 +1000
Subject: [PATCH] Issue #3514 start work on interpolation of mod files

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
---
 .../sessions/infinispan/infinispan-common.mod |  2 +-
 pom.xml                                       | 39 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/jetty-infinispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod b/jetty-infinispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod
index 02a77867610a..d8a8ea4e4cbd 100644
--- a/jetty-infinispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod
+++ b/jetty-infinispan/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?=9.4.8.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/pom.xml b/pom.xml
index 1b1cf0113a78..ed96ba245a0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -479,7 +479,7 @@
             <dependency>
               <groupId>org.eclipse.jetty.toolchain</groupId>
               <artifactId>jetty-assembly-descriptors</artifactId>
-              <version>1.0</version>
+              <version>1.1-SNAPSHOT</version>
             </dependency>
           </dependencies>
         </plugin>
@@ -1424,6 +1424,41 @@
       </activation>
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-resources</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>copy-resources</goal>
+                </goals>
+                <configuration>
+                  <encoding>UTF-8</encoding>
+                  <useDefaultDelimiters>true</useDefaultDelimiters>
+<!--                  <delimiters>-->
+<!--                    <delimiter>@</delimiter>-->
+<!--                  </delimiters>-->
+                  <outputDirectory>${project.build.directory}/jetty-config-files</outputDirectory>
+                  <resources>
+                    <resource>
+                      <directory>src/main/config</directory>
+                      <filtering>true</filtering>
+<!--                      <includes>-->
+<!--                        <include>**/*.mod</include>-->
+<!--                        <include>**/.xml</include>-->
+<!--                        <include>**/*.properties</include>-->
+<!--                      </includes>-->
+                      <excludes>
+                        <exclude>**/*.p12</exclude>
+                      </excludes>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-assembly-plugin</artifactId>
@@ -1436,7 +1471,7 @@
                 </goals>
                 <configuration>
                   <descriptorRefs>
-                    <descriptorRef>config</descriptorRef>
+                    <descriptorRef>config-filtered</descriptorRef>
                   </descriptorRefs>
                 </configuration>
               </execution>