[maven-release-plugin] prepare release alfresco-sdk-aggregator-3.0.1

Tidy up fixes for #461
Correctly configure the artifact id for alfresco-platform, reported in #461
2025-09-10 14:12:12 +00:00 · 2017-06-23 10:17:47 +01:00 · 2017-06-22 12:13:28 +02:00 · 2017-04-21 18:21:41 +02:00 · 2017-04-21 17:36:06 +02:00 · 2017-04-21 11:49:13 +02:00
16 changed files with 55 additions and 23 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ pom.xml.next
 release.properties
 **.settings
 **bin
+*.DS_Store
--- a/archetypes/.gitignore
+++ b/archetypes/.gitignore
@@ -0,0 +1 @@
+*.DS_Store
--- a/archetypes/activiti-jar-archetype/.gitignore
+++ b/archetypes/activiti-jar-archetype/.gitignore
@@ -0,0 +1 @@
+*.DS_Store
--- a/archetypes/activiti-jar-archetype/pom.xml
+++ b/archetypes/activiti-jar-archetype/pom.xml
@@ -12,7 +12,7 @@
  <parent>
    <groupId>org.alfresco.maven</groupId>
    <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/archetypes/alfresco-allinone-archetype/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/pom.xml
@@ -11,7 +11,7 @@
  <parent>
    <groupId>org.alfresco.maven</groupId>
    <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>
  
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
@@ -5,7 +5,7 @@
    <groupId>${groupId}</groupId>
    <artifactId>${artifactId}</artifactId>
    <version>${version}</version>
-    <name>AIO - SDK 3.0 Beta</name>
+    <name>AIO - SDK 3.0</name>
    <description>All-In-One (AIO) project for SDK 3.0</description>
    <packaging>pom</packaging>

@@ -34,8 +34,8 @@
        <!-- Alfresco Platform and Share webapp versions, these are the original Alfresco webapps that will be
             customized and then deployed and run by the tomcat maven plugin when
             executing for example $ mvn clean install alfresco:run -->
-        <alfresco.platform.version>5.2.e</alfresco.platform.version>
-        <alfresco.share.version>5.2.d</alfresco.share.version>
+        <alfresco.platform.version>5.2.f</alfresco.platform.version>
+        <alfresco.share.version>5.2.e</alfresco.share.version>

        <!-- Default is to run with a Community edition, change to 'enterprise' if using Enterprise edition -->
        <maven.alfresco.edition>community</maven.alfresco.edition>
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/src/test/resources/share/share-config-custom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/src/test/resources/share/share-config-custom.xml
@@ -96,7 +96,7 @@
                <description>Access to Alfresco Repository Public API that require user authentication.
                    This makes use of the authentication that is provided by parent 'alfresco' endpoint.</description>
                <connector-id>alfresco</connector-id>
-                <endpoint-url>${alfresco.repo.url}/alfresco/api</endpoint-url>
+                <endpoint-url>${alfresco.repo.url}/api</endpoint-url>
                <identity>user</identity>
            </endpoint>
        </remote>
--- a/archetypes/alfresco-platform-jar-archetype/pom.xml
+++ b/archetypes/alfresco-platform-jar-archetype/pom.xml
@@ -12,7 +12,7 @@
  <parent>
    <groupId>org.alfresco.maven</groupId>
    <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/pom.xml
@@ -34,9 +34,9 @@
        <!-- Alfresco Platform webapp version, this is the original Alfresco webapp that will be
            customized and then deployed and run by the tomcat maven plugin when
            executing for example $ mvn clean install alfresco:run -->
-        <alfresco.platform.version>5.2.e</alfresco.platform.version>
+        <alfresco.platform.version>5.2.f</alfresco.platform.version>
        <!-- Alfresco Share version, so we can bring in correct alfresco-share-services artifact -->
-        <alfresco.share.version>5.2.d</alfresco.share.version>
+        <alfresco.share.version>5.2.e</alfresco.share.version>

        <!-- Default is to run with a Community edition, change to 'enterprise' if using Enterprise edition -->
        <maven.alfresco.edition>community</maven.alfresco.edition>
--- a/archetypes/alfresco-share-jar-archetype/pom.xml
+++ b/archetypes/alfresco-share-jar-archetype/pom.xml
@@ -14,7 +14,7 @@
    <parent>
        <groupId>org.alfresco.maven</groupId>
        <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/.gitignore
