From 30c8fb162d943da91d0839379390b97b4d5024f0 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Fri, 22 Oct 2010 21:23:20 +0000
Subject: [PATCH] Updated the POM and modified the Ant build to obtain
 dependencies from the POM. 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
---
 build.xml | 19 ++----------
 pom.xml   | 87 +++++++++++++++++++++++++++++++++++--------------------
 2 files changed, 58 insertions(+), 48 deletions(-)

diff --git a/build.xml b/build.xml
index 8d418312f..22fe04d75 100644
--- a/build.xml
+++ b/build.xml
@@ -24,21 +24,9 @@
   <target name="-init-maven-ant" depends="-download-maven-ant">
     <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"
              uri="urn:maven-artifact-ant" classpath="${maven-ant.jar}"/>
-    <artifact:dependencies pathId="compile.classpath">
-      <dependency groupId="com.google.inject" artifactId="guice" version="2.0"/>
-      <dependency groupId="jboss" artifactId="javassist" version="3.7.ga"/>
-      <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>
+    <artifact:pom id="pom" file="pom.xml"/>
+    <artifact:dependencies pathId="compile.classpath" pomRefId="pom" useScope="compile"/>
+    <artifact:dependencies pathId="testlibs.classpath" pomRefId="pom" useScope="test"/>
   </target>
 
   <target name="-prepare" depends="-init-maven-ant">
@@ -54,7 +42,6 @@
       <pathelement location="${classes.dir}"/>
     </path>
     <path id="test.classpath">
-      <path refid="compile.classpath"/>
       <path refid="testlibs.classpath"/>
       <pathelement location="${classes.dir}"/>
       <pathelement location="${tclasses.dir}"/>
diff --git a/pom.xml b/pom.xml
index ff32dbd07..2e9b94427 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,10 +41,17 @@
   </scm>
 
   <dependencies>
+    <dependency>
+      <groupId>com.samskivert</groupId>
+      <artifactId>jmustache</artifactId>
+      <version>1.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>com.samskivert</groupId>
       <artifactId>samskivert</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -54,19 +61,6 @@
       <scope>compile</scope>
       <optional>true</optional>
     </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>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
@@ -107,13 +101,19 @@
       <version>1.7.1</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>RELEASE</version>
+        <version>2.3.2</version>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
@@ -127,7 +127,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>RELEASE</version>
+        <version>2.4.3</version>
         <configuration>
           <encoding>UTF-8</encoding>
         </configuration>
@@ -135,7 +135,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>RELEASE</version>
+        <version>2.7</version>
         <configuration>
           <quiet>true</quiet>
           <show>public</show>
@@ -150,36 +150,59 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-gpg-plugin</artifactId>
-        <version>RELEASE</version>
-        <executions>
-          <execution>
-            <id>sign-artifacts</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>sign</goal>
-            </goals>
-          </execution>
-        </executions>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.6</version>
         <configuration>
-          <keyname>mdb@samskivert.com</keyname>
+          <includes>
+            <include>com/threerings/**/*Test.java</include>
+          </includes>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>RELEASE</version>
+        <version>2.3.1</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-install-plugin</artifactId>
-        <version>RELEASE</version>
+        <version>2.3.1</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
-        <version>RELEASE</version>
+        <version>2.5</version>
       </plugin>
     </plugins>
   </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>