REPO-2886 Tidy up poms. Add scm config

This commit is contained in:
Alex Mukha
2017-10-10 11:49:46 +01:00
parent 39252f8c22
commit 8b77ce79b6
5 changed files with 294 additions and 83 deletions

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>full-community-packaging</artifactId>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>alfresco-content-services-community-full-distribution</artifactId>
<packaging>jar</packaging>
<packaging>pom</packaging>
<name>Alfresco Content Services Community Full Distribution</name>
<!-- To replace in share-config-custom.xml -->
@@ -17,11 +17,9 @@
</properties>
<dependencies>
<!-- Platform Distribution -->
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-community-distribution</artifactId>
<version>${dependency.acs-community-packaging.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
@@ -30,12 +28,9 @@
</exclusion>
</exclusions>
</dependency>
<!-- Solr4 Distribution -->
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4-distribution</artifactId>
<version>${alfresco.solr4.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
@@ -44,12 +39,9 @@
</exclusion>
</exclusions>
</dependency>
<!-- Share Distribution -->
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-share-distribution</artifactId>
<version>${alfresco.share.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
@@ -83,20 +75,17 @@
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-community-distribution</artifactId>
<version>${dependency.acs-community-packaging.version}</version>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4-distribution</artifactId>
<version>${alfresco.solr4.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/dependency/solr4</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-share-distribution</artifactId>
<version>${alfresco.share.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-installer-resources</artifactId>
<packaging>jar</packaging>
<name>Alfresco Installer Resources</name>
<name>Alfresco Content Services Installer Resources</name>
<parent>
<groupId>org.alfresco</groupId>

View File

@@ -3,9 +3,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>full-community-packaging</artifactId>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<artifactId>full-community-packaging</artifactId>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>alfresco-content-services-community-full-installer</artifactId>
<packaging>pom</packaging>
@@ -18,23 +18,62 @@
<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>
project.version=${installer.version.name}
project.fullName='Alfresco Community'
project.windowsSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd.p12
project.windowsSigningPkcs12Password=${p12Password}
alfresco_edition=community
alfresco_package='${alfresco.package.name}'
project.outputDirectory=${project.build.directory}
project.version=${installer.version.name}
project.fullName='Alfresco Content Services Community'
project.windowsSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd.p12
project.windowsSigningPkcs12Password=${p12Password}
alfresco_edition=community
alfresco_package='${alfresco.package.name}'
project.outputDirectory=${project.build.directory}
</bitrock.arguments>
</properties>
<dependencies>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-installer-resources</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-community-full-distribution</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr1-distribution</artifactId>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-wcmqs-distribution</artifactId>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-wcmqs-web</artifactId>
<classifier>classes</classifier>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-wcmqs-client-api</artifactId>
</dependency>
<dependency>
<groupId>org.alfresco.aos-module</groupId>
<artifactId>alfresco-aos-module-distributionzip</artifactId>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.alfresco.integrations</groupId>
<artifactId>alfresco-googledocs-repo</artifactId>
<type>amp</type>
</dependency>
<dependency>
<groupId>org.alfresco.integrations</groupId>
<artifactId>alfresco-googledocs-share</artifactId>
<type>amp</type>
</dependency>
<!-- These binaries are extracted using tar, to preserve symlinks -->
@@ -42,7 +81,6 @@
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>installer-common</artifactId>
<version>${installer.common.version}</version>
<classifier>linux</classifier>
<type>tgz</type>
</dependency>
@@ -51,14 +89,12 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat</artifactId>
<version>${installer.tomcat.version}</version>
<classifier>linux</classifier>
<type>tgz</type>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat</artifactId>
<version>${installer.tomcat.version}</version>
<classifier>win64</classifier>
<type>tgz</type>
</dependency>
@@ -67,14 +103,12 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql-distribution</artifactId>
<version>${installer.postgresql.version}</version>
<classifier>linux</classifier>
<type>tgz</type>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql-distribution</artifactId>
<version>${installer.postgresql.version}</version>
<classifier>win64</classifier>
<type>tgz</type>
</dependency>
@@ -83,14 +117,12 @@
<dependency>
<groupId>com.oracle.java</groupId>
<artifactId>jre</artifactId>
<version>${installer.java.version}</version>
<classifier>linux</classifier>
<type>tgz</type>
</dependency>
<dependency>
<groupId>com.oracle.java</groupId>
<artifactId>jre</artifactId>
<version>${installer.java.version}</version>
<classifier>win64</classifier>
<type>tgz</type>
</dependency>
@@ -99,14 +131,12 @@
<dependency>
<groupId>org.libreoffice</groupId>
<artifactId>libreoffice-dist</artifactId>
<version>${installer.libreoffice.version}</version>
<classifier>linux</classifier>
<type>tgz</type>
</dependency>
<dependency>
<groupId>org.libreoffice</groupId>
<artifactId>libreoffice-dist</artifactId>
<version>${installer.libreoffice.version}</version>
<classifier>windows</classifier>
<type>tgz</type>
</dependency>
@@ -115,14 +145,12 @@
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-pdf-renderer</artifactId>
<version>${installer.alfresco-pdf-renderer.version}</version>
<classifier>linux</classifier>
<type>tgz</type>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-pdf-renderer</artifactId>
<version>${installer.alfresco-pdf-renderer.version}</version>
<classifier>win64</classifier>
<type>tgz</type>
</dependency>
@@ -131,14 +159,12 @@
<dependency>
<groupId>org.imagemagick</groupId>
<artifactId>imagemagick-distribution</artifactId>
<version>${installer.imagemagick.version}</version>
<classifier>linux</classifier>
<type>tgz</type>
</dependency>
<dependency>
<groupId>org.imagemagick</groupId>
<artifactId>imagemagick-distribution</artifactId>
<version>${installer.imagemagick.version}</version>
<classifier>win64</classifier>
<type>tgz</type>
</dependency>
@@ -147,14 +173,12 @@
<dependency>
<groupId>com.bitnami</groupId>
<artifactId>installbuilder</artifactId>
<version>${installer.installbuilder.version}</version>
<classifier>linux</classifier>
<type>tgz</type>
</dependency>
<dependency>
<groupId>com.bitnami</groupId>
<artifactId>installbuilder</artifactId>
<version>${installer.installbuilder.version}</version>
<classifier>win</classifier>
<type>tgz</type>
</dependency>
@@ -163,14 +187,12 @@
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>manager</artifactId>
<version>${installer.manager.version}</version>
<classifier>linux</classifier>
<type>tgz</type>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>manager</artifactId>
<version>${installer.manager.version}</version>
<classifier>win64</classifier>
<type>tgz</type>
</dependency>
@@ -199,13 +221,11 @@
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-installer-resources</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-community-full-distribution</artifactId>
<version>${project.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}</outputDirectory>
</artifactItem>
@@ -213,7 +233,6 @@
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr1-distribution</artifactId>
<version>${alfresco.solr.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}/alf_data/solr</outputDirectory>
</artifactItem>
@@ -221,7 +240,6 @@
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-wcmqs-distribution</artifactId>
<version>${alfresco.share.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/wcmqs</outputDirectory>
</artifactItem>
@@ -229,7 +247,6 @@
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-wcmqs-web</artifactId>
<version>${alfresco.share.version}</version>
<classifier>classes</classifier>
<outputDirectory>${project.build.directory}/wcmqs</outputDirectory>
<includes>alfresco/web-extension/**</includes>
@@ -238,7 +255,6 @@
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-wcmqs-client-api</artifactId>
<version>${alfresco.share.version}</version>
<outputDirectory>${project.build.directory}/wcmqs</outputDirectory>
<includes>alfresco/extension/**</includes>
</artifactItem>
@@ -246,7 +262,6 @@
<artifactItem>
<groupId>org.alfresco.aos-module</groupId>
<artifactId>alfresco-aos-module-distributionzip</artifactId>
<version>${alfresco.aos-module.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/distribution/aos-module</outputDirectory>
</artifactItem>
@@ -264,13 +279,11 @@
<artifactItem>
<groupId>org.alfresco.integrations</groupId>
<artifactId>alfresco-googledocs-repo</artifactId>
<version>${alfresco.googledocs.version}</version>
<type>amp</type>
</artifactItem>
<artifactItem>
<groupId>org.alfresco.integrations</groupId>
<artifactId>alfresco-googledocs-share</artifactId>
<version>${alfresco.googledocs.version}</version>
<type>amp</type>
</artifactItem>
</artifactItems>

269
pom.xml
View File

@@ -9,7 +9,14 @@
<artifactId>full-community-packaging</artifactId>
<version>6.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Alfresco Full Community Packaging</name>
<name>Alfresco Content Services Community Full Packaging</name>
<scm>
<connection>scm:git:https://git.alfresco.com/Repository/full-community-packaging.gitt</connection>
<developerConnection>scm:git:https://git.alfresco.com/Repository/full-community-packaging.git</developerConnection>
<url>https://git.alfresco.com/Repository/full-community-packaging.git</url>
<tag>HEAD</tag>
</scm>
<properties>
<!-- Community Packaging version -->
@@ -45,18 +52,12 @@
<!-- Install builder version -->
<installer.installbuilder.version>15.10.1</installer.installbuilder.version>
<!--
Build number (Default value is used unless overridden by command line)
Default value: SNAPSHOT-0
<!--
Set externally as "-ea", "-ga", "-la" or left empty
As the releasable artifacts are never published to nexus, the version is affecting only filenames
-->
<installer.build.number>SNAPSHOT-0</installer.build.number>
<!--
Installer version that will be used in the final name.
- ${installer.build.timestamp}-${installer.build.number} (SNAPSHOT version)
-->
<installer.version.name>${installer.build.timestamp}-${installer.build.number}</installer.version.name>
<alfresco.release.availability></alfresco.release.availability>
<installer.version.name>${project.version}${alfresco.release.availability}</installer.version.name>
<alfresco.package.name>alfresco-community</alfresco.package.name>
<alfresco.distribution.name>${alfresco.package.name}-distribution</alfresco.distribution.name>
</properties>
@@ -64,8 +65,8 @@
<modules>
<module>distribution</module>
<module>public-javadoc</module>
<module>installer-resources</module>
<module>installer</module>
<module>installer-resources</module>
<module>installer</module>
</modules>
<dependencyManagement>
@@ -78,26 +79,234 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-community-distribution</artifactId>
<version>${dependency.acs-community-packaging.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.alfresco.aos-module</groupId>
<artifactId>alfresco-aos-module</artifactId>
<version>${alfresco.aos-module.version}</version>
<type>amp</type>
</dependency>
<dependency>
<groupId>org.alfresco.aos-module</groupId>
<artifactId>alfresco-aos-module-distributionzip</artifactId>
<version>${alfresco.aos-module.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.alfresco.aos-module</groupId>
<artifactId>alfresco-vti-bin</artifactId>
<version>${alfresco.aos-module.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-share-distribution</artifactId>
<version>${alfresco.share.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-share-services</artifactId>
<version>${alfresco.share.version}</version>
<type>amp</type>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>share</artifactId>
<version>${alfresco.share.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr1-distribution</artifactId>
<version>${alfresco.solr.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4-distribution</artifactId>
<version>${alfresco.solr4.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-wcmqs-distribution</artifactId>
<version>${alfresco.share.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-wcmqs-web</artifactId>
<version>${alfresco.share.version}</version>
<classifier>classes</classifier>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-wcmqs-client-api</artifactId>
<version>${alfresco.share.version}</version>
</dependency>
<dependency>
<groupId>org.alfresco.integrations</groupId>
<artifactId>alfresco-googledocs-repo</artifactId>
<version>${alfresco.googledocs.version}</version>
<type>amp</type>
</dependency>
<dependency>
<groupId>org.alfresco.integrations</groupId>
<artifactId>alfresco-googledocs-share</artifactId>
<version>${alfresco.googledocs.version}</version>
<type>amp</type>
</dependency>
<!-- Common -->
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>installer-common</artifactId>
<version>${installer.common.version}</version>
<classifier>linux</classifier>
<type>tgz</type>
</dependency>
<!-- Tomcat -->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat</artifactId>
<version>${installer.tomcat.version}</version>
<classifier>linux</classifier>
<type>tgz</type>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat</artifactId>
<version>${installer.tomcat.version}</version>
<classifier>win64</classifier>
<type>tgz</type>
</dependency>
<!-- PostgreSQL -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql-distribution</artifactId>
<version>${installer.postgresql.version}</version>
<classifier>linux</classifier>
<type>tgz</type>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql-distribution</artifactId>
<version>${installer.postgresql.version}</version>
<classifier>win64</classifier>
<type>tgz</type>
</dependency>
<!-- Java -->
<dependency>
<groupId>com.oracle.java</groupId>
<artifactId>jre</artifactId>
<version>${installer.java.version}</version>
<classifier>linux</classifier>
<type>tgz</type>
</dependency>
<dependency>
<groupId>com.oracle.java</groupId>
<artifactId>jre</artifactId>
<version>${installer.java.version}</version>
<classifier>win64</classifier>
<type>tgz</type>
</dependency>
<!-- LibreOffice -->
<dependency>
<groupId>org.libreoffice</groupId>
<artifactId>libreoffice-dist</artifactId>
<version>${installer.libreoffice.version}</version>
<classifier>linux</classifier>
<type>tgz</type>
</dependency>
<dependency>
<groupId>org.libreoffice</groupId>
<artifactId>libreoffice-dist</artifactId>
<version>${installer.libreoffice.version}</version>
<classifier>windows</classifier>
<type>tgz</type>
</dependency>
<!-- Alfresco Pdf Renderer -->
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-pdf-renderer</artifactId>
<version>${installer.alfresco-pdf-renderer.version}</version>
<classifier>linux</classifier>
<type>tgz</type>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-pdf-renderer</artifactId>
<version>${installer.alfresco-pdf-renderer.version}</version>
<classifier>win64</classifier>
<type>tgz</type>
</dependency>
<!-- ImageMagick -->
<dependency>
<groupId>org.imagemagick</groupId>
<artifactId>imagemagick-distribution</artifactId>
<version>${installer.imagemagick.version}</version>
<classifier>linux</classifier>
<type>tgz</type>
</dependency>
<dependency>
<groupId>org.imagemagick</groupId>
<artifactId>imagemagick-distribution</artifactId>
<version>${installer.imagemagick.version}</version>
<classifier>win64</classifier>
<type>tgz</type>
</dependency>
<!-- Installbuilder -->
<dependency>
<groupId>com.bitnami</groupId>
<artifactId>installbuilder</artifactId>
<version>${installer.installbuilder.version}</version>
<classifier>linux</classifier>
<type>tgz</type>
</dependency>
<dependency>
<groupId>com.bitnami</groupId>
<artifactId>installbuilder</artifactId>
<version>${installer.installbuilder.version}</version>
<classifier>win</classifier>
<type>tgz</type>
</dependency>
<!-- Manager -->
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>manager</artifactId>
<version>${installer.manager.version}</version>
<classifier>linux</classifier>
<type>tgz</type>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>manager</artifactId>
<version>${installer.manager.version}</version>
<classifier>win64</classifier>
<type>tgz</type>
</dependency>
</dependencies>
</dependencyManagement>
<profiles>
<profile>
<id>release</id>
<properties>
<maven.build.timestamp.format>yyyyMM</maven.build.timestamp.format>
<!--
Installer version that will be used in the final name.
- ${installer.build.timestamp}-EA (Early Access release version)
- ${installer.build.timestamp}-LA (Limited Access release version)
- ${installer.build.timestamp}-GA (General Availability release version)
-->
<installer.version.name>${installer.build.timestamp}${release.availability}</installer.version.name>
</properties>
</profile>
</profiles>
<distributionManagement>
<repository>
<id>alfresco-internal</id>
<url>https://artifacts.alfresco.com/nexus/content/repositories/enterprise-releases</url>
</repository>
<snapshotRepository>
<id>alfresco-internal-snapshots</id>
<url>https://artifacts.alfresco.com/nexus/content/repositories/internal-snapshots</url>

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">
<modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-public-javadoc</artifactId>
<name>Javadoc of Public API</name>
<name>Alfresco Content Services Public API Javadoc</name>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>full-community-packaging</artifactId>