[picocontainer-scm] [5823] java/2.x/trunk/pico: dep upgrades, done by plugin

Revision 5823
Author paul
Date 2012-10-16 17:54:37 -0500 (Tue, 16 Oct 2012)

Log Message

dep upgrades, done by plugin

Modified Paths

- java/2.x/trunk/pico/container/src/test/org/picocontainer/classname/DefaultClassLoadingPicoContainerTestCase.java

- java/2.x/trunk/pico/gems/pom.xml

- java/2.x/trunk/pico/pom.xml

Diff

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/classname/DefaultClassLoadingPicoContainerTestCase.java (5822 => 5823)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/classname/DefaultClassLoadingPicoContainerTestCase.java 2012-10-16 22:46:51 UTC (rev 5822)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/classname/DefaultClassLoadingPicoContainerTestCase.java 2012-10-16 22:54:37 UTC (rev 5823)
@@ -10,13 +10,6 @@

package org.picocontainer.classname;

-import static junit.framework.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-import java.util.Properties;
-
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
@@ -32,6 +25,13 @@
import org.picocontainer.monitors.ConsoleComponentMonitor;
import org.picocontainer.tck.AbstractPicoContainerTest;

+import java.util.List;
+import java.util.Properties;
+
+import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* @author Paul Hammant
*/
@@ -221,13 +221,14 @@
sb.append(clazz.getName()).append("\n");
}
});
- assertEquals("com.thoughtworks.xstream.io.xml.xppdom.Xpp3Dom\n" +
+ assertEquals("com.thoughtworks.xstream.io.xml.xppdom.XppDom\n" +
+ "com.thoughtworks.xstream.io.xml.xppdom.Xpp3Dom\n" +
"com.thoughtworks.xstream.core.util.PrioritizedList$PrioritizedItem\n" +
"com.thoughtworks.xstream.core.util.CustomObjectInputStream\n" +
"com.thoughtworks.xstream.core.util.CustomObjectOutputStream\n" +
"com.thoughtworks.xstream.XStream\n",
sb.toString());
- assertEquals(5, found);
+ assertEquals(6, found);
}

Modified: java/2.x/trunk/pico/gems/pom.xml (5822 => 5823)

--- java/2.x/trunk/pico/gems/pom.xml 2012-10-16 22:46:51 UTC (rev 5822)
+++ java/2.x/trunk/pico/gems/pom.xml 2012-10-16 22:54:37 UTC (rev 5823)
@@ -86,7 +86,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.3.1</version>
+ <version>1.4.3</version>
<exclusions>
<exclusion>
<groupId>xpp3</groupId>

Modified: java/2.x/trunk/pico/pom.xml (5822 => 5823)

--- java/2.x/trunk/pico/pom.xml 2012-10-16 22:46:51 UTC (rev 5822)
+++ java/2.x/trunk/pico/pom.xml 2012-10-16 22:54:37 UTC (rev 5823)
@@ -92,7 +92,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.15</version>
+ <version>1.2.17</version>
<optional>true</optional>
<exclusions>
<exclusion>
@@ -116,19 +116,19 @@
<dependency>
<groupId>org.prefuse</groupId>
<artifactId>prefuse</artifactId>
- <version>beta-20060220</version>
+ <version>beta-20071021</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.8</version>
+ <version>1.7.2</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
+ <version>1.7.2</version>
<optional>true</optional>
</dependency>
<!-- For test -->
@@ -141,7 +141,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.3.1</version>
+ <version>1.4.3</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -153,7 +153,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
+ <version>2.2.2</version>
<scope>test</scope>
</dependency>
</dependencies>

----------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email