+++ b/modules/.gitignore
@@ -0,0 +1 @@
+*.DS_Store
--- a/modules/alfresco-rad/pom.xml
+++ b/modules/alfresco-rad/pom.xml
@@ -10,7 +10,7 @@
    <parent>
        <groupId>org.alfresco.maven</groupId>
        <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/plugins/.gitignore
+++ b/plugins/.gitignore
@@ -0,0 +1 @@
+*.DS_Store
--- a/plugins/alfresco-maven-plugin/pom.xml
+++ b/plugins/alfresco-maven-plugin/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco.maven</groupId>
        <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -122,7 +122,7 @@
        <dependency>
            <groupId>org.alfresco</groupId>
            <artifactId>alfresco-mmt</artifactId>
-            <version>5.1.g</version>
+            <version>5.1.f</version>
        </dependency>
        <dependency>
            <groupId>org.alfrescolabs.alfresco-technical-validation</groupId>
--- a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRunMojo.java
+++ b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRunMojo.java
@@ -299,7 +299,7 @@ public abstract class AbstractRunMojo extends AbstractMojo {
    @Parameter(property = "activiti.groupId", defaultValue = "com.activiti")
    protected String activitiGroupId;

-    @Parameter(property = "alfresco.platform.war.artifactId", defaultValue = "alfresco")
+    @Parameter(property = "alfresco.platform.war.artifactId", defaultValue = "alfresco-platform")
    protected String alfrescoPlatformWarArtifactId;

    @Parameter(property = "alfresco.share.war.artifactId", defaultValue = "share")
@@ -317,10 +317,10 @@ public abstract class AbstractRunMojo extends AbstractMojo {
    @Parameter(property = "activiti.admin.war.artifactId", defaultValue = "activiti-admin")
    protected String activitiAdminWarArtifactId;

-    @Parameter(property = "alfresco.platform.version", defaultValue = "5.2.e")
+    @Parameter(property = "alfresco.platform.version", defaultValue = "5.2.f")
    protected String alfrescoPlatformVersion;

-    @Parameter(property = "alfresco.share.version", defaultValue = "5.2.d")
+    @Parameter(property = "alfresco.share.version", defaultValue = "5.2.e")
    protected String alfrescoShareVersion;

    @Parameter(property = "alfresco.api.explorer.version", defaultValue = "5.2.e")
@@ -1084,6 +1084,7 @@ public abstract class AbstractRunMojo extends AbstractMojo {
                    // Skip if we are not running a 5.1 version of Alfresco, 'Alfresco Share Services'
                    // was not used in earlier versions
                    if (!isPlatformVersionGtOrEqTo51()) {
+                        getLog().info("Skipping alfresco-share-services, only needed for 5.1+");
                        continue;
                    }
                }
@@ -1560,18 +1561,44 @@ public abstract class AbstractRunMojo extends AbstractMojo {
     * Get the Alfresco Platform Webapp artifactId (i.e. for alfresco.war),
     * it changes from 'alfresco' to 'alfresco-platform' in 5.1.
     *
+     * Matrix for determining the Alfresco WAR Artifact
+     * 4.2.x Community  == alfresco.war
+     * 4.2.x Enterprise == alfresco.war
+     * 5.0.x Community  == alfresco.war
+     * 5.0.x Enterprise == alfresco-enterprise.war
+     * 5.1.x Community  == alfresco-platform.war
+     * 5.1.x Enterprise == alfresco-platform-enterprise.war
+     *
     * @return the Maven artifactId for Alfresco Platform webapp
     */
    private String getPlatformWarArtifactId() {
-        // Default alfrescoPlatformWarArtifactId is 'alfresco-platform'

-        if (isPlatformVersionGtOrEqTo51() == false) {
-            // We are running version 4.2 or 5.0, so use older artifactId
+        if (isPlatformVersionGtOrEqTo51() == false && alfrescoEdition.equals(ALFRESCO_COMMUNITY_EDITION)) {
+            // We are running version 4.2 or 5.0 in community so use "alfresco"
            alfrescoPlatformWarArtifactId = "alfresco";
-        } else if (alfrescoEdition.equals(ALFRESCO_ENTERPRISE_EDITION)) {
+        }
+
+        if (isPlatformVersionLtOrEqTo42() == true && alfrescoEdition.equals(ALFRESCO_ENTERPRISE_EDITION)) {
+            // We are running version 4.2 so use "alfresco-enterprise"
+            alfrescoPlatformWarArtifactId = "alfresco";
+        }
+
+        if (getPlatformVersionNumber() == 50 && alfrescoEdition.equals(ALFRESCO_ENTERPRISE_EDITION)) {
+            // We are running version 5.0 in enterprise so use "alfresco-enterprise"
            alfrescoPlatformWarArtifactId = "alfresco-enterprise";
        }

+
+        if (isPlatformVersionGtOrEqTo51() == true && alfrescoEdition.equals(ALFRESCO_COMMUNITY_EDITION)) {
+            // We are running version 5.1 or greater in community so use "alfresco-platform"
+            alfrescoPlatformWarArtifactId = "alfresco-platform";
+        }
+
+        if (isPlatformVersionGtOrEqTo51() == true && alfrescoEdition.equals(ALFRESCO_ENTERPRISE_EDITION)) {
+            // We are running version 5.1 or greater in enterprise so use "alfresco-platform-enterprise"
+            alfrescoPlatformWarArtifactId = "alfresco-platform-enterprise";
+        }
+
        return alfrescoPlatformWarArtifactId;
    }

--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.alfresco.maven</groupId>
    <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
    <name>Alfresco SDK</name>
    <description>This aggregator Project builds all modules required for the Alfresco SDK</description>
    <packaging>pom</packaging>
@@ -30,7 +30,7 @@
        <connection>scm:git:${scm.url.base}.git</connection>
        <developerConnection>scm:git:${scm.url.base}</developerConnection>
        <url>${scm.url.base}</url>
-      <tag>alfresco-sdk-aggregator-3.0.0</tag>
+      <tag>alfresco-sdk-aggregator-3.0.1</tag>
  </scm>

    <developers>
@@ -129,7 +129,7 @@
        <alfresco.sdk.tests.exclude>*/*-enterprise*/*</alfresco.sdk.tests.exclude>

        <!-- The following version is needed for alfresco-rad -->
-        <alfresco.community.default.version>5.2.e</alfresco.community.default.version>
+        <alfresco.community.default.version>5.2.f</alfresco.community.default.version>
        <alfresco.enterprise.default.version>5.2.0</alfresco.enterprise.default.version>
        <alfresco.sdk.default.edition>community</alfresco.sdk.default.edition>
Author	SHA1	Message	Date
alfresco-build	9071965850	[maven-release-plugin] prepare release alfresco-sdk-aggregator-3.0.1	2017-06-23 10:17:47 +01:00
Ole Hejlskov	1e5db412f7	Tidy up fixes for #461	2017-06-22 12:13:28 +02:00
Ole Hejlskov	37c26cfaa8	Correctly configure the artifact id for alfresco-platform, reported in #461 This also raises questions around the use of <alfresco.platform.war.artifactId /> since this will never have any effect currently	2017-04-21 18:21:41 +02:00
Ole Hejlskov	1cd4b82037	Revert MMT dependency version	2017-04-21 17:36:06 +02:00
Ole Hejlskov	758ab83faf	Merge pull request #459 from douglascrp/201702-GA_and_fixes Solution for #458 and #454	2017-04-21 11:49:13 +02:00
Douglas C. R. Paes	8862d67acd	Rolled back the api-explorer version as there is no 5.2.f version yet.	2017-04-20 16:41:49 -03:00
Douglas C. R. Paes	e4402a741f	plataform and share dependencies upgraded to match the latest GA release, which is 201702-GA	2017-04-20 16:04:44 -03:00
Douglas C. R. Paes	b1facc65de	gitignore	2017-04-20 16:03:12 -03:00
Ole Hejlskov	7668096829	Grab fix from #449 for 5.2.f support	2017-04-10 11:15:25 +02:00
Ole Hejlskov	ce7c374c1e	Remove beta-reference in name tag in archetype poms. Fixes #446	2017-04-05 16:30:03 +02:00
Ole Hejlskov	68dda3b211	Fix endpoint url to avoid "Share services" error and fix CMM. Fixes #445	2017-04-05 16:26:41 +02:00
alfresco-build	47a329a762	[maven-release-plugin] prepare for next development iteration	2017-03-30 11:12:25 +01:00