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

REPO-2804 Rename artefacts, change dependencies to new repos

Browse Source
This commit is contained in:
Alex Mukha
2017-08-23 10:29:31 +01:00
parent ced56766cb caaa53aa87
commit db6659ff60
9 changed files with 73 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
distribution/pom.xml
View File

@@ -6,9 +6,9 @@
<artifactId>alfresco-full-installation</artifactId> <artifactId>alfresco-full-installation</artifactId>
<version>5.3-SNAPSHOT</version> <version>5.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>alfresco-community-distribution</artifactId> <artifactId>alfresco-content-services-community-full-distribution</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Alfresco Full Distribution (Community Edition)</name> <name>Alfresco Content Services Community Full Distribution</name>
<!-- To replace in share-config-custom.xml --> <!-- To replace in share-config-custom.xml -->
<properties> <properties>
@@ -19,7 +19,7 @@
<!-- Platform Distribution --> <!-- Platform Distribution -->
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-platform-community-distributionzip</artifactId> <artifactId>alfresco-content-services-community-distribution</artifactId>
<version>${alfresco.platform.version}</version> <version>${alfresco.platform.version}</version>
<type>zip</type> <type>zip</type>
<exclusions> <exclusions>
@@ -34,7 +34,7 @@
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4-distribution</artifactId> <artifactId>alfresco-solr4-distribution</artifactId>
<version>${alfresco.platform.version}</version> <version>${alfresco.solr4.version}</version>
<type>zip</type> <type>zip</type>
<exclusions> <exclusions>
<exclusion> <exclusion>
@@ -81,14 +81,14 @@
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-platform-community-distributionzip</artifactId> <artifactId>alfresco-content-services-community-distribution</artifactId>
<version>${alfresco.platform.version}</version> <version>${alfresco.platform.version}</version>
<type>zip</type> <type>zip</type>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4-distribution</artifactId> <artifactId>alfresco-solr4-distribution</artifactId>
<version>${alfresco.platform.version}</version> <version>${alfresco.solr4.version}</version>
<type>zip</type> <type>zip</type>
<outputDirectory>${project.build.directory}/dependency/solr4</outputDirectory> <outputDirectory>${project.build.directory}/dependency/solr4</outputDirectory>
</artifactItem> </artifactItem>

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

@@ -1,6 +1,9 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>distribution</id> <id>distribution</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats> <formats>
<format>zip</format> <format>zip</format>
</formats> </formats>
@@ -14,13 +17,13 @@
<!-- Platform Community Distribution --> <!-- Platform Community Distribution -->
<fileSet> <fileSet>
<directory>${project.build.directory}/dependency/alfresco-platform-community-distributionzip-${alfresco.platform.version}</directory> <directory>${project.build.directory}/dependency/alfresco-content-services-community-distribution-${alfresco.platform.version}</directory>
<outputDirectory/> <outputDirectory/>
</fileSet> </fileSet>
<!-- Platform Enterprise Distribution --> <!-- Platform Enterprise Distribution -->
<fileSet> <fileSet>
<directory>${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}</directory> <directory>${project.build.directory}/dependency/alfresco-content-services-distribution-${alfresco.platform.version}</directory>
<outputDirectory/> <outputDirectory/>
</fileSet> </fileSet>

18
ear/pom.xml
View File

