Replace guava 11 with 16 and extract Guava as a separate dependency.

Also, tidy up a teensy bit of test infrastructure, make sure OSGI test is excluded since it's designed for ant-only, and make maven tests fork, as they run out of permgen consistently. Lastly, make the build system enforce a 1.6 minimum, not a 1.5 minimum.

3 files changed, 19 insertions, 17 deletions

diff --git a/extensions/persist/build.xml b/extensions/persist/build.xml
index 9be40c82..3cc6a4f3 100644
--- a/extensions/persist/build.xml
+++ b/extensions/persist/build.xml
@@ -11,11 +11,10 @@
     <pathelement path="../../build/classes"/>
   </path>
 
-  <target name="jar" depends="jar.withrenameddeps, manifest" description="Build jar.">
+  <target name="jar" depends="compile, manifest" description="Build jar.">
     <jar destfile="${build.dir}/${ant.project.name}-${version}.jar"
         manifest="${build.dir}/META-INF/MANIFEST.MF">
-      <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"
-          excludes="com/google/inject/internal/**"/>
+      <fileset dir="${build.dir}/classes" />
     </jar>
   </target>
 
diff --git a/extensions/persist/pom.xml b/extensions/persist/pom.xml
index 18b15a31..b3c4a344 100644
--- a/extensions/persist/pom.xml
+++ b/extensions/persist/pom.xml
@@ -44,17 +44,18 @@
       <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
+    <!-- These are present for IDEs which will not be pulling in the jarjar'ed value. -->
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib</artifactId>
+      <version>3.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-util</artifactId>
+      <version>4.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <forkMode>never</forkMode>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/extensions/persist/test/com/google/inject/persist/EdslTest.java b/extensions/persist/test/com/google/inject/persist/EdslTest.java
index 9fd502f0..81e0b6bc 100644
--- a/extensions/persist/test/com/google/inject/persist/EdslTest.java
+++ b/extensions/persist/test/com/google/inject/persist/EdslTest.java
@@ -4,7 +4,7 @@ import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Stage;
 import com.google.inject.persist.jpa.JpaPersistModule;
-
+import java.util.logging.Logger;
 import junit.framework.TestCase;
 
 /**
@@ -13,12 +13,14 @@ import junit.framework.TestCase;
 public class EdslTest extends TestCase {
 
   public void testModuleConfigUsingJpa() throws Exception {
+    Logger.getLogger(getClass().getName()).info("Starting EDSL test.");
     Guice.createInjector(Stage.PRODUCTION, new AbstractModule() {
       @Override
       protected void configure() {
         install(new JpaPersistModule("myunit"));
         binder().requireExplicitBindings();
-      };
+      }
     });
+    Logger.getLogger(getClass().getName()).info("Completed EDSL test.");
   }
 }