[pkg-java] r17271 - in trunk/maven-ant-helper: debian src/main/java

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-09-24 08:22:02 +0000 (Tue, 24 Sep 2013)
New Revision: 17271

Modified:
   trunk/maven-ant-helper/debian/changelog
   trunk/maven-ant-helper/src/main/java/ModelloTask.java
Log:
Modello Task: Use Guava instead of Google Collections (Closes: #724211)



Modified: trunk/maven-ant-helper/debian/changelog
===================================================================
--- trunk/maven-ant-helper/debian/changelog	2013-09-24 05:01:03 UTC (rev 17270)
+++ trunk/maven-ant-helper/debian/changelog	2013-09-24 08:22:02 UTC (rev 17271)
@@ -1,6 +1,7 @@
 maven-ant-helper (7.8) UNRELEASED; urgency=low
 
   * Team upload.
+  * Modello Task: Use Guava instead of Google Collections (Closes: #724211)
   * debian/control:
     - Updated Standards-Version to 3.9.4 (no changes)
     - Use canonical URLs for the Vcs-* fields

Modified: trunk/maven-ant-helper/src/main/java/ModelloTask.java
===================================================================
--- trunk/maven-ant-helper/src/main/java/ModelloTask.java	2013-09-24 05:01:03 UTC (rev 17270)
+++ trunk/maven-ant-helper/src/main/java/ModelloTask.java	2013-09-24 08:22:02 UTC (rev 17271)
@@ -82,7 +82,7 @@
         addToClassPath("/usr/share/java/modello-plugin-xml.jar");
         addToClassPath("/usr/share/java/modello-plugin-xpp3.jar");
         addToClassPath("/usr/share/java/modello-plugin-xsd.jar");
-        addToClassPath("/usr/share/java/google-collections.jar");
+        addToClassPath("/usr/share/java/guava.jar");
         addToClassPath("/usr/share/java/xbean-reflect.jar");
 
         ClassLoader cl = new URLClassLoader( getClassPath() );