From 3735773e7166569e68d2aec76d6aa800480942c3 Mon Sep 17 00:00:00 2001
From: Maurizio Pillitu <maurizio@session.it>
Date: Fri, 25 Jul 2014 15:22:58 +0200
Subject: [PATCH 1/4] fixes issue #163. junit dependency definition on
 amp-archetype, I removed it where unnecessary (while keeping junit in the
 test build scope)

---
 .../resources/archetype-resources/pom.xml     | 28 ++++++------
 .../resources/archetype-resources/pom.xml     |  8 +---
 .../resources/archetype-resources/pom.xml     | 44 ++++++++-----------
 poms/alfresco-sdk-parent/pom.xml              | 24 +++++++---
 4 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
index e552c3db..9e16d543 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
@@ -14,20 +14,20 @@
         <version>@@alfresco.sdk.parent.version@@</version>
     </parent>
     
-    <!-- 
-       | SDK properties have sensible defaults in the SDK parent, but you can override the properties below to use another version. 
-       | For more available properties see the alfresco-sdk-parent POM. 
+    <!-- 
+       | SDK properties have sensible defaults in the SDK parent, but you can override the properties below to use another version. 
+       | For more available properties see the alfresco-sdk-parent POM. 
        -->
     <properties>
         <!-- 
-            | Defines the groupId for the Alfresco Artifacts to work against. As of 4.2 the only allowed value is: org.alfresco
-            | NOTE: See http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-tutorials-alfresco-enterprise.html for details
-        -->
-        <alfresco.groupId>${alfresco_target_groupId}</alfresco.groupId>
-        <!-- Defines the Alfresco version to work against.
-             Community versions are typically identified by major.minor.character (4.2.a) while Enterprise versions are identified by major.minor.digit (4.2.0) 
+            | Defines the groupId for the Alfresco Artifacts to work against. As of 4.2 the only allowed value is: org.alfresco
+            | NOTE: See http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-tutorials-alfresco-enterprise.html for details
         -->
-        <alfresco.version>${alfresco_target_version}</alfresco.version>
+        <alfresco.groupId>${alfresco_target_groupId}</alfresco.groupId>
+        <!-- Defines the Alfresco version to work against.
+             Community versions are typically identified by major.minor.character (4.2.a) while Enterprise versions are identified by major.minor.digit (4.2.0) 
+        -->
+        <!--<alfresco.version>${alfresco_target_version}</alfresco.version>-->
         <!-- This control the root logging level for all apps -->
         <app.log.root.level>WARN</app.log.root.level>
         <!-- This controls the default data location for dir.root -->
@@ -39,10 +39,10 @@
    <!-- Here we realize the connection with the Alfresco selected platform (e.g.version and edition) -->
    <dependencyManagement>
      <dependencies>
-          <!-- This will import the dependencyManagement for all artifacts in the selected Alfresco plaftorm
-               (see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Importing_Dependencies)
-               NOTE: You still need to define dependencies in your POM, but you can omit version as it's enforced by this dependencyManagement.
-               NOTE: It defaults to the latest version this SDK pom has been tested with, but alfresco version can/should be overridden in your project's pom   
+          <!-- This will import the dependencyManagement for all artifacts in the selected Alfresco plaftorm
+               (see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Importing_Dependencies)
+               NOTE: You still need to define dependencies in your POM, but you can omit version as it's enforced by this dependencyManagement.
+               NOTE: It defaults to the latest version this SDK pom has been tested with, but alfresco version can/should be overridden in your project's pom   
            -->
           <dependency>
               <groupId>${alfresco.groupId}</groupId>
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
index ebc1ed8e..45fce7e4 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
@@ -28,7 +28,7 @@
         <alfresco.groupId>${alfresco_target_groupId}</alfresco.groupId>
         <!-- Defines the Alfresco version to work against.
              Community versions are typically identified by major.minor.character (4.2.a) while Enterprise versions are identified by major.minor.digit (4.2.0)  -->
-        <alfresco.version>${alfresco_target_version}</alfresco.version>
+        <!--<alfresco.version>${alfresco_target_version}</alfresco.version>-->
         <app.log.root.level>WARN</app.log.root.level>
         <alfresco.data.location>alf_data_dev</alfresco.data.location>
         <!-- Defines the target WAR artifactId to run this amp, only used with the -Pamp-to-war switch
@@ -68,11 +68,7 @@
             <groupId>${alfresco.groupId}</groupId>
             <artifactId>alfresco-repository</artifactId>
         </dependency>
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
+        <!-- JUnit is inherited by alfresco-sdk-parent -->
     </dependencies>
 
     <!-- This repository is only needed to retrieve Alfresco parent POM. 
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml
index 7778b040..ede03741 100644
--- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml
@@ -21,15 +21,15 @@
        | For more available properties see the alfresco-sdk-parent POM. 
        -->
     <properties>
