cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1461599 - in /cocoon/cocoon3/trunk: cocoon-archetype-block/ cocoon-archetype-parent/src/main/resources/archetype-resources/ cocoon-archetype-sample/src/main/resources/archetype-resources/ cocoon-databases-sample/ cocoon-profiling/ cocoon-s...
Date Wed, 27 Mar 2013 14:22:36 GMT
Author: ilgrosso
Date: Wed Mar 27 14:22:35 2013
New Revision: 1461599

URL: http://svn.apache.org/r1461599
Log:
Upgrading various dependencies and plugins + removing blacklisted Maven repo

Modified:
    cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml
    cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml
    cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml
    cocoon/cocoon3/trunk/cocoon-databases-sample/pom.xml
    cocoon/cocoon3/trunk/cocoon-profiling/pom.xml
    cocoon/cocoon3/trunk/cocoon-servlet/pom.xml
    cocoon/cocoon3/trunk/parent/pom.xml

Modified: cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml?rev=1461599&r1=1461598&r2=1461599&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml Wed Mar 27 14:22:35 2013
@@ -29,10 +29,10 @@
   <!-- FIXME this props should come from the parent! -->
   <properties>
     <cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
-    <spring.version>3.2.1.RELEASE</spring.version>
+    <spring.version>3.2.2.RELEASE</spring.version>
 
-    <logback.version>1.0.9</logback.version>
-    <slf4j.version>1.7.2</slf4j.version>
+    <logback.version>1.0.10</logback.version>
+    <slf4j.version>1.7.4</slf4j.version>
   </properties>
   
   <build>

Modified: cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml?rev=1461599&r1=1461598&r2=1461599&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml
Wed Mar 27 14:22:35 2013
@@ -34,10 +34,10 @@
   <properties>
     <cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
 
-    <spring.version>3.2.1.RELEASE</spring.version>
+    <spring.version>3.2.2.RELEASE</spring.version>
 
-    <logback.version>1.0.9</logback.version>
-    <slf4j.version>1.7.2</slf4j.version>
+    <logback.version>1.0.10</logback.version>
+    <slf4j.version>1.7.4</slf4j.version>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
@@ -134,13 +134,8 @@
       </dependency>
       <dependency>
 	<groupId>org.aspectj</groupId>
-	<artifactId>aspectjrt</artifactId>
-	<version>1.7.1</version>
-      </dependency>
-      <dependency>
-	<groupId>org.aspectj</groupId>
 	<artifactId>aspectjweaver</artifactId>
-	<version>1.7.1</version>
+	<version>1.7.2.RELEASE</version>
       </dependency>
 
       <!-- Other libraries -->
@@ -207,17 +202,17 @@
       <dependency>
 	<groupId>javax.xml.bind</groupId>
 	<artifactId>jaxb-api</artifactId>
-	<version>2.2.7</version>
+	<version>2.2.9</version>
       </dependency>
       <dependency>
 	<groupId>net.sf.ehcache</groupId>
         <artifactId>ehcache-core</artifactId>
-        <version>2.6.3</version>
+        <version>2.6.5</version>
       </dependency>
       <dependency>
 	<groupId>net.sourceforge.nekohtml</groupId>
 	<artifactId>nekohtml</artifactId>
-	<version>1.9.17</version>
+	<version>1.9.18</version>
       </dependency>
       <dependency>
 	<groupId>org.antlr</groupId>
@@ -227,7 +222,7 @@
       <dependency>
 	<groupId>org.apache.solr</groupId>
 	<artifactId>solr-solrj</artifactId>
-	<version>4.1.0</version>
+	<version>4.2.0</version>
 	<exclusions>
 	  <exclusion>
 	    <groupId>org.apache.commons</groupId>
@@ -242,7 +237,7 @@
       <dependency>
 	<groupId>org.apache.solr</groupId>
 	<artifactId>solr-core</artifactId>
-	<version>4.1.0</version>
+	<version>4.2.0</version>
 	<exclusions>
 	  <exclusion>
 	    <groupId>org.apache.commons</groupId>
