From ae60652d8689f4796db5df5af76a1e2514129b33 Mon Sep 17 00:00:00 2001 From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com> Date: Tue, 28 Oct 2014 23:58:21 -0400 Subject: [PATCH] Cleaned up dependency management in maven build chain. Issue: DANN-8 Change-Id: I94a333fe8b371813dea24f40ecd80e8359368b55 --- pom.xml | 100 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 49 deletions(-) diff --git a/pom.xml b/pom.xml index 1b201c9..5323956 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,35 @@ </snapshotRepository> </distributionManagement> + <repositories> + <repository> + <id>snapshots</id> + <name>Syncleus Maven Snapshot Respository</name> + <url>http://repo.syncleus.com/repository/snapshots/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>dependencies</id> + <name>Syncleus Maven Dependencies Repository</name> + <url>http://repo.syncleus.com/repository/dependencies/</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>freehep-maven</id> + <name>Maven FreeHEP</name> + <url>http://java.freehep.org/maven2</url> + </repository> + </repositories> <build> <resources> @@ -67,7 +96,12 @@ </includes> </resource> </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> @@ -75,10 +109,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>pertest</forkMode> - <argLine>-enableassertions</argLine> - </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -98,63 +128,35 @@ </plugins> </build> - <dependencies> - + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.freehep</groupId> <artifactId>freehep-java3d</artifactId> - <version>2.0-SNAPSHOT</version> </dependency> - + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>dann-core</artifactId> + </dependency> <dependency> <groupId>org.easytesting</groupId> <artifactId>fest-swing-junit</artifactId> + <scope>test</scope> + <version>1.2</version> </dependency> - <dependency> <groupId>org.easytesting</groupId> <artifactId>fest-util</artifactId> + <scope>test</scope> + <version>1.1.4</version> </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>dann-core</artifactId> - </dependency> - </dependencies> - - <repositories> - <repository> - <id>snapshots</id> - <name>Syncleus Maven Snapshot Respository</name> - <url>http://repo.syncleus.com/repository/snapshots/</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - - <repository> - <id>dependencies</id> - <name>Syncleus Maven Dependencies Repository</name> - <url>http://repo.syncleus.com/repository/dependencies/</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - - - <repository> - <id>freehep-maven</id> - <name>Maven FreeHEP</name> - <url>http://java.freehep.org/maven2</url> - </repository> - </repositories> - </project> -- GitLab