From c9b33b4f59c1a79d92e0f5011f37086604a57847 Mon Sep 17 00:00:00 2001
From: Samuel Langlois <samuel.langlois@alfresco.com>
Date: Thu, 23 Mar 2017 16:08:31 +0000
Subject: [PATCH 1/2] #443 Upgrade Maven plugins and dependencies

---
 archetypes/activiti-jar-archetype/pom.xml     |  1 -
 .../alfresco-allinone-archetype/pom.xml       |  1 -
 .../alfresco-platform-jar-archetype/pom.xml   |  1 -
 .../alfresco-share-jar-archetype/pom.xml      |  1 -
 plugins/alfresco-maven-plugin/pom.xml         | 24 +++++++++----------
 pom.xml                                       | 19 ++++++++-------
 6 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/archetypes/activiti-jar-archetype/pom.xml b/archetypes/activiti-jar-archetype/pom.xml
index cdde384c..9a9bb515 100644
--- a/archetypes/activiti-jar-archetype/pom.xml
+++ b/archetypes/activiti-jar-archetype/pom.xml
@@ -48,7 +48,6 @@
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-resources-plugin</artifactId>
-            <version>${maven.resource.version}</version>
             <configuration>
                 <useDefaultDelimiters>false</useDefaultDelimiters>
                 <delimiters>
diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml
index 7a72870e..ca597016 100644
--- a/archetypes/alfresco-allinone-archetype/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/pom.xml
@@ -47,7 +47,6 @@
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-resources-plugin</artifactId>
-            <version>${maven.resource.version}</version>
             <configuration>
                 <useDefaultDelimiters>false</useDefaultDelimiters>
                 <delimiters>
diff --git a/archetypes/alfresco-platform-jar-archetype/pom.xml b/archetypes/alfresco-platform-jar-archetype/pom.xml
index 252090e2..223c8b66 100644
--- a/archetypes/alfresco-platform-jar-archetype/pom.xml
+++ b/archetypes/alfresco-platform-jar-archetype/pom.xml
@@ -48,7 +48,6 @@
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-resources-plugin</artifactId>
-            <version>${maven.resource.version}</version>
             <configuration>
                 <useDefaultDelimiters>false</useDefaultDelimiters>
                 <delimiters>
diff --git a/archetypes/alfresco-share-jar-archetype/pom.xml b/archetypes/alfresco-share-jar-archetype/pom.xml
index 1127c735..15279f98 100644
--- a/archetypes/alfresco-share-jar-archetype/pom.xml
+++ b/archetypes/alfresco-share-jar-archetype/pom.xml
@@ -50,7 +50,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>${maven.resource.version}</version>
                 <configuration>
                     <useDefaultDelimiters>false</useDefaultDelimiters>
                     <delimiters>
diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml
index ec4a35e5..8204865e 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-plugin-plugin</artifactId>
-        <version>3.2</version>
+        <version>3.5</version>
         <executions>
           <execution>
             <id>generated-helpmojo</id>
@@ -68,12 +68,12 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.0.4</version>
+      <version>3.2.5</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.2</version>
+      <version>3.5</version>
       <!-- Annotations are not needed for plugin execution so you
            can remove this dependency for execution by using provided scope. -->
       <scope>provided</scope>
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-archiver</artifactId>
-      <version>2.5</version>
+      <version>3.1.1</version>
       <exclusions>
         <exclusion>
             <artifactId>maven-core</artifactId>
@@ -92,32 +92,32 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
-      <version>2.3</version>
+      <version>3.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>3.0.4</version>
+      <version>3.2.5</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>3.0.4</version>
+      <version>3.2.5</version>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>4.3</version>
+      <version>4.5.3</version>
     </dependency>
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
-      <version>3.3</version>
+      <version>3.6</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.1</version>
+      <version>2.5</version>
     </dependency>
     <dependency>
       <groupId>org.alfresco</groupId>
@@ -138,7 +138,7 @@
     <dependency>
       <groupId>org.zeroturnaround</groupId>
       <artifactId>zt-zip</artifactId>
-      <version>1.9</version>
+      <version>1.11</version>
     </dependency>
   </dependencies>
 
@@ -147,7 +147,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.3</version>
+        <version>3.5</version>
       </plugin>
     </plugins>
   </reporting>
diff --git a/pom.xml b/pom.xml
index c6e44afa..3b7adb3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,8 +132,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
-        <maven.resource.version>3.0.1</maven.resource.version>
-        <maven.archetype.version>2.4</maven.archetype.version>
+        <maven.archetype.version>3.0.0</maven.archetype.version>
         <alfresco.sdk.parent.version>${project.version}</alfresco.sdk.parent.version>
         <alfresco.sdk.tests.exclude>*/*-enterprise/*</alfresco.sdk.tests.exclude>
 
@@ -146,6 +145,11 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.0.2</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-archetype-plugin</artifactId>
@@ -253,17 +257,14 @@
             <id>sdk-release</id>
             <properties>
                 <maven.site.url>https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/latest</maven.site.url>
-                <maven.release.version>2.5.2</maven.release.version>
                 <maven.release.goals>deploy site-deploy</maven.release.goals>
-                <maven.site.version>3.4</maven.site.version>
-                <maven.changes.version>2.10</maven.changes.version>
             </properties>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.5</version>
+                        <version>1.6</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -277,7 +278,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-release-plugin</artifactId>
-                        <version>${maven.release.version}</version>
+                        <version>2.5.3</version>
                         <configuration>
                             <preparationGoals>clean install</preparationGoals>
                             <goals>${maven.release.goals}</goals>
@@ -291,7 +292,7 @@
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-site-plugin</artifactId>
-                            <version>${maven.site.version}</version>
+                            <version>3.6</version>
                         </plugin>
                     </plugins>
                 </pluginManagement>
@@ -301,7 +302,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-changes-plugin</artifactId>
-                        <version>${maven.changes.version}</version>
+                        <version>2.12.1</version>
                         <reportSets>
                             <reportSet>
                                 <reports>

From b7dbbe89957f819ab6f039133245cb8b8c398b84 Mon Sep 17 00:00:00 2001
From: Samuel Langlois <samuel.langlois@alfresco.com>
Date: Thu, 23 Mar 2017 17:17:55 +0000
Subject: [PATCH 2/2] Downgrade alfresco-mmt dependency to 5.1.g, for plugin to
 work with JDK7

---
 plugins/alfresco-maven-plugin/pom.xml | 2 +-
 pom.xml                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml
index 8204865e..628b128b 100644
--- a/plugins/alfresco-maven-plugin/pom.xml
+++ b/plugins/alfresco-maven-plugin/pom.xml
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-mmt</artifactId>
-      <version>${alfresco.community.default.version}</version>
+      <version>5.1.g</version>
     </dependency>
     <dependency>
         <groupId>org.alfrescolabs.alfresco-technical-validation</groupId>
diff --git a/pom.xml b/pom.xml
index 3b7adb3f..44ac26e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,7 @@
         <alfresco.sdk.parent.version>${project.version}</alfresco.sdk.parent.version>
         <alfresco.sdk.tests.exclude>*/*-enterprise/*</alfresco.sdk.tests.exclude>
 
-        <!-- The following version is needed to grab the alfresco-mmt -->
+        <!-- The following version is needed for alfresco-rad -->
         <alfresco.community.default.version>5.2.e</alfresco.community.default.version>
 
         <scm.url.base>https://github.com/Alfresco/alfresco-sdk</scm.url.base>