@@ -261,7 +256,7 @@
       <dependency>
 	<groupId>org.codehaus.woodstox</groupId>
 	<artifactId>woodstox-core-asl</artifactId>
-	<version>4.1.4</version>
+	<version>4.2.0</version>
       </dependency>
       <dependency>
 	<groupId>org.apache.wicket</groupId>
@@ -328,7 +323,7 @@
       <dependency>
 	<groupId>xerces</groupId>
 	<artifactId>xercesImpl</artifactId>
-	<version>2.10.0</version>
+	<version>2.11.0</version>
       </dependency>
       <dependency>
 	<groupId>xml-apis</groupId>
@@ -463,7 +458,7 @@
 	<groupId>xmlunit</groupId>
 	<artifactId>xmlunit</artifactId>
 	<scope>test</scope>
-	<version>1.3</version>
+	<version>1.4</version>
       </dependency>
       <dependency>
 	<groupId>org.apache.bcel</groupId>
@@ -622,10 +617,8 @@
 
   <repositories>
     <repository>
-      <id>maven2-repository.java.net</id>
-      <name>Java.net Repository for Maven</name>
-      <url>http://download.java.net/maven/2/</url>
-      <layout>default</layout>
+      <id>activiti</id>
+      <url>https://artifacts.alfresco.com/nexus/content/groups/public/</url>
     </repository>
   </repositories>
 

Modified: cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml?rev=1461599&r1=1461598&r2=1461599&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml
Wed Mar 27 14:22:35 2013
@@ -138,17 +138,17 @@
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-core</artifactId>
-      <version>1.17</version>
+      <version>1.17.1</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-server</artifactId>
-      <version>1.17</version>
+      <version>1.17.1</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-bundle</artifactId>
-      <version>1.17</version>
+      <version>1.17.1</version>
     </dependency>
 
     <!--  Logging dependencies -->
@@ -259,10 +259,8 @@
 
   <repositories>
     <repository>
-      <id>maven2-repository.java.net</id>
-      <name>Java.net Repository for Maven</name>
-      <url>http://download.java.net/maven/2/</url>
-      <layout>default</layout>
+      <id>activiti</id>
+      <url>https://artifacts.alfresco.com/nexus/content/groups/public/</url>
     </repository>
   </repositories>
 

Modified: cocoon/cocoon3/trunk/cocoon-databases-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-databases-sample/pom.xml?rev=1461599&r1=1461598&r2=1461599&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-databases-sample/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-databases-sample/pom.xml Wed Mar 27 14:22:35 2013
@@ -67,10 +67,6 @@ language governing permissions and limit
     </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
-      <artifactId>aspectjrt</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
       <artifactId>aspectjweaver</artifactId>
     </dependency>
 

Modified: cocoon/cocoon3/trunk/cocoon-profiling/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-profiling/pom.xml?rev=1461599&r1=1461598&r2=1461599&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-profiling/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-profiling/pom.xml Wed Mar 27 14:22:35 2013
@@ -60,10 +60,6 @@
     </dependency> 
     <dependency>
       <groupId>org.aspectj</groupId>
-      <artifactId>aspectjrt</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
       <artifactId>aspectjweaver</artifactId>
     </dependency>
      

Modified: cocoon/cocoon3/trunk/cocoon-servlet/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/pom.xml?rev=1461599&r1=1461598&r2=1461599&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/pom.xml Wed Mar 27 14:22:35 2013
@@ -72,10 +72,6 @@
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
         </dependency>
 

Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=1461599&r1=1461598&r2=1461599&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Wed Mar 27 14:22:35 2013
@@ -59,10 +59,10 @@
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssZ</maven.build.timestamp.format>
     <implementation.build>${scmBranch}@r${buildNumber}; ${maven.build.timestamp}</implementation.build>
     
-    <spring.version>3.2.1.RELEASE</spring.version>
+    <spring.version>3.2.2.RELEASE</spring.version>
     
