mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Creation of feature/ags-merge branch with all previous commits but without excessive history
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
@@ -4,17 +4,23 @@
|
||||
<name>Alfresco Share Services AMP</name>
|
||||
<description>Module to be applied to alfresco.war, containing APIs for Alfresco Share</description>
|
||||
<packaging>amp</packaging>
|
||||
|
||||
<parent>
|
||||
<artifactId>alfresco-share-parent</artifactId>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<version>11.1-SNAPSHOT</version>
|
||||
<artifactId>alfresco-community-repo-amps</artifactId>
|
||||
<version>11.7-ags-1.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
<scm-path>${project.parent.scm.url}</scm-path>
|
||||
<scm-revision>${buildNumber}</scm-revision>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-remote-api</artifactId>
|
||||
<version>${dependency.alfresco-community-repo.version}</version>
|
||||
<version>${project.version}</version>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
@@ -35,7 +41,7 @@
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-core</artifactId>
|
||||
<version>${dependency.alfresco-community-repo.version}</version>
|
||||
<version>${project.version}</version>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
@@ -62,13 +68,12 @@
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.13.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-repository</artifactId>
|
||||
<version>${dependency.alfresco-community-repo.version}</version>
|
||||
<version>${project.version}</version>
|
||||
<classifier>tests</classifier>
|
||||
<scope>test</scope>
|
||||
<exclusions>
|
||||
@@ -94,7 +99,7 @@
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-remote-api</artifactId>
|
||||
<version>${dependency.alfresco-community-repo.version}</version>
|
||||
<version>${project.version}</version>
|
||||
<classifier>tests</classifier>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
@@ -117,21 +122,9 @@
|
||||
<version>${dependency.spring.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<!-- <dependency>
|
||||
<groupId>org.postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
-->
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<version>4.0.1</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
@@ -188,13 +181,13 @@
|
||||
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
|
||||
</manifest>
|
||||
<manifestEntries>
|
||||
<Specification-Version>${version.major}.${version.minor}.${version.revision}</Specification-Version>
|
||||
<Specification-Version>${acs.version.major}.${acs.version.minor}.${acs.version.revision}</Specification-Version>
|
||||
<Implementation-Version>${project.version}</Implementation-Version>
|
||||
<Build-Date>${maven.build.timestamp}</Build-Date>
|
||||
<Build-Name>${bamboo_planName}</Build-Name>
|
||||
<Build-Key>${bamboo_fullBuildKey}</Build-Key>
|
||||
<Build-Number>${bamboo_buildNumber}</Build-Number>
|
||||
<Build-Revision>${bamboo_repository_revision_number}</Build-Revision>
|
||||
<Build-Number>${build-number}</Build-Number>
|
||||
<Build-Revision>${scm-revision}</Build-Revision>
|
||||
</manifestEntries>
|
||||
</archive>
|
||||
</configuration>
|
||||
@@ -205,6 +198,7 @@
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-test</id>
|
||||
|
||||
<!-- No unit tests in this project - all tests are integration tests -->
|
||||
<configuration>
|
||||
<includes>
|
||||
|
||||
Reference in New Issue
Block a user