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

Merge release/V2.5-EA1 into master.

Browse Source
This commit is contained in:
Tom Page
2016-06-29 14:13:45 +01:00
parent 1de53bd52b 604975fed9
commit 8fe79fb6ba
4 changed files with 775 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

@@ -89,7 +89,6 @@
</modules> </modules>
<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>
@@ -146,7 +145,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>(\d+)\.(\d+).*</regex> <regex>(\d+)\.(\d+).*</regex>
<replacement>$1.$2</replacement> <replacement>$1.$2</replacement>
<failIfNoMatch>false</failIfNoMatch> <failIfNoMatch>false</failIfNoMatch>

3
rm-automation/pom.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-rm-automation</artifactId> <artifactId>alfresco-rm-automation</artifactId>