Commit 3735773e authored by Maurizio Pillitu's avatar Maurizio Pillitu
Browse files

fixes issue #163. junit dependency definition on amp-archetype, I removed it... 

fixes issue #163. junit dependency definition on amp-archetype, I removed it where unnecessary (while keeping junit in the test build scope)
parent f7731c25

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

+13 −13
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
        <!-- 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>-->

        <!-- 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 -->

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

+2 −6
Original line number Diff line number Diff line
@@ -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.

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

+19 −25
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
        <!-- 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
@@ -80,13 +80,7 @@ 
          <scope>provided</scope>

        </dependency>



        <!-- Test dependencies -->

        <dependency>

            <groupId>junit</groupId>

            <artifactId>junit</artifactId>

            <version>4.8.1</version>

            <scope>test</scope>

        </dependency>

        <!-- JUnit is inherited by alfresco-sdk-parent -->

    </dependencies>



    <!-- This repository is only needed to retrieve Alfresco parent POM.

poms/alfresco-sdk-parent/pom.xml

+18 −6
Original line number Diff line number Diff line
@@ -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>