From 4b074807ae07110e7b83000d90d13cd5da81a75f Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Mon, 14 Aug 2017 16:13:15 +0100 Subject: [PATCH] REPO-2725 Fix poms after merge --- alfresco-community-distribution/pom.xml | 226 ++++++++---------- .../pom.xml | 12 +- alfresco-content-repository/pom.xml | 207 +--------------- .../pom.xml | 42 ++-- pom.xml | 56 +++++ 5 files changed, 182 insertions(+), 361 deletions(-) create mode 100644 pom.xml diff --git a/alfresco-community-distribution/pom.xml b/alfresco-community-distribution/pom.xml index 5b1657ff6c..319c4d505f 100644 --- a/alfresco-community-distribution/pom.xml +++ b/alfresco-community-distribution/pom.xml @@ -1,135 +1,101 @@ - - 4.0.0 - alfresco-platform-distribution - Alfresco Community Platform Distribution descriptor - This POM describes the Alfresco artifacts usable in the Maven SDK, in terms of artifacts groupId, artifactId, version - pom - - - alfresco-parent - org.alfresco - 5.3-SNAPSHOT - ../../../pom.xml - - - https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-platform-distribution/latest + 4.0.0 + alfresco-platform-distribution + Alfresco Community Platform Distribution descriptor + This POM describes the Alfresco artifacts usable in the Maven SDK, in terms of artifacts groupId, artifactId, version + pom - - - ${project.groupId} - ${project.version} - - Community - - - - - - - - ${alfresco.groupId} - alfresco-platform - ${project.version} - war - - - - ${alfresco.groupId} - alfresco-core - ${dependency.alfresco-core.version} - provided - - - - ${alfresco.groupId} - alfresco-data-model - ${dependency.alfresco-data-model.version} - provided - - - - ${alfresco.groupId} - alfresco-jlan-embed - ${dependency.alfresco-jlan.version} - provided - - - - ${alfresco.groupId} - alfresco-mbeans - ${project.version} - provided - - - - ${alfresco.groupId} - alfresco-remote-api - ${project.version} - provided - - - - ${alfresco.groupId} - alfresco-repository - ${project.version} - provided - - - - ${alfresco.groupId} - alfresco-solr - ${project.version} - war - - - ${alfresco.groupId} - alfresco-solr - ${project.version} - classes - provided - - - ${alfresco.groupId} - alfresco-solr4 - ${project.version} - war - - - ${alfresco.groupId} - alfresco-solr4 - ${project.version} - classes - provided - - - + + org.alfresco + alfresco-content-repository-parent + 5.3-SNAPSHOT + ../pom.xml + - - - alfresco-maven-repo - https://artifacts.alfresco.com/nexus/content/groups/public - - - alfresco-maven-repo-snapshots - https://artifacts.alfresco.com/nexus/content/groups/public-snapshots - - true - daily - - - + + + Community + + + + + + + org.alfresco + alfresco-content-repository + ${project.version} + war + + + + org.alfresco + alfresco-core + ${dependency.alfresco-core.version} + provided + + + + org.alfresco + alfresco-data-model + ${dependency.alfresco-data-model.version} + provided + + + + org.alfresco + alfresco-jlan-embed + ${dependency.alfresco-jlan.version} + provided + + + + org.alfresco + alfresco-mbeans + ${dependency.alfresco-mbeans.version} + provided + + + + org.alfresco + alfresco-remote-api + ${dependency.alfresco-remote-api.version} + provided + + + + org.alfresco + alfresco-repository + ${dependency.alfresco-repository.version} + provided + + + + org.alfresco + alfresco-solr + ${dependency.alfresco-solr.version} + war + + + org.alfresco + alfresco-solr + ${dependency.alfresco-solr.version} + classes + provided + + + org.alfresco + alfresco-solr4 + ${dependency.alfresco-solr4.version} + war + + + org.alfresco + alfresco-solr4 + ${dependency.alfresco-solr4.version} + classes + provided + + + diff --git a/alfresco-community-installer-resources/pom.xml b/alfresco-community-installer-resources/pom.xml index fedc1d2470..489a077fcc 100644 --- a/alfresco-community-installer-resources/pom.xml +++ b/alfresco-community-installer-resources/pom.xml @@ -1,15 +1,17 @@ 4.0.0 - - org.alfresco - alfresco-packaging - 5.3-SNAPSHOT - alfresco-installer-resources jar Alfresco Installer Resources + + org.alfresco + alfresco-content-repository-parent + 5.3-SNAPSHOT + ../pom.xml + + diff --git a/alfresco-content-repository/pom.xml b/alfresco-content-repository/pom.xml index 94973f438e..fa1187eda8 100644 --- a/alfresco-content-repository/pom.xml +++ b/alfresco-content-repository/pom.xml @@ -3,34 +3,15 @@ alfresco-content-repository Alfresco Repository WAR Community Alfresco Web Client - 5.3-SNAPSHOT war org.alfresco - alfresco-super-pom - 8 + alfresco-content-repository-parent + 5.3-SNAPSHOT + ../pom.xml - - scm:git:git@github.com:Alfresco/alfresco-content-repositry.git - scm:git:git@github.com:Alfresco/alfresco-content-repository.git - https://github.com/Alfresco/alfresco-content-repository - HEAD - - - - - alfresco-internal - https://artifacts.alfresco.com/nexus/content/repositories/releases - - - alfresco-internal-snapshots - https://artifacts.alfresco.com/nexus/content/repositories/snapshots - - - - 0 BUILD-KEY @@ -39,32 +20,12 @@ ${buildNumber} community - - 8080 - 8443 - /alfresco - UTF-8 - ${tomcat.default.alfresco.port} - ${tomcat.default.alfresco.ssl.port} - 5.2.f - - ${project.build.directory}/tomcat - ${project.build.directory}/solr4-instance - ${runtime.tomcat.conf.folder}/shared/classes/alfresco-global.properties - - ${project.build.directory}/alf_data - 6.1 - 6.0 - 2.2 - 6.13 - 5.2.1 + ${project.build.directory}/alf_data 3.2.17.RELEASE 9.4.1212 5.1.40 - - @@ -300,27 +261,6 @@ - - - - - - - - - - - - - - - - - - - - - maven-war-plugin @@ -335,62 +275,6 @@ - - - org.apache.tomcat.maven - tomcat7-maven-plugin - - - org.postgresql - postgresql - ${dependency.postgresql.version} - - - mysql - mysql-connector-java - ${dependency.mysql.version} - - - - - solr6 - 8983 - ${dir.root} - localhost - none - - - false - true - ${runtime.tomcat.conf.folder}/alfresco-context.xml - ${runtime.tomcat.conf.folder}/tomcat-users.xml - - - - org.alfresco - alfresco-server-root - - / - war - true - - - ${project.build.directory}/tomcat/webapps/alfresco-server-root/META-INF/context.xml - - - org.alfresco - api-explorer - ${dependency.api-explorer.version} - /api-explorer - war - true - - - - org.codehaus.mojo license-maven-plugin @@ -455,88 +339,5 @@ - - withShare - - - org.alfresco - alfresco-share-services - ${runner.share.version} - amp - - - - - - maven-war-plugin - - - - org.alfresco - alfresco-share-services - amp - - - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - - - - org.alfresco - share - /share - ${runner.share.version} - war - true - - - - - - - - - solr4 - - - withAss - !true - - - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - - - solr4 - 8080 - 0 - 0 - ${runtime.solr.folder} - ${runtime.solr.folder}/alfrescoModels - ${runtime.solr.folder}/content - - - - - org.alfresco - alfresco-solr4 - - /solr4 - war - true - ${runtime.tomcat.conf.folder}/solr-context.xml - - - - - - - diff --git a/alfresco-platform-community-distributionzip/pom.xml b/alfresco-platform-community-distributionzip/pom.xml index d09e00557b..483175f59d 100644 --- a/alfresco-platform-community-distributionzip/pom.xml +++ b/alfresco-platform-community-distributionzip/pom.xml @@ -1,21 +1,22 @@ 4.0.0 - - org.alfresco - alfresco-packaging - 5.3-SNAPSHOT - ../pom.xml - alfresco-platform-community-distributionzip jar Alfresco Platform Distribution (WAR Installation) + + org.alfresco + alfresco-content-repository-parent + 5.3-SNAPSHOT + ../pom.xml + + org.alfresco - alfresco-platform + alfresco-content-repository ${project.version} war @@ -23,14 +24,14 @@ org.alfresco alfresco-mmt - ${project.version} + ${dependency.alfresco-mmt.version} org.alfresco alfresco-repository - ${project.version} + ${dependency.alfresco-repository.version} org.alfresco @@ -39,7 +40,7 @@ org.alfresco - alfresco-platform + alfresco-content-repository ${project.version} classes @@ -48,30 +49,24 @@ org.postgresql postgresql + ${dependency.postgresql.version} org.alfresco alfresco-pdf-renderer - ${installer.alfresco-pdf-renderer.version} + ${dependency.alfresco-pdf-renderer.version} linux tgz org.alfresco alfresco-pdf-renderer - ${installer.alfresco-pdf-renderer.version} + ${dependency.alfresco-pdf-renderer.version} win64 tgz - - org.alfresco - alfresco-pdf-renderer - ${installer.alfresco-pdf-renderer.version} - osx - tgz - @@ -91,9 +86,9 @@ - ${project.groupId} + org.alfresco alfresco-repository - ${project.version} + ${dependency.alfresco-repository.version} alfresco/keystore/** @@ -110,8 +105,9 @@ - ${project.groupId} + org.alfresco alfresco-jlan-embed + ${dependency.alfresco-jlan.version} windll *.dll @@ -131,7 +127,7 @@ org.alfresco alfresco-server-root - ${project.version} + ${dependency.alfresco-server-root.version} war ${project.build.outputDirectory}/web-server/webapps ROOT.war diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000000..14d61c41fa --- /dev/null +++ b/pom.xml @@ -0,0 +1,56 @@ + + 4.0.0 + alfresco-content-repository-parent + Alfresco Repository Community + 5.3-SNAPSHOT + pom + + + org.alfresco + alfresco-super-pom + 8 + + + + alfresco-community-distribution + alfresco-community-installer-resources + alfresco-content-repository + alfresco-platform-community-distributionzip + + + + scm:git:git@github.com:Alfresco/alfresco-content-repositry.git + scm:git:git@github.com:Alfresco/alfresco-content-repository.git + https://github.com/Alfresco/alfresco-content-repository + HEAD + + + + + alfresco-internal + https://artifacts.alfresco.com/nexus/content/repositories/releases + + + alfresco-internal-snapshots + https://artifacts.alfresco.com/nexus/content/repositories/snapshots + + + + + + 6.1 + 6.0 + 2.2 + 6.13 + 6.16 + ${project.version} + 1.0 + 6.3 + 6.0 + + 3.2.17.RELEASE + 9.4.1212 + 5.1.40 + + +