-        <!--
-            | Defines the groupId for the Alfresco Artifacts to work against. As of 4.2 the only allowed value is: org.alfresco
-            | NOTE: See http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-tutorials-alfresco-enterprise.html for details
-        -->
-        <alfresco.groupId>${alfresco_target_groupId}</alfresco.groupId>
-        <!-- Defines the Alfresco version to work against.
-             Community versions are typically identified by major.minor.character (4.2.a) while Enterprise versions are identified by major.minor.digit (4.2.0)
-        -->
-        <alfresco.version>${alfresco_target_version}</alfresco.version>
+        <!--
+            | Defines the groupId for the Alfresco Artifacts to work against. As of 4.2 the only allowed value is: org.alfresco
+            | NOTE: See http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-tutorials-alfresco-enterprise.html for details
+        -->
+        <alfresco.groupId>${alfresco_target_groupId}</alfresco.groupId>
+        <!-- Defines the Alfresco version to work against.
+             Community versions are typically identified by major.minor.character (4.2.a) while Enterprise versions are identified by major.minor.digit (4.2.0)
+        -->
+        <!--<alfresco.version>${alfresco_target_version}</alfresco.version>-->
         <app.log.root.level>WARN</app.log.root.level>
         <alfresco.data.location>alf_data_dev</alfresco.data.location>
         <!-- Defines the target WAR artifactId to run this amp, only used with the -Pamp-to-war switch
@@ -42,9 +42,9 @@
         <alfresco.client.war.version>${alfresco_target_amp_client_war_version}</alfresco.client.war.version>
         <!-- This controls which properties will be picked in src/test/properties for embedded run -->
         <env>local</env>
-
-        <!-- Tell Tomcat to run on port 8081 since this is a standalone project, and likely Alfresco will have taken port 8080 -->
-        <maven.tomcat.port>8081</maven.tomcat.port>
+
+        <!-- Tell Tomcat to run on port 8081 since this is a standalone project, and likely Alfresco will have taken port 8080 -->
+        <maven.tomcat.port>8081</maven.tomcat.port>
     </properties>
 
     <!-- Here we realize the connection with the Alfresco selected platform 
@@ -72,21 +72,15 @@
             <groupId>${alfresco.groupId}</groupId>
             <artifactId>alfresco-repository</artifactId>
         </dependency>
-
-        <dependency>
-          <groupId>org.springframework.extensions.surf</groupId>
-          <artifactId>spring-surf-api</artifactId>
-          <version>1.2.1-M16</version>
-          <scope>provided</scope>
-        </dependency>
-        
-        <!-- Test dependencies -->
+
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.1</version>
-            <scope>test</scope>
+          <groupId>org.springframework.extensions.surf</groupId>
+          <artifactId>spring-surf-api</artifactId>
+          <version>1.2.1-M16</version>
+          <scope>provided</scope>
         </dependency>
+
+        <!-- JUnit is inherited by alfresco-sdk-parent -->
     </dependencies>
 
     <!-- This repository is only needed to retrieve Alfresco parent POM. 
diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml
index 68ec1959..53a9d556 100644
--- a/poms/alfresco-sdk-parent/pom.xml
+++ b/poms/alfresco-sdk-parent/pom.xml
@@ -470,12 +470,12 @@
             <version>${h2-support.version}</version>
             <scope>test</scope>
           </dependency>
-          <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-          </dependency>
+          <!--<dependency>-->
+            <!--<groupId>junit</groupId>-->
+            <!--<artifactId>junit</artifactId>-->
+            <!--<version>${junit.version}</version>-->
+            <!--<scope>test</scope>-->
+          <!--</dependency>-->
           <!-- Add RAD capabilities for remote JUnit test running (client) -->
           <dependency>
               <groupId>org.alfresco.maven</groupId>
@@ -757,5 +757,17 @@
             </plugins>
         </build>
     </profile>
+    <profile>
+        <id>enterprise</id>
+        <properties>
+            <alfresco.version>4.2.2</alfresco.version>
+        </properties>
+        <repositories>
+            <repository>
+                <id>alfresco-private</id>
+                <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
+            </repository>
+        </repositories>
+    </profile>
   </profiles>
 </project>

From ed17a67187e9cd277596cb91baaef2ec4015f62b Mon Sep 17 00:00:00 2001
From: Maurizio Pillitu <maurizio@session.it>
Date: Fri, 25 Jul 2014 15:46:40 +0200
Subject: [PATCH 2/4] commented alfresco.client.war.version, which defaults to
 alfresco.version

---
 .../src/main/resources/archetype-resources/pom.xml              | 2 +-
 .../src/main/resources/archetype-resources/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
index 45fce7e4..67c5688c 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
@@ -38,7 +38,7 @@
         .    | Could be org.alfresco or your corporate groupId -->
         <alfresco.client.war.groupId>${alfresco_target_amp_client_war_groupId}</alfresco.client.war.groupId>
         <!-- Defines the target WAR version to run this amp, only used with the -Pamp-to-war switch -->
