Commit dfa0937c authored by mindthegab's avatar mindthegab
Browse files

-- 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
parent a9e8bde3

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml

+0 −2
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ 
        <dependency>

            <groupId>junit</groupId>

            <artifactId>junit</artifactId>

            <version>4.8.1</version>

            <scope>test</scope>

        </dependency>

    </dependencies>

poms/alfresco-sdk-parent/pom.xml

+10 −9
Original line number Diff line number Diff line
@@ -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>