inteligr8/acs-community-packaging
1
0
Fork 0
mirror of https://github.com/Alfresco/acs-community-packaging.git synced 2025-09-17 14:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/REPO-2627_Cluster-Test

Browse Source 
# Conflicts:
#	zip/pom.xml
This commit is contained in:
Martin Muller
2017-10-18 17:03:54 +01:00
parent e5d1bf4b69 896b35e2c0
commit 29793642bd
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@@ -8,7 +8,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-super-pom</artifactId> <artifactId>alfresco-super-pom</artifactId>
<version>8</version> <version>9</version>
</parent> </parent>
<modules> <modules>
@@ -37,7 +37,10 @@
<properties> <properties>
<dependency.alfresco-repository.version>6.4</dependency.alfresco-repository.version> <!-- Set to "Early Access" to add to the version.edition property in version.properties -->
<release.availability />
<dependency.alfresco-repository.version>6.8</dependency.alfresco-repository.version>
<dependency.alfresco-remote-api.version>6.2</dependency.alfresco-remote-api.version> <dependency.alfresco-remote-api.version>6.2</dependency.alfresco-remote-api.version>
<dependency.alfresco-trashcan-cleaner.version>2.2</dependency.alfresco-trashcan-cleaner.version> <dependency.alfresco-trashcan-cleaner.version>2.2</dependency.alfresco-trashcan-cleaner.version>
<dependency.alfresco-core.version>6.13</dependency.alfresco-core.version> <dependency.alfresco-core.version>6.13</dependency.alfresco-core.version>

2
war/src/main/resources/alfresco/version.properties
View File

@@ -11,7 +11,7 @@ version.label=
# Edition label # Edition label
version.edition=Community version.edition=Community @release.availability@
# SCM Revision number # SCM Revision number