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

Merged 5.2.N_REBRANDING (5.2.N_REBRANDING) to 5.2.N (5.2.1)

Browse Source 
133125 adavis: REPO-1458 build artifact names


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@133250 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-11-28 20:58:14 +00:00
parent c0166a1d7a
commit d37e1e6793
8 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
distribution/pom.xml
View File

@@ -6,7 +6,7 @@
<artifactId>alfresco-full-installation</artifactId>
<version>5.2.1-SNAPSHOT</version>
</parent>
<artifactId>alfresco-community-distribution</artifactId>
<artifactId>alfresco-content-services-community-distribution</artifactId>
<packaging>jar</packaging>
<name>Alfresco Full Distribution (Community Edition)</name>

2
distribution/src/assembly/full-distribution.xml
View File

@@ -20,7 +20,7 @@
<!-- Platform Enterprise Distribution -->
<fileSet>
<directory>${project.build.directory}/dependency/alfresco-one-platform-distributionzip-${alfresco.platform.version}</directory>
<directory>${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}</directory>
<outputDirectory/>
</fileSet>

8
ear/pom.xml
View File

@@ -53,7 +53,7 @@
<!-- Distribution zip -->
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-one-platform-distributionzip</artifactId>
<artifactId>alfresco-content-services-platform-distributionzip</artifactId>
<version>${alfresco.platform.version}</version>
<type>zip</type>
<scope>provided</scope>
@@ -228,9 +228,9 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeArtifactIds>alfresco-one-platform-distributionzip</includeArtifactIds>
<includeArtifactIds>alfresco-content-services-platform-distributionzip</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
<excludes>alfresco-one-platform-distributionzip-${alfresco.platform.version}/solr4/,alfresco-one-platform-distributionzip-${alfresco.platform.version}/web-server/webapps/,alfresco-one-platform-distributionzip-${alfresco.platform.version}/modules/</excludes>
<excludes>alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/solr4/,alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/web-server/webapps/,alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/modules/</excludes>
</configuration>
</execution>
@@ -262,7 +262,7 @@
<version>1.0.1</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/dependency/alfresco-one-platform-distributionzip-${alfresco.platform.version}/web-server/lib</outputDirectory>
<outputDirectory>${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/web-server/lib</outputDirectory>
</configuration>
</execution>
</executions>

6
ear/src/assembly/ear-distribution.xml
View File

@@ -8,14 +8,14 @@
<fileSets>
<fileSet>
<directory>${project.build.directory}/dependency/alfresco-one-platform-distributionzip-${alfresco.platform.version}</directory>
<directory>${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}</directory>
<outputDirectory/>
<excludes>
<exclude>web-server/shared/**</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/dependency/alfresco-one-platform-distributionzip-${alfresco.platform.version}/web-server/shared/classes</directory>
<directory>${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/web-server/shared/classes</directory>
<outputDirectory>web-server/classpath</outputDirectory>
</fileSet>
<fileSet>
@@ -30,7 +30,7 @@
</file>
<file>
<source>${project.build.directory}/alfresco-ear-distribution-${project.version}.ear</source>
<destName>alfresco-one-${project.version}.ear</destName>
<destName>alfresco-content-services-${project.version}.ear</destName>
</file>
</files>
</assembly>

6
enterprise-distribution/pom.xml
View File

@@ -6,7 +6,7 @@
<artifactId>alfresco-full-installation</artifactId>
<version>5.2.1-SNAPSHOT</version>
</parent>
<artifactId>alfresco-one-distribution</artifactId>
<artifactId>alfresco-content-services-distribution</artifactId>
<packaging>jar</packaging>
<name>Alfresco Full Distribution (Enterprise Edition)</name>
@@ -19,7 +19,7 @@
<!-- Platform Distribution -->
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-one-platform-distributionzip</artifactId>
<artifactId>alfresco-content-services-platform-distributionzip</artifactId>
<version>${alfresco.platform.version}</version>
<type>zip</type>
<exclusions>
@@ -81,7 +81,7 @@
<artifactItems>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-one-platform-distributionzip</artifactId>
<artifactId>alfresco-content-services-platform-distributionzip</artifactId>
<version>${alfresco.platform.version}</version>
<type>zip</type>
</artifactItem>

10
enterprise-installer/pom.xml
View File

@@ -6,7 +6,7 @@
<artifactId>alfresco-full-installation</artifactId>
<version>5.2.1-SNAPSHOT</version>
</parent>
<artifactId>alfresco-one-installer</artifactId>
<artifactId>alfresco-content-services-installer</artifactId>
<packaging>pom</packaging>
<name>Alfresco Enterprise Full Installers</name>
@@ -32,7 +32,7 @@
<!-- Override alfresco.package.name for the installer naming (Different from the zip distribution naming) -->
<alfresco.package.name>alfresco-one</alfresco.package.name>
<alfresco.distribution.name>alfresco-one-distribution</alfresco.distribution.name>
<alfresco.distribution.name>alfresco-content-services-distribution</alfresco.distribution.name>
<!--
Override alfresco.installer.name for the Enterprise installer that is still using
@@ -45,7 +45,7 @@
<!-- Import the dependencies from the Community installer -->
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-installer</artifactId>
<artifactId>alfresco-content-services-community-installer</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
@@ -73,13 +73,13 @@
<artifactItems>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-one-installer-resources</artifactId>
<artifactId>alfresco-content-services-installer-resources</artifactId>
<version>${alfresco.platform.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-one-distribution</artifactId>
<artifactId>alfresco-content-services-distribution</artifactId>
<version>${project.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/distribution</outputDirectory>

4
installer/pom.xml
View File

@@ -6,7 +6,7 @@
<artifactId>alfresco-full-installation</artifactId>
<version>5.2.1-SNAPSHOT</version>
</parent>
<artifactId>alfresco-community-installer</artifactId>
<artifactId>alfresco-content-services-community-installer</artifactId>
<packaging>pom</packaging>
<name>Alfresco Community Full Installers</name>
@@ -302,7 +302,7 @@
</artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-distribution</artifactId>
<artifactId>alfresco-content-services-community-distribution</artifactId>
<version>${project.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/distribution</outputDirectory>

2
pom.xml
View File

@@ -53,7 +53,7 @@
-->
<installer.version.name>${installer.build.timestamp}-${installer.build.number}</installer.version.name>
<alfresco.package.name>alfresco-community</alfresco.package.name>
<alfresco.package.name>alfresco-content-services-community</alfresco.package.name>
<alfresco.distribution.name>${alfresco.package.name}-distribution</alfresco.distribution.name>
</properties>