From 3fefd489537a9e4507c27b7d7c015ef7f74caf85 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Wed, 11 Jan 2012 00:34:25 +0000
Subject: [PATCH] Use ooo-util 1.1 to get the latest goods.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6766 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 etc/tools-pom.xml | 15 +++------------
 pom.xml           | 16 ++++++----------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/etc/tools-pom.xml b/etc/tools-pom.xml
index ff0e0883a..3d93103e5 100644
--- a/etc/tools-pom.xml
+++ b/etc/tools-pom.xml
@@ -11,28 +11,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.samskivert</groupId>
-      <artifactId>samskivert</artifactId>
-      <version>1.5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>11.0.1</version>
-      <scope>compile</scope>
+      <groupId>com.threerings</groupId>
+      <artifactId>ooo-util</artifactId>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>com.samskivert</groupId>
       <artifactId>jmustache</artifactId>
       <version>1.4</version>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>javassist</groupId>
       <artifactId>javassist</artifactId>
       <version>3.8.0.GA</version>
-      <scope>compile</scope>
     </dependency>
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 3cdd7e21c..65dd29cf3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,66 +42,62 @@
   </scm>
 
   <dependencies>
+    <!-- exported dependencies -->
     <dependency>
       <groupId>com.threerings</groupId>
       <artifactId>ooo-util</artifactId>
-      <version>1.0</version>
-      <scope>compile</scope>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
       <version>2.0</version>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>javax.annotation</groupId>
       <artifactId>jsr250-api</artifactId>
       <version>1.0</version>
-      <scope>compile</scope>
     </dependency>
+
+    <!-- optional dependencies -->
     <dependency>
       <groupId>com.samskivert</groupId>
       <artifactId>jmustache</artifactId>
       <version>1.4</version>
-      <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>com.samskivert</groupId>
       <artifactId>depot</artifactId>
       <version>1.5</version>
-      <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>com.google.gwt</groupId>
       <artifactId>gwt-user</artifactId>
       <version>2.4.0</version>
-      <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>javassist</groupId>
       <artifactId>javassist</artifactId>
       <version>3.8.0.GA</version>
-      <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>net.sf.ehcache</groupId>
       <artifactId>ehcache</artifactId>
       <version>1.6.0</version>
-      <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>com.threerings</groupId>
       <artifactId>gwt-utils</artifactId>
       <version>1.5</version>
-      <scope>compile</scope>
       <optional>true</optional>
     </dependency>
+
+    <!-- test/build dependencies -->
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>