@@ -1,7 +1,7 @@
<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"> <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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-content-services-ear-distribution</artifactId> <artifactId>alfresco-content-services-full-ear-distribution</artifactId>
<name>Alfresco EAR Distribution</name> <name>Alfresco Content Services Full EAR Distribution</name>
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-full-installation</artifactId> <artifactId>alfresco-full-installation</artifactId>
@@ -26,7 +26,7 @@
<!-- WARs to include in the EAR --> <!-- WARs to include in the EAR -->
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-enterprise-war-for-ear</artifactId> <artifactId>alfresco-content-services-war-for-ear</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
@@ -53,8 +53,8 @@
<!-- Distribution zip --> <!-- Distribution zip -->
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-platform-distributionzip</artifactId> <artifactId>alfresco-content-services-full-distribution</artifactId>
<version>${alfresco.platform.version}</version> <version>${project.version}</version>
<type>zip</type> <type>zip</type>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
@@ -196,7 +196,7 @@
<modules> <modules>
<webModule> <webModule>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-enterprise-war-for-ear</artifactId> <artifactId>alfresco-content-services-war-for-ear</artifactId>
<bundleFileName>alfresco.war</bundleFileName> <bundleFileName>alfresco.war</bundleFileName>
</webModule> </webModule>
<webModule> <webModule>
@@ -228,9 +228,9 @@
<goal>unpack-dependencies</goal> <goal>unpack-dependencies</goal>
</goals> </goals>
<configuration> <configuration>
<includeArtifactIds>alfresco-content-services-platform-distributionzip</includeArtifactIds> <includeArtifactIds>alfresco-content-services-full-distribution</includeArtifactIds>
<excludeTransitive>true</excludeTransitive> <excludeTransitive>true</excludeTransitive>
<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> <excludes>alfresco-content-services-full-distribution-${alfresco.platform.version}/solr4/,alfresco-content-services-full-distribution-${alfresco.platform.version}/web-server/webapps/,alfresco-content-services-full-distribution-${alfresco.platform.version}/modules/</excludes>
</configuration> </configuration>
</execution> </execution>
@@ -262,7 +262,7 @@
<version>1.0.1</version> <version>1.0.1</version>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
<outputDirectory>${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/web-server/lib</outputDirectory> <outputDirectory>${project.build.directory}/dependency/alfresco-content-services-full-distribution-${alfresco.platform.version}/web-server/lib</outputDirectory>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

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

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

13
enterprise-distribution/pom.xml
View File

@@ -6,9 +6,9 @@
<artifactId>alfresco-full-installation</artifactId> <artifactId>alfresco-full-installation</artifactId>
<version>5.3-SNAPSHOT</version> <version>5.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>alfresco-content-services-distribution</artifactId> <artifactId>alfresco-content-services-full-distribution</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Alfresco Full Distribution (Enterprise Edition)</name> <name>Alfresco Content Services Full Distribution</name>
<!-- To replace in share-config-custom.xml --> <!-- To replace in share-config-custom.xml -->
<properties> <properties>
@@ -16,10 +16,9 @@
</properties> </properties>
<dependencies> <dependencies>
<!-- Platform Distribution -->
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-platform-distributionzip</artifactId> <artifactId>alfresco-content-services-distribution</artifactId>
<version>${alfresco.platform.version}</version> <version>${alfresco.platform.version}</version>
<type>zip</type> <type>zip</type>
<exclusions> <exclusions>
@@ -34,7 +33,7 @@
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4-distribution</artifactId> <artifactId>alfresco-solr4-distribution</artifactId>
<version>${alfresco.platform.version}</version> <version>${alfresco.solr4.version}</version>
<type>zip</type> <type>zip</type>
<exclusions> <exclusions>
<exclusion> <exclusion>
@@ -81,14 +80,14 @@
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-platform-distributionzip</artifactId> <artifactId>alfresco-content-services-distribution</artifactId>
<version>${alfresco.platform.version}</version> <version>${alfresco.platform.version}</version>
<type>zip</type> <type>zip</type>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4-distribution</artifactId> <artifactId>alfresco-solr4-distribution</artifactId>
<version>${alfresco.platform.version}</version> <version>${alfresco.solr4.version}</version>
<type>zip</type> <type>zip</type>
<outputDirectory>${project.build.directory}/dependency/solr4</outputDirectory> <outputDirectory>${project.build.directory}/dependency/solr4</outputDirectory>
</artifactItem> </artifactItem>

32
enterprise-installer/pom.xml
View File

@@ -6,9 +6,9 @@
<artifactId>alfresco-full-installation</artifactId> <artifactId>alfresco-full-installation</artifactId>
<version>5.3-SNAPSHOT</version> <version>5.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>alfresco-content-services-installer</artifactId> <artifactId>alfresco-content-services-full-installer</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Alfresco Enterprise Full Installers</name> <name>Alfresco Content Services Full Installers</name>
<properties> <properties>
<binaries.folder>${user.home}/binaries</binaries.folder> <binaries.folder>${user.home}/binaries</binaries.folder>
@@ -29,8 +29,8 @@
</bitrock.arguments> </bitrock.arguments>
<!-- Override alfresco.package.name for the installer naming (Different from the zip distribution naming) --> <!-- Override alfresco.package.name for the installer naming (Different from the zip distribution naming) -->
<alfresco.package.name>alfresco-content-services</alfresco.package.name> <alfresco.package.name>alfresco-content-services-full</alfresco.package.name>
<alfresco.distribution.name>alfresco-content-services-distribution</alfresco.distribution.name> <alfresco.distribution.name>alfresco-content-services-full-distribution</alfresco.distribution.name>
<!-- <!--
Override alfresco.installer.name for the Enterprise installer that is still using Override alfresco.installer.name for the Enterprise installer that is still using
@@ -43,10 +43,20 @@
<!-- Import the dependencies from the Community installer --> <!-- Import the dependencies from the Community installer -->
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-installer</artifactId> <artifactId>alfresco-installer-resources</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>pom</type> <type>pom</type>
</dependency> </dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-installer-resources</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-installer-resources</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
@@ -69,6 +79,12 @@
</goals> </goals>
<configuration> <configuration>
<artifactItems> <artifactItems>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-installer-resources</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
</artifactItem>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-installer-resources</artifactId> <artifactId>alfresco-content-services-installer-resources</artifactId>
@@ -77,16 +93,16 @@
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-distribution</artifactId> <artifactId>alfresco-content-services-full-distribution</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>zip</type> <type>zip</type>
<outputDirectory>${project.build.directory}/distribution</outputDirectory> <outputDirectory>${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}</outputDirectory>
</artifactItem> </artifactItem>
<!-- Solr1 Distribution --> <!-- Solr1 Distribution -->
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-solr1-distribution</artifactId> <artifactId>alfresco-solr1-distribution</artifactId>
<version>${alfresco.platform.version}</version> <version>${alfresco.solr.version}</version>
<type>zip</type> <type>zip</type>
<outputDirectory>${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}/alf_data/solr</outputDirectory> <outputDirectory>${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}/alf_data/solr</outputDirectory>
</artifactItem> </artifactItem>

8
enterprise-war-for-ear/pom.xml
View File

@@ -1,7 +1,7 @@
<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"> <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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-enterprise-war-for-ear</artifactId> <artifactId>alfresco-content-services-war-for-ear</artifactId>
<name>Alfresco Enterprise WAR for inclusion in EAR</name> <name>Alfresco Content Services WAR for inclusion in EAR</name>
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-full-installation</artifactId> <artifactId>alfresco-full-installation</artifactId>
@@ -12,7 +12,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-platform-enterprise</artifactId> <artifactId>content-services</artifactId>
<version>${alfresco.platform.version}</version> <version>${alfresco.platform.version}</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
@@ -54,7 +54,7 @@
<overlays> <overlays>
<overlay> <overlay>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-platform-enterprise</artifactId> <artifactId>content-services</artifactId>
<type>war</type> <type>war</type>
</overlay> </overlay>
<overlay> <overlay>

18
installer/pom.xml
View File

@@ -6,15 +6,16 @@
<artifactId>alfresco-full-installation</artifactId> <artifactId>alfresco-full-installation</artifactId>
<version>5.3-SNAPSHOT</version> <version>5.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>alfresco-community-installer</artifactId> <artifactId>alfresco-content-services-community-full-installer</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Alfresco Community Full Installers</name> <name>Alfresco Content Services Community Full Installers</name>
<properties> <properties>
<binaries.folder>${user.home}/binaries</binaries.folder> <binaries.folder>${user.home}/binaries</binaries.folder>
<bitrock.folder>${project.build.directory}/installbuilder</bitrock.folder> <bitrock.folder>${project.build.directory}/installbuilder</bitrock.folder>
<signing.key.location>${binaries.folder}/build-classpath/code-signing</signing.key.location> <signing.key.location>${binaries.folder}/build-classpath/code-signing</signing.key.location>
<license.file.location>${binaries.folder}/build-classpath/license.xml</license.file.location> <license.file.location>${binaries.folder}/build-classpath/license.xml</license.file.location>
<alfresco.package.name>alfresco-content-services-community-full</alfresco.package.name>
<bitrock.arguments> <bitrock.arguments>
project.version=${installer.version.name} project.version=${installer.version.name}
project.fullName='Alfresco Community' project.fullName='Alfresco Community'
@@ -27,6 +28,13 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-installer-resources</artifactId>
<version>${project.version}</version>
</dependency>
<!-- These binaries are extracted using tar, to preserve symlinks --> <!-- These binaries are extracted using tar, to preserve symlinks -->
<!-- Common --> <!-- Common -->
@@ -195,16 +203,16 @@
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-distribution</artifactId> <artifactId>alfresco-content-services-community-full-distribution</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>zip</type> <type>zip</type>
<outputDirectory>${project.build.directory}/distribution</outputDirectory> <outputDirectory>${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}</outputDirectory>
</artifactItem> </artifactItem>
<!-- Solr1 Distribution --> <!-- Solr1 Distribution -->
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-solr1-distribution</artifactId> <artifactId>alfresco-solr1-distribution</artifactId>
<version>${alfresco.platform.version}</version> <version>${alfresco.solr.version}</version>
<type>zip</type> <type>zip</type>
<outputDirectory>${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}/alf_data/solr</outputDirectory> <outputDirectory>${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}/alf_data/solr</outputDirectory>
</artifactItem> </artifactItem>

3
pom.xml
View File

@@ -24,6 +24,9 @@
<!-- Alfresco Office Services Module --> <!-- Alfresco Office Services Module -->
<alfresco.aos-module.version>1.1.6</alfresco.aos-module.version> <alfresco.aos-module.version>1.1.6</alfresco.aos-module.version>
<alfresco.solr.version>6.1</alfresco.solr.version>
<alfresco.solr4.version>6.4</alfresco.solr4.version>
<!-- Versions of binaries packaged in the installer --> <!-- Versions of binaries packaged in the installer -->
<installer.common.version>5.2-20170508</installer.common.version> <installer.common.version>5.2-20170508</installer.common.version>
<installer.tomcat.version>7.0.59-alfresco-distribution</installer.tomcat.version> <installer.tomcat.version>7.0.59-alfresco-distribution</installer.tomcat.version>