inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/V2.4' into merge-2.5/RM-3265_to2.5_3

Browse Source 
Conflicts:
	pom.xml
	rm-enterprise/rm-enterprise-repo/pom.xml
	rm-enterprise/rm-enterprise-share/pom.xml
This commit is contained in:
Tuna Aksoy
2017-03-21 06:09:44 +00:00
parent b49015a804 2c295a35f4
commit 8591b2cad4
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -24,7 +24,6 @@
<connection>scm:git:https://git.alfresco.com/records-management/records-management.git</connection> <connection>scm:git:https://git.alfresco.com/records-management/records-management.git</connection>
<developerConnection>scm:git:https://git.alfresco.com/records-management/records-management.git</developerConnection> <developerConnection>scm:git:https://git.alfresco.com/records-management/records-management.git</developerConnection>
<url>https://git.alfresco.com/records-management/records-management</url> <url>https://git.alfresco.com/records-management/records-management</url>
<tag>HEAD</tag>
</scm> </scm>
<issueManagement> <issueManagement>
@@ -114,7 +113,6 @@
</profiles> </profiles>
<properties> <properties>
<alfresco.rm.version>${project.version}</alfresco.rm.version>
<alfresco.db.params>AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE</alfresco.db.params> <alfresco.db.params>AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE</alfresco.db.params>
<maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies> <maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies>
<maven.build.sourceVersion>1.7</maven.build.sourceVersion> <maven.build.sourceVersion>1.7</maven.build.sourceVersion>
@@ -172,7 +170,7 @@
</regexPropertySetting> </regexPropertySetting>
<regexPropertySetting> <regexPropertySetting>
<name>rm.module.version</name> <name>rm.module.version</name>
<value>${alfresco.rm.version}</value> <value>${project.version}</value>
<regex>([0-9\.]*[0-9]).*</regex> <regex>([0-9\.]*[0-9]).*</regex>
<replacement>$1</replacement> <replacement>$1</replacement>
<failIfNoMatch>false</failIfNoMatch> <failIfNoMatch>false</failIfNoMatch>