diff --git a/distribution/pom.xml b/distribution/pom.xml index 490d54d421..f2f2c95a68 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,11 +4,11 @@ org.alfresco full-community-packaging - 6.0.0-SNAPSHOT - ../pom.xml + 6.0.0-SNAPSHOT + ../pom.xml alfresco-content-services-community-full-distribution - jar + pom Alfresco Content Services Community Full Distribution @@ -17,11 +17,9 @@ - org.alfresco alfresco-content-services-community-distribution - ${dependency.acs-community-packaging.version} zip @@ -30,12 +28,9 @@ - - org.alfresco alfresco-solr4-distribution - ${alfresco.solr4.version} zip @@ -44,12 +39,9 @@ - - org.alfresco alfresco-content-services-share-distribution - ${alfresco.share.version} zip @@ -83,20 +75,17 @@ org.alfresco alfresco-content-services-community-distribution - ${dependency.acs-community-packaging.version} zip org.alfresco alfresco-solr4-distribution - ${alfresco.solr4.version} zip ${project.build.directory}/dependency/solr4 org.alfresco alfresco-content-services-share-distribution - ${alfresco.share.version} zip diff --git a/installer-resources/pom.xml b/installer-resources/pom.xml index eaddaf9d08..18deeca383 100644 --- a/installer-resources/pom.xml +++ b/installer-resources/pom.xml @@ -3,7 +3,7 @@ 4.0.0 alfresco-installer-resources jar - Alfresco Installer Resources + Alfresco Content Services Installer Resources org.alfresco diff --git a/installer/pom.xml b/installer/pom.xml index 5b3d09c7b3..b088eb26e3 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -3,9 +3,9 @@ 4.0.0 org.alfresco - full-community-packaging - 6.0.0-SNAPSHOT - ../pom.xml + full-community-packaging + 6.0.0-SNAPSHOT + ../pom.xml alfresco-content-services-community-full-installer pom @@ -18,23 +18,62 @@ ${binaries.folder}/build-classpath/license.xml alfresco-content-services-community-full - 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} - org.alfresco alfresco-installer-resources ${project.version} + + org.alfresco + alfresco-content-services-community-full-distribution + ${project.version} + zip + + + org.alfresco + alfresco-solr1-distribution + zip + + + org.alfresco + alfresco-wcmqs-distribution + zip + + + org.alfresco + alfresco-wcmqs-web + classes + + + org.alfresco + alfresco-wcmqs-client-api + + + org.alfresco.aos-module + alfresco-aos-module-distributionzip + zip + + + org.alfresco.integrations + alfresco-googledocs-repo + amp + + + org.alfresco.integrations + alfresco-googledocs-share + amp + @@ -42,7 +81,6 @@ org.alfresco installer-common - ${installer.common.version} linux tgz @@ -51,14 +89,12 @@ org.apache.tomcat tomcat - ${installer.tomcat.version} linux tgz org.apache.tomcat tomcat - ${installer.tomcat.version} win64 tgz @@ -67,14 +103,12 @@ org.postgresql postgresql-distribution - ${installer.postgresql.version} linux tgz org.postgresql postgresql-distribution - ${installer.postgresql.version} win64 tgz @@ -83,14 +117,12 @@ com.oracle.java jre - ${installer.java.version} linux tgz com.oracle.java jre - ${installer.java.version} win64 tgz @@ -99,14 +131,12 @@ org.libreoffice libreoffice-dist - ${installer.libreoffice.version} linux tgz org.libreoffice libreoffice-dist - ${installer.libreoffice.version} windows tgz @@ -115,14 +145,12 @@ org.alfresco alfresco-pdf-renderer - ${installer.alfresco-pdf-renderer.version} linux tgz org.alfresco alfresco-pdf-renderer - ${installer.alfresco-pdf-renderer.version} win64 tgz @@ -131,14 +159,12 @@ org.imagemagick imagemagick-distribution - ${installer.imagemagick.version} linux tgz org.imagemagick imagemagick-distribution - ${installer.imagemagick.version} win64 tgz @@ -147,14 +173,12 @@ com.bitnami installbuilder - ${installer.installbuilder.version} linux tgz com.bitnami installbuilder - ${installer.installbuilder.version} win tgz @@ -163,14 +187,12 @@ org.alfresco manager - ${installer.manager.version} linux tgz org.alfresco manager - ${installer.manager.version} win64 tgz @@ -199,13 +221,11 @@ org.alfresco alfresco-installer-resources - ${project.version} ${project.build.directory}/classes org.alfresco alfresco-content-services-community-full-distribution - ${project.version} zip ${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name} @@ -213,7 +233,6 @@ org.alfresco alfresco-solr1-distribution - ${alfresco.solr.version} zip ${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}/alf_data/solr @@ -221,7 +240,6 @@ org.alfresco alfresco-wcmqs-distribution - ${alfresco.share.version} zip ${project.build.directory}/wcmqs @@ -229,7 +247,6 @@ org.alfresco alfresco-wcmqs-web - ${alfresco.share.version} classes ${project.build.directory}/wcmqs alfresco/web-extension/** @@ -238,7 +255,6 @@ org.alfresco alfresco-wcmqs-client-api - ${alfresco.share.version} ${project.build.directory}/wcmqs alfresco/extension/** @@ -246,7 +262,6 @@ org.alfresco.aos-module alfresco-aos-module-distributionzip - ${alfresco.aos-module.version} zip ${project.build.directory}/distribution/aos-module @@ -264,13 +279,11 @@ org.alfresco.integrations alfresco-googledocs-repo - ${alfresco.googledocs.version} amp org.alfresco.integrations alfresco-googledocs-share - ${alfresco.googledocs.version} amp diff --git a/pom.xml b/pom.xml index 2ea35dfb4d..fa3a6526b5 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,14 @@ full-community-packaging 6.0.0-SNAPSHOT pom - Alfresco Full Community Packaging + Alfresco Content Services Community Full Packaging + + + scm:git:https://git.alfresco.com/Repository/full-community-packaging.gitt + scm:git:https://git.alfresco.com/Repository/full-community-packaging.git + https://git.alfresco.com/Repository/full-community-packaging.git + HEAD + @@ -45,18 +52,12 @@ 15.10.1 - - SNAPSHOT-0 - - - ${installer.build.timestamp}-${installer.build.number} - + + ${project.version}${alfresco.release.availability} alfresco-community ${alfresco.package.name}-distribution @@ -64,8 +65,8 @@ distribution public-javadoc - installer-resources - installer + installer-resources + installer @@ -78,26 +79,234 @@ pom import + + org.alfresco + alfresco-content-services-community-distribution + ${dependency.acs-community-packaging.version} + zip + + + org.alfresco.aos-module + alfresco-aos-module + ${alfresco.aos-module.version} + amp + + + org.alfresco.aos-module + alfresco-aos-module-distributionzip + ${alfresco.aos-module.version} + zip + + + org.alfresco.aos-module + alfresco-vti-bin + ${alfresco.aos-module.version} + war + + + org.alfresco + alfresco-content-services-share-distribution + ${alfresco.share.version} + zip + + + org.alfresco + alfresco-share-services + ${alfresco.share.version} + amp + + + org.alfresco + share + ${alfresco.share.version} + war + + + org.alfresco + alfresco-solr1-distribution + ${alfresco.solr.version} + zip + + + org.alfresco + alfresco-solr4-distribution + ${alfresco.solr4.version} + zip + + + org.alfresco + alfresco-wcmqs-distribution + ${alfresco.share.version} + zip + + + org.alfresco + alfresco-wcmqs-web + ${alfresco.share.version} + classes + + + org.alfresco + alfresco-wcmqs-client-api + ${alfresco.share.version} + + + org.alfresco.integrations + alfresco-googledocs-repo + ${alfresco.googledocs.version} + amp + + + org.alfresco.integrations + alfresco-googledocs-share + ${alfresco.googledocs.version} + amp + + + + + org.alfresco + installer-common + ${installer.common.version} + linux + tgz + + + + + org.apache.tomcat + tomcat + ${installer.tomcat.version} + linux + tgz + + + org.apache.tomcat + tomcat + ${installer.tomcat.version} + win64 + tgz + + + + + org.postgresql + postgresql-distribution + ${installer.postgresql.version} + linux + tgz + + + org.postgresql + postgresql-distribution + ${installer.postgresql.version} + win64 + tgz + + + + + com.oracle.java + jre + ${installer.java.version} + linux + tgz + + + com.oracle.java + jre + ${installer.java.version} + win64 + tgz + + + + + org.libreoffice + libreoffice-dist + ${installer.libreoffice.version} + linux + tgz + + + org.libreoffice + libreoffice-dist + ${installer.libreoffice.version} + windows + tgz + + + + + org.alfresco + alfresco-pdf-renderer + ${installer.alfresco-pdf-renderer.version} + linux + tgz + + + org.alfresco + alfresco-pdf-renderer + ${installer.alfresco-pdf-renderer.version} + win64 + tgz + + + + + org.imagemagick + imagemagick-distribution + ${installer.imagemagick.version} + linux + tgz + + + org.imagemagick + imagemagick-distribution + ${installer.imagemagick.version} + win64 + tgz + + + + + com.bitnami + installbuilder + ${installer.installbuilder.version} + linux + tgz + + + com.bitnami + installbuilder + ${installer.installbuilder.version} + win + tgz + + + + + org.alfresco + manager + ${installer.manager.version} + linux + tgz + + + org.alfresco + manager + ${installer.manager.version} + win64 + tgz + - - - release - - yyyyMM - - ${installer.build.timestamp}${release.availability} - - - - + + alfresco-internal + https://artifacts.alfresco.com/nexus/content/repositories/enterprise-releases + alfresco-internal-snapshots https://artifacts.alfresco.com/nexus/content/repositories/internal-snapshots diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml index e71bbe7e92..a31e26161e 100644 --- a/public-javadoc/pom.xml +++ b/public-javadoc/pom.xml @@ -1,7 +1,7 @@ 4.0.0 alfresco-public-javadoc - Javadoc of Public API + Alfresco Content Services Public API Javadoc org.alfresco full-community-packaging