From 747ac95e206edfbe8613b4ef037c00f782b5097f Mon Sep 17 00:00:00 2001
From: Mihai Cozma <mihai.cozma@savatech.ro>
Date: Thu, 13 Oct 2016 15:37:54 +0300
Subject: [PATCH 1/3] RM-4245_update_module_version

---
 pom.xml                                       | 45 +++++++++++++++++++
 .../org_alfresco_module_rm/module.properties  |  2 +-
 rm-server/pom.xml                             | 16 ++++++-
 3 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f9872a4b4a..6784705b6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,36 @@
 
    <build>
       <plugins>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>regex-property</id>
+                  <goals>
+                     <goal>regex-property</goal>
+                  </goals>
+                  <configuration>
+                     <name>rm.module.version</name>
+                     <value>${project.version}</value>
+                     <regex>(\d+)\.(\d+).(\d+).*</regex>
+                     <replacement>$1.$2.$3</replacement>
+                     <failIfNoMatch>true</failIfNoMatch>
+                  </configuration>
+               </execution>
+               <execution>
+                  <id>add-test-source</id>
+                  <goals>
+                     <goal>add-test-source</goal>
+                  </goals>
+                  <configuration>
+                     <sources>
+                        <source>unit-test/java</source>
+                     </sources>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-enforcer-plugin</artifactId>
@@ -311,6 +341,21 @@
                               <ignore />
                            </action>
                         </pluginExecution>
+                        <pluginExecution>
+                           <pluginExecutionFilter>
+                              <groupId>org.codehaus.mojo</groupId>
+                              <artifactId>
+                                 build-helper-maven-plugin
+                              </artifactId>
+                              <versionRange>[1.8,)</versionRange>
+                              <goals>
+                                 <goal>regex-property</goal>
+                              </goals>
+                           </pluginExecutionFilter>
+                           <action>
+                              <ignore></ignore>
+                           </action>
+                        </pluginExecution>
                      </pluginExecutions>
                   </lifecycleMappingMetadata>
                </configuration>
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties
index d4d49678db..ac31d2f2ee 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties
@@ -6,6 +6,6 @@ module.aliases=org_alfresco_module_dod5015
 
 module.title=Records Management
 module.description=Alfresco Record Management Extension
-module.version=2.3
+module.version=${rm.module.version}
 
 module.repo.version.min=4.2.2
diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index 9a9d09695b..7256d117b4 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -19,6 +19,7 @@
       <resources>
          <resource>
             <directory>config</directory>
+             <filtering>true</filtering>
          </resource>
       </resources>
       <testResources>
@@ -32,6 +33,19 @@
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>build-helper-maven-plugin</artifactId>
             <executions>
+                 <execution>
+                  <id>regex-property</id>
+                  <goals>
+                     <goal>regex-property</goal>
+                  </goals>
+                  <configuration>
+                     <name>rm.module.version</name>
+                     <value>${project.version}</value>
+                     <regex>(\d+)\.(\d+).(\d+).*</regex>
+                     <replacement>$1.$2.$3</replacement>
+                     <failIfNoMatch>true</failIfNoMatch>
+                  </configuration>
+               </execution>
                <execution>
                   <id>add-source</id>
                   <goals>
@@ -154,7 +168,7 @@
                            <goal>run</goal>
                         </goals>
                         <configuration>
-                           <tasks>
+                        <tasks>
                               <delete file="${project.build.outputDirectory}/alfresco/extension/dev-context.xml"/>
                               <move todir="${project.build.directory}/${project.build.finalName}/config/alfresco">
                                  <fileset dir="${project.build.outputDirectory}/alfresco"/>

From cabaa629af8b81d0af757250a5644c8cf3d4b2d3 Mon Sep 17 00:00:00 2001
From: Mihai Cozma <mihai.cozma@savatech.ro>
Date: Thu, 13 Oct 2016 17:08:59 +0300
Subject: [PATCH 2/3] Fixed to handle more digits

---
 pom.xml           | 4 ++--
 rm-server/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6784705b6b..12ef840712 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,8 +97,8 @@
                   <configuration>
                      <name>rm.module.version</name>
                      <value>${project.version}</value>
-                     <regex>(\d+)\.(\d+).(\d+).*</regex>
-                     <replacement>$1.$2.$3</replacement>
+                     <regex>([0-9\.]*[0-9]).*</regex>
+                     <replacement>$1</replacement>
                      <failIfNoMatch>true</failIfNoMatch>
                   </configuration>
                </execution>
diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index 7256d117b4..a4554801db 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -41,8 +41,8 @@
                   <configuration>
                      <name>rm.module.version</name>
                      <value>${project.version}</value>
-                     <regex>(\d+)\.(\d+).(\d+).*</regex>
-                     <replacement>$1.$2.$3</replacement>
+                     <regex>([0-9\.]*[0-9]).*</regex>
+                     <replacement>$1</replacement>
                      <failIfNoMatch>true</failIfNoMatch>
                   </configuration>
                </execution>

From 5937ac38cb31099a314ea1637fc90ce1599c65c1 Mon Sep 17 00:00:00 2001
From: Mihai Cozma <mihai.cozma@savatech.ro>
Date: Fri, 14 Oct 2016 11:18:28 +0300
Subject: [PATCH 3/3] add symetrical build-helper-maven-plugin for both
 rm-share and rm-server

---
 pom.xml | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/pom.xml b/pom.xml
index 12ef840712..e5f5f35ebe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,36 +85,6 @@
 
    <build>
       <plugins>
-         <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>regex-property</id>
-                  <goals>
-                     <goal>regex-property</goal>
-                  </goals>
-                  <configuration>
-                     <name>rm.module.version</name>
-                     <value>${project.version}</value>
-                     <regex>([0-9\.]*[0-9]).*</regex>
-                     <replacement>$1</replacement>
-                     <failIfNoMatch>true</failIfNoMatch>
-                  </configuration>
-               </execution>
-               <execution>
-                  <id>add-test-source</id>
-                  <goals>
-                     <goal>add-test-source</goal>
-                  </goals>
-                  <configuration>
-                     <sources>
-                        <source>unit-test/java</source>
-                     </sources>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-enforcer-plugin</artifactId>