-    <logback.version>1.0.9</logback.version>
-    <slf4j.version>1.7.2</slf4j.version>
+    <logback.version>1.0.10</logback.version>
+    <slf4j.version>1.7.4</slf4j.version>
 
     <!-- docs properties -->
     <docs.name>Cocoon 3</docs.name>
@@ -289,30 +289,25 @@
       </dependency>
       <dependency>
         <groupId>org.aspectj</groupId>
-        <artifactId>aspectjrt</artifactId>
-        <version>1.7.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.aspectj</groupId>
         <artifactId>aspectjweaver</artifactId>
-        <version>1.7.1</version>
+        <version>1.7.2.RELEASE</version>
       </dependency>
 
       <!-- Other libraries -->
       <dependency>
         <groupId>com.sun.jersey</groupId>
         <artifactId>jersey-core</artifactId>
-        <version>1.17</version>
+        <version>1.17.1</version>
       </dependency>
       <dependency>
         <groupId>com.sun.jersey</groupId>
         <artifactId>jersey-server</artifactId>
-        <version>1.17</version>
+        <version>1.17.1</version>
       </dependency>
       <dependency>
         <groupId>com.sun.jersey</groupId>
         <artifactId>jersey-bundle</artifactId>
-        <version>1.17</version>
+        <version>1.17.1</version>
       </dependency>
       <dependency>
         <groupId>com.sun.xml.bind</groupId>
@@ -367,17 +362,17 @@
       <dependency>
         <groupId>javax.xml.bind</groupId>
         <artifactId>jaxb-api</artifactId>
-        <version>2.2.7</version>
+        <version>2.2.9</version>
       </dependency>
       <dependency>
         <groupId>net.sf.ehcache</groupId>
         <artifactId>ehcache-core</artifactId>
-        <version>2.6.3</version>
+        <version>2.6.5</version>
       </dependency>
       <dependency>
         <groupId>net.sourceforge.nekohtml</groupId>
         <artifactId>nekohtml</artifactId>
-        <version>1.9.17</version>
+        <version>1.9.18</version>
       </dependency>
       <dependency>
         <groupId>org.antlr</groupId>
@@ -387,7 +382,7 @@
       <dependency>
         <groupId>org.apache.solr</groupId>
         <artifactId>solr-core</artifactId>
-        <version>4.1.0</version>
+        <version>4.2.0</version>
         <exclusions>
           <exclusion>
             <groupId>org.apache.commons</groupId>
@@ -406,7 +401,7 @@
       <dependency>
         <groupId>org.apache.solr</groupId>
         <artifactId>solr-solrj</artifactId>
-        <version>4.1.0</version>
+        <version>4.2.0</version>
         <exclusions>
           <exclusion>
             <groupId>org.apache.commons</groupId>
@@ -426,7 +421,7 @@
       <dependency>
         <groupId>org.codehaus.woodstox</groupId>
         <artifactId>woodstox-core-asl</artifactId>
-        <version>4.1.4</version>
+        <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.wicket</groupId>
@@ -493,7 +488,7 @@
       <dependency>
         <groupId>xerces</groupId>
         <artifactId>xercesImpl</artifactId>
-        <version>2.10.0</version>
+        <version>2.11.0</version>
       </dependency>
       <dependency>
         <groupId>xml-apis</groupId>
@@ -676,7 +671,7 @@
         <groupId>xmlunit</groupId>
         <artifactId>xmlunit</artifactId>
         <scope>test</scope>
-        <version>1.3</version>
+        <version>1.4</version>
       </dependency>
       <dependency>
         <groupId>org.apache.bcel</groupId>
@@ -689,9 +684,8 @@
 
   <repositories>
     <repository>
-      <id>maven2-repository.dev.java.net</id>
-      <name>Java.net Repository for Maven</name>
-      <url>http://download.java.net/maven/2/</url>
+      <id>activiti</id>
+      <url>https://artifacts.alfresco.com/nexus/content/groups/public/</url>
     </repository>
   </repositories>
 
@@ -1012,7 +1006,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.13</version>
+          <version>2.14</version>
           <configuration>
             <redirectTestOutputToFile>true</redirectTestOutputToFile>  
           </configuration>



Mime
View raw message