AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated the POM and modified the Ant build to obtain dependencies from the POM.

Browse Source 
That's now the canonical place to list the dependencies, which will make
eventual publishing of Narya to Maven Central easier, and will make using
things like m2eclipse smoother.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6223 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2010-10-22 21:23:20 +00:00
parent 9d2ca42eac
commit 30c8fb162d
2 changed files with 58 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+3 -16
View File
@@ -24,21 +24,9 @@
<target name="-init-maven-ant" depends="-download-maven-ant"> <target name="-init-maven-ant" depends="-download-maven-ant">
<taskdef resource="org/apache/maven/artifact/ant/antlib.xml" <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="urn:maven-artifact-ant" classpath="${maven-ant.jar}"/> uri="urn:maven-artifact-ant" classpath="${maven-ant.jar}"/>
<artifact:dependencies pathId="compile.classpath"> <artifact:pom id="pom" file="pom.xml"/>
<dependency groupId="com.google.inject" artifactId="guice" version="2.0"/> <artifact:dependencies pathId="compile.classpath" pomRefId="pom" useScope="compile"/>
<dependency groupId="jboss" artifactId="javassist" version="3.7.ga"/> <artifact:dependencies pathId="testlibs.classpath" pomRefId="pom" useScope="test"/>
<dependency groupId="com.threerings" artifactId="gwt-utils" version="1.0"/>
<dependency groupId="com.google.gwt" artifactId="gwt-user" version="2.0.4"/>
<dependency groupId="org.apache.ant" artifactId="ant" version="1.7.1"/>
<dependency groupId="com.samskivert" artifactId="samskivert" version="1.1"/>
<dependency groupId="com.samskivert" artifactId="depot" version="1.0"/>
<dependency groupId="net.sf.ehcache" artifactId="ehcache" version="1.6.0"/>
<dependency groupId="com.google.guava" artifactId="guava" version="r05"/>
<dependency groupId="com.samskivert" artifactId="jmustache" version="1.0"/>
</artifact:dependencies>
<artifact:dependencies pathId="testlibs.classpath">
<dependency groupId="junit" artifactId="junit" version="4.8.1"/>
</artifact:dependencies>
</target> </target>
<target name="-prepare" depends="-init-maven-ant"> <target name="-prepare" depends="-init-maven-ant">
@@ -54,7 +42,6 @@
<pathelement location="${classes.dir}"/> <pathelement location="${classes.dir}"/>
</path> </path>
<path id="test.classpath"> <path id="test.classpath">
<path refid="compile.classpath"/>
<path refid="testlibs.classpath"/> <path refid="testlibs.classpath"/>
<pathelement location="${classes.dir}"/> <pathelement location="${classes.dir}"/>
<pathelement location="${tclasses.dir}"/> <pathelement location="${tclasses.dir}"/>
pom.xml
+55 -32
View File
@@ -41,10 +41,17 @@
</scm> </scm>
<dependencies> <dependencies>
<dependency>
<groupId>com.samskivert</groupId>
<artifactId>jmustache</artifactId>
<version>1.0</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>com.samskivert</groupId> <groupId>com.samskivert</groupId>
<artifactId>samskivert</artifactId> <artifactId>samskivert</artifactId>
<version>1.1-SNAPSHOT</version> <version>1.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -54,19 +61,6 @@
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.6.4</version>
<scope>compile</scope>
<optional>true</optional>
<exclusions>
<exclusion><groupId>oro</groupId><artifactId>oro</artifactId></exclusion>
<exclusion><groupId>com.sun.jmx</groupId><artifactId>jmxri</artifactId></exclusion>
<exclusion><groupId>oro</groupId><artifactId>oro</artifactId></exclusion>
<exclusion><groupId>junit</groupId><artifactId>junit</artifactId></exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>com.google.inject</groupId> <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId> <artifactId>guice</artifactId>
@@ -107,13 +101,19 @@
<version>1.7.1</version> <version>1.7.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>RELEASE</version> <version>2.3.2</version>
<configuration> <configuration>
<source>1.6</source> <source>1.6</source>
<target>1.6</target> <target>1.6</target>
@@ -127,7 +127,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>RELEASE</version> <version>2.4.3</version>
<configuration> <configuration>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
@@ -135,7 +135,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>RELEASE</version> <version>2.7</version>
<configuration> <configuration>
<quiet>true</quiet> <quiet>true</quiet>
<show>public</show> <show>public</show>
@@ -150,36 +150,59 @@
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>RELEASE</version> <version>2.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
<configuration> <configuration>
<keyname>mdb@samskivert.com</keyname> <includes>
<include>com/threerings/**/*Test.java</include>
</includes>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>RELEASE</version> <version>2.3.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId> <artifactId>maven-install-plugin</artifactId>
<version>RELEASE</version> <version>2.3.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId> <artifactId>maven-deploy-plugin</artifactId>
<version>RELEASE</version> <version>2.5</version>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>release-sign-artifacts</id>
<activation>
<property><name>performRelease</name><value>true</value></property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.1</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
<configuration>
<keyname>mdb@samskivert.com</keyname>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>