-        <alfresco.client.war.version>${alfresco_target_amp_client_war_version}</alfresco.client.war.version>
+        <!--<alfresco.client.war.version>${alfresco_target_amp_client_war_version}</alfresco.client.war.version>-->
         <!-- This controls which properties will be picked in src/test/properties for embedded run -->
         <env>local</env>
     </properties>
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml
index ede03741..29af1879 100644
--- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml
@@ -39,7 +39,7 @@
         .    | Could be org.alfresco | org.alfresco.enterprise or your corporate groupId -->
         <alfresco.client.war.groupId>${alfresco_target_amp_client_war_groupId}</alfresco.client.war.groupId>
         <!-- Defines the target WAR version to run this amp, only used with the -Pamp-to-war switch -->
-        <alfresco.client.war.version>${alfresco_target_amp_client_war_version}</alfresco.client.war.version>
+        <!--<alfresco.client.war.version>${alfresco_target_amp_client_war_version}</alfresco.client.war.version>-->
         <!-- This controls which properties will be picked in src/test/properties for embedded run -->
         <env>local</env>
 

From feb0d736daeee9b1682a6b9eadb4a805f39d710f Mon Sep 17 00:00:00 2001
From: Maurizio Pillitu <maurizio@session.it>
Date: Fri, 25 Jul 2014 18:11:19 +0200
Subject: [PATCH 3/4] added documentation for issue #163

---
 poms/alfresco-sdk-parent/src/site/apt/sdk-profiles.apt.vm | 4 +++-
 src/site/apt/prerequisites.apt.vm                         | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/poms/alfresco-sdk-parent/src/site/apt/sdk-profiles.apt.vm b/poms/alfresco-sdk-parent/src/site/apt/sdk-profiles.apt.vm
index f701eaf9..f89722d0 100644
--- a/poms/alfresco-sdk-parent/src/site/apt/sdk-profiles.apt.vm
+++ b/poms/alfresco-sdk-parent/src/site/apt/sdk-profiles.apt.vm
@@ -25,8 +25,10 @@ SDK Available Profiles
 | enable-amp-testing |  Allows AMP unit testing                              |  Automatic if <<<src/test/java>>> is present   | test |
 *-----------*--------------*-------------*-------------*
 | enable-amp         |  Activates AMP packaging                              |  Automatic if <<<src/main/amp/modules.properties>>> is present   | test |
+*-----------*--------------*-------------*-------------*
+| enterprise         |  Uses Alfresco Enterprise 4.2.2 version (check {{{http://docs.alfresco.com/4.2/tasks/dev-extensions-maven-sdk-tutorials-configure-maven-enterprise.html} configuration steps on Alfresco Docs}})               |  Manual: <<<-Penterprise>>>       |  |
 *-----------+--------------+-------------+-------------+
-    
+
     The full list of available profiles (with their activation conditions) can be instead found in the <<<profiles>>> section of the
     {{{https://artifacts.alfresco.com/nexus/index.html#nexus-search;gav~org.alfresco.maven~alfresco-sdk-parent~${project.version}~pom~}Alfresco SDK POM}}.
 
diff --git a/src/site/apt/prerequisites.apt.vm b/src/site/apt/prerequisites.apt.vm
index a78d0947..528c36a7 100644
--- a/src/site/apt/prerequisites.apt.vm
+++ b/src/site/apt/prerequisites.apt.vm
@@ -27,7 +27,8 @@ Maven Alfresco SDK\x99 Pre-Requisites
      Alfresco platform is retrieved automatically from {{{https://artifacts.alfresco.com} the Alfresco Artifacts Repository}}
      based on the <<<alfresco.groupId>>> and <<<alfresco.version>>> POM properties 
 
-     
+     * If you're an Alfresco customer, you can setup a ~/.m2/settings.xml as documented on {{{http://docs.alfresco.com/4.2/tasks/dev-extensions-maven-sdk-tutorials-configure-maven-enterprise.html} Alfresco Docs page}} and specify -Penterprise on your maven build command to use Alfresco Enterprise 4.2.2 version
+
 H2 Embedded Support Pre-Requisites
 
     This SDK allows H2 embedded run of Alfresco (<<NOTE>>: this is an unsupported configuration for Alfresco Enterprise) leveraging 

From 17350c43281ad73a7437a057a65120af7d93cb51 Mon Sep 17 00:00:00 2001
From: Maurizio Pillitu <maurizio@session.it>
Date: Fri, 25 Jul 2014 18:15:23 +0200
Subject: [PATCH 4/4] changed Alfresco private repository id to
 alfresco-private-repository, in order to be compliant with
 http://docs.alfresco.com/4.2/tasks/dev-extensions-maven-sdk-tutorials-configure-maven-enterprise.html
 (issue #163)

---
 poms/alfresco-sdk-parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml
index 53a9d556..27342384 100644
--- a/poms/alfresco-sdk-parent/pom.xml
+++ b/poms/alfresco-sdk-parent/pom.xml
@@ -764,7 +764,7 @@
         </properties>
         <repositories>
             <repository>
-                <id>alfresco-private</id>
+                <id>alfresco-private-repository</id>
                 <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
             </repository>
         </repositories>