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

Creation of feature/ags-merge branch with all previous commits but without excessive history

Browse Source 
Note pom.xml versions have been reset to the values that were on the feature/ags/master
branches to simplify getting local changes onto this new branch.

alfresco-communiy-repo    11.14-ags-1.0-SNAPSHOT -> 11.7-ags-1.0-SNAPSHOT
alfresco-enterprise-repo  11.18-ags-1.0-SNAPSHOT -> 11.8-ags-1.0-SNAPSHOT
alfresco-enterprise-share 11.5-ags-1.0-SNAPSHOT -> 11.4-ags-1.0-SNAPSHOT

(cherry picked from commit 5857919ca1)

# Conflicts:
#	amps/ags/pom.xml
#	amps/ags/rm-automation/pom.xml
#	amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
#	amps/ags/rm-community/pom.xml
#	amps/ags/rm-community/rm-community-repo/pom.xml
#	amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
#	amps/pom.xml
#	amps/share-services/pom.xml
#	core/pom.xml
#	data-model/pom.xml
#	packaging/distribution/pom.xml
#	packaging/docker-alfresco/pom.xml
#	packaging/pom.xml
#	packaging/tests/pom.xml
#	packaging/tests/tas-cmis/pom.xml
#	packaging/tests/tas-email/pom.xml
#	packaging/tests/tas-integration/pom.xml
#	packaging/tests/tas-restapi/pom.xml
#	packaging/tests/tas-webdav/pom.xml
#	packaging/war/pom.xml
#	pom.xml
#	remote-api/pom.xml
#	repository/pom.xml
This commit is contained in:
alandavis
2021-05-05 21:06:09 +01:00
parent 7aa93a4073
commit 67b04d4a4b
27 changed files with 499 additions and 988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
repository/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>11.21-ags-1.0-SNAPSHOT</version>
<version>11.7-ags-1.0-SNAPSHOT</version>
</parent>
<dependencies>
@@ -841,17 +841,14 @@
<dependency>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-spec</artifactId>
<version>${dependency.apache.taglibs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-impl</artifactId>
<version>${dependency.apache.taglibs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-jstlel</artifactId>
<version>${dependency.apache.taglibs.version}</version>
</dependency>
<!-- Repo Event Model-->
<dependency>