From 59f63764ecae079fd46762a01cc0bc069d863f53 Mon Sep 17 00:00:00 2001
From: slanglois <samuel.langlois@alfresco.com>
Date: Thu, 17 Oct 2013 10:42:20 +0000
Subject: [PATCH] Upgrade default Alfresco version to 4.2.e - and upgrade all
 outdated Maven plugins too

git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@702 04253f4f-3451-0410-a141-5562f1e59037
---
 .../demoamp/test/DemoComponentTest.java        |  4 ++--
 .../projects/basic/archetype.properties        |  4 ++--
 plugins/alfresco-maven-plugin/pom.xml          |  6 +++---
 pom.xml                                        |  8 ++++----
 poms/alfresco-sdk-parent/pom.xml               | 18 +++++++++---------
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/java/org/alfresco/demoamp/test/DemoComponentTest.java b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/java/org/alfresco/demoamp/test/DemoComponentTest.java
index 3208b702..f6539ffc 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/java/org/alfresco/demoamp/test/DemoComponentTest.java
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/java/org/alfresco/demoamp/test/DemoComponentTest.java
@@ -70,8 +70,8 @@ public class DemoComponentTest {
         NodeRef companyHome = demoComponent.getCompanyHome();
         int childNodeCount = demoComponent.childNodesCount(companyHome);
         assertNotNull(childNodeCount);
-        // There are 5 folders by default under Company Home
-        assertEquals(5, childNodeCount);
+        // There are 7 folders by default under Company Home
+        assertEquals(7, childNodeCount);
     }
 
 }
diff --git a/archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/archetype.properties b/archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/archetype.properties
index 0c739d61..8892a4eb 100644
--- a/archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/archetype.properties
+++ b/archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/archetype.properties
@@ -2,10 +2,10 @@
 package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it
-alfresco_target_version=4.2.c
+alfresco_target_version=4.2.e
 $=cat archetype.properties
 alfresco_target_groupId=org.alfresco
 alfresco_target_amp_client_war=alfresco
 alfresco_target_amp_client_war_groupId=org.alfresco
-alfresco_target_amp_client_war_version=4.2.c
+alfresco_target_amp_client_war_version=4.2.e
 artifactId=basic
diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml
index 4cc5e811..fc3813c4 100644
--- a/plugins/alfresco-maven-plugin/pom.xml
+++ b/plugins/alfresco-maven-plugin/pom.xml
@@ -17,7 +17,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.0</version>
+        <version>3.1</version>
         <configuration>
             <source>1.6</source>
             <target>1.6</target>
@@ -26,7 +26,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.0</version>
+        <version>3.2</version>
         <executions>
           <execution>
             <id>generated-helpmojo</id>
@@ -93,7 +93,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.0</version>
+        <version>3.2</version>
       </plugin>
     </plugins>
   </reporting>
diff --git a/pom.xml b/pom.xml
index 3b647fc3..9b431d89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,10 +138,10 @@
             <id>release</id>
             <properties>
                 <maven.site.url>https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-lifecycle-aggregator/latest</maven.site.url>
-                <maven.release.version>2.4</maven.release.version>
+                <maven.release.version>2.4.1</maven.release.version>
                 <maven.release.goals>deploy site-deploy</maven.release.goals>
-                <maven.site.version>3.2</maven.site.version>
-                <maven.changes.version>2.8</maven.changes.version>
+                <maven.site.version>3.3</maven.site.version>
+                <maven.changes.version>2.9</maven.changes.version>
             </properties>
             <build>
                 <plugins>
@@ -202,4 +202,4 @@
         </profile>
     </profiles>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml
index 2829cf49..bed3b2be 100644
--- a/poms/alfresco-sdk-parent/pom.xml
+++ b/poms/alfresco-sdk-parent/pom.xml
@@ -37,7 +37,7 @@
         | For available versions please search on https://artifacts.alfresco.com/nexus/index.html
         -->
     <alfresco.groupId>org.alfresco</alfresco.groupId>
-    <alfresco.version>4.2.c</alfresco.version>
+    <alfresco.version>4.2.e</alfresco.version>
 
     <!--  Values can be "alfresco" or "share". Default value is 'alfresco' assuming you are developing a repository AMP, change to share for share AMPs 
         | This impact (in AMP projects) the choice of the WAR project for embedded run
@@ -97,23 +97,23 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- Maven Plugins Versions used by the SDK -->
-    <maven.compiler.version>3.0</maven.compiler.version>
+    <maven.compiler.version>3.1</maven.compiler.version>
     <maven.clean.version>2.5</maven.clean.version>
     <maven.dependency.version>2.8</maven.dependency.version>
-    <maven.enforcer.plugin>1.2</maven.enforcer.plugin>
+    <maven.enforcer.plugin>1.3</maven.enforcer.plugin>
     <maven.resources.version>2.6</maven.resources.version>
-    <maven.surefire.version>2.13</maven.surefire.version>
-    <maven.install.version>2.4</maven.install.version>
+    <maven.surefire.version>2.16</maven.surefire.version>
+    <maven.install.version>2.5</maven.install.version>
     <maven.jar.version>2.4</maven.jar.version>
-    <maven.war.version>2.3</maven.war.version>
-    <maven.release.version>2.4</maven.release.version>
-    <maven.buildhelper.version>1.7</maven.buildhelper.version>
+    <maven.war.version>2.4</maven.war.version>
+    <maven.release.version>2.4.1</maven.release.version>
+    <maven.buildhelper.version>1.8</maven.buildhelper.version>
     <maven.jetty.version>6.1.26</maven.jetty.version>
     <!-- This is used for the site deployment procedure (override in your POM as needed) -->
     <stagingDirectory>../../target/staging/poms/alfresco-sdk-parent</stagingDirectory>
     <!-- Alfresco Maven plugin in use throughout the SDK -->
     <maven.alfresco.version>1.0.3-SNAPSHOT</maven.alfresco.version>
-    <h2.version>1.3.170</h2.version>
+    <h2.version>1.3.173</h2.version>
     <h2-support.version>1.5</h2-support.version>
   </properties>