You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2013/01/10 19:04:59 UTC

svn commit: r1431530 - in /shindig/trunk: UPGRADING pom.xml

Author: lindner
Date: Thu Jan 10 18:04:59 2013
New Revision: 1431530

URL: http://svn.apache.org/viewvc?rev=1431530&view=rev
Log:
Update apache parent pom to v12, update source-code compatible

Modified:
    shindig/trunk/UPGRADING
    shindig/trunk/pom.xml

Modified: shindig/trunk/UPGRADING
URL: http://svn.apache.org/viewvc/shindig/trunk/UPGRADING?rev=1431530&r1=1431529&r2=1431530&view=diff
==============================================================================
--- shindig/trunk/UPGRADING (original)
+++ shindig/trunk/UPGRADING Thu Jan 10 18:04:59 2013
@@ -14,17 +14,27 @@ details.
 
 == Java Dependency Changes ==
 
+Updates
 * caja r4884 -> r5054
 * closure-compiler (new) r1918
-* commons-codec 1.5 -> 1.6
+* commons-codec 1.5 -> 1.7
 * commons-lang to commons-lang3 3.1
+* commons-io 2.1 -> 2.4
+* easymock 3.0->3.1
 * ehcache  2.3.2 -> 2.5.2
 * guava r09->11.0.1
 * guice 2.0->3.0
+* joda-time 2.0->2.1
+* junit 4.10->4.11
+* log4j 1.2.16->1.2.17
 * htmlunit 2.8->2.9 
-* nekohtml 1.9.14->1.9.15
+* nekohtml 1.9.14->1.9.17
 * slf4j 1.5.11->1.6.1
-* xstream 1.3.1->1.4.2
+* xstream 1.3.1->1.4.3
+
+New
+* tomcat el-api/jasper-el
+
 
 FROM 1.0.x TO 2.0.x
 ===================

Modified: shindig/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=1431530&r1=1431529&r2=1431530&view=diff
==============================================================================
--- shindig/trunk/pom.xml (original)
+++ shindig/trunk/pom.xml Thu Jan 10 18:04:59 2013
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>10</version>
+    <version>12</version>
   </parent>
 
   <groupId>org.apache.shindig</groupId>
@@ -1513,7 +1513,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.10</version>
+      <version>4.11</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -1525,7 +1525,7 @@
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>3.0</version>
+      <version>3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -1624,7 +1624,7 @@
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
-        <version>1.6</version>
+        <version>1.7</version>
       </dependency>
       <dependency>
         <groupId>commons-fileupload</groupId>
@@ -1689,7 +1689,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.1</version>
+        <version>2.4</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -1711,7 +1711,7 @@
       <dependency>
         <groupId>joda-time</groupId>
         <artifactId>joda-time</artifactId>
-        <version>2.0</version>
+        <version>2.1</version>
       </dependency>
       <dependency>
         <groupId>rome</groupId>
@@ -1736,7 +1736,7 @@
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
-        <version>1.2.16</version>
+        <version>1.2.17</version>
       </dependency>
       <dependency>
         <groupId>rhino</groupId>
@@ -1756,7 +1756,7 @@
       <dependency>
         <groupId>com.thoughtworks.xstream</groupId>
         <artifactId>xstream</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.3</version>
       </dependency>
       <dependency>
         <groupId>xpp3</groupId>
@@ -1766,7 +1766,7 @@
       <dependency>
         <groupId>net.sourceforge.nekohtml</groupId>
         <artifactId>nekohtml</artifactId>
-        <version>1.9.15</version>
+        <version>1.9.17</version>
       </dependency>
       <dependency>
         <groupId>xerces</groupId>
@@ -1781,17 +1781,17 @@
       <dependency>
         <groupId>org.apache.tomcat</groupId>
         <artifactId>el-api</artifactId>
-        <version>6.0.33</version>
+        <version>6.0.36</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomcat</groupId>
         <artifactId>jasper-el</artifactId>
-        <version>6.0.33</version>
+        <version>6.0.36</version>
       </dependency>
       <dependency>
         <groupId>de.odysseus.juel</groupId>
         <artifactId>juel-impl</artifactId>
-        <version>2.2.4</version>
+        <version>2.2.5</version>
         <exclusions>
           <exclusion>
             <groupId>de.odysseus.juel</groupId>