Merge branch 'feature-2.3/RM-4245_update_module_version' into release/V2.3

This commit is contained in:
Mihai Cozma
2016-10-14 11:38:51 +03:00
3 changed files with 31 additions and 2 deletions

15
pom.xml
View File

@@ -311,6 +311,21 @@
<ignore /> <ignore />
</action> </action>
</pluginExecution> </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> </pluginExecutions>
</lifecycleMappingMetadata> </lifecycleMappingMetadata>
</configuration> </configuration>

View File

@@ -6,6 +6,6 @@ module.aliases=org_alfresco_module_dod5015
module.title=Records Management module.title=Records Management
module.description=Alfresco Record Management Extension module.description=Alfresco Record Management Extension
module.version=2.3 module.version=${rm.module.version}
module.repo.version.min=4.2.2 module.repo.version.min=4.2.2

View File

@@ -19,6 +19,7 @@
<resources> <resources>
<resource> <resource>
<directory>config</directory> <directory>config</directory>
<filtering>true</filtering>
</resource> </resource>
</resources> </resources>
<testResources> <testResources>
@@ -32,6 +33,19 @@
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<executions> <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> <execution>
<id>add-source</id> <id>add-source</id>
<goals> <goals>
@@ -154,7 +168,7 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <tasks>
<delete file="${project.build.outputDirectory}/alfresco/extension/dev-context.xml"/> <delete file="${project.build.outputDirectory}/alfresco/extension/dev-context.xml"/>
<move todir="${project.build.directory}/${project.build.finalName}/config/alfresco"> <move todir="${project.build.directory}/${project.build.finalName}/config/alfresco">
<fileset dir="${project.build.outputDirectory}/alfresco"/> <fileset dir="${project.build.outputDirectory}/alfresco"/>