From dfa0937cd56af43ac844239452de433b1bf8396f Mon Sep 17 00:00:00 2001
From: mindthegab <gabriele@apache.org>
Date: Tue, 17 Jun 2014 09:44:22 +0000
Subject: [PATCH] -- upgraded junit version -- consolidated in parent pom
 version and scope

git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@739 04253f4f-3451-0410-a141-5562f1e59037
---
 .../resources/archetype-resources/pom.xml     |  2 --
 poms/alfresco-sdk-parent/pom.xml              | 19 ++++++++++---------
 2 files changed, 10 insertions(+), 11 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 3bb4f433..8aaefd63 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
@@ -68,8 +68,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.1</version>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml
index 7ca40ab7..70eeffb2 100644
--- a/poms/alfresco-sdk-parent/pom.xml
+++ b/poms/alfresco-sdk-parent/pom.xml
@@ -115,6 +115,7 @@
     <maven.alfresco.version>1.1.2-SNAPSHOT</maven.alfresco.version>
     <h2.version>1.3.174</h2.version>
     <h2-support.version>1.5</h2-support.version>
+    <junit.version>4.11</junit.version>
   </properties>
 
   <repositories>
@@ -463,6 +464,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>
           <!-- Add RAD capabilities for remote JUnit test running (client) -->
           <dependency>
               <groupId>org.alfresco.maven</groupId>
@@ -728,18 +735,12 @@
                          <requireProperty>
                             <property>alfresco.version</property>
                             <message>The SDK is supported only for Alfresco 4.1.2+ and 4.2+ versions</message>
-                            <regex>^(4\.1\.[2-9]|4\.[2-9]|[5-9]).*</regex>
-                         </requireProperty>
-                         <!-- Test for groupId value (Community / Enterprise) -->
-                         <requireProperty>
-                            <property>alfresco.groupId</property>
-                            <message>You need to select an Alfresco Edition (Community / Enterprise) by setting alfresco.groupId=org.alfresco|org.alfresco.enterprise</message>
-                            <regex>(org\.alfresco|org\.alfresco\.enterprise)</regex>
+                            <regex>^4\.3\..*</regex>
                          </requireProperty>
                          <!-- Test for JDK version -->
                          <requireJavaVersion>
-                            <version>[1.6.0,)</version>
-                            <message>Alfresco 4.1+ requires Java 6</message>
+                            <version>[1.7.0,)</version>
+                            <message>Alfresco 4.3+ requires Java 7</message>
                          </requireJavaVersion>
                       </rules>
                       <fail>true</fail>