roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1439181 - in /roller/trunk: ./ planet-business/ planet-web/ roller-core/ test-utils/ weblogger-assembly/ weblogger-business/ weblogger-war-assembly/ weblogger-web/ weblogger-webapp/
Date Sun, 27 Jan 2013 21:19:14 GMT
Author: gmazza
Date: Sun Jan 27 21:19:14 2013
New Revision: 1439181

URL: http://svn.apache.org/viewvc?rev=1439181&view=rev
Log:
Updated from 5.1.0 to 5.1.0-SNAPSHOT, switched from recently deactivated com.google.code.guice:guice
(repo at http://guice-maven.googlecode.com/svn/trunk/ no longer available) to com.google.inject.guice:guice
(https://bugzilla.redhat.com/show_bug.cgi?format=multiple&id=903218)

Modified:
    roller/trunk/planet-business/pom.xml
    roller/trunk/planet-web/pom.xml
    roller/trunk/pom.xml
    roller/trunk/roller-core/pom.xml
    roller/trunk/test-utils/pom.xml
    roller/trunk/weblogger-assembly/pom.xml
    roller/trunk/weblogger-business/pom.xml
    roller/trunk/weblogger-war-assembly/pom.xml
    roller/trunk/weblogger-web/pom.xml
    roller/trunk/weblogger-webapp/pom.xml

Modified: roller/trunk/planet-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/pom.xml?rev=1439181&r1=1439180&r2=1439181&view=diff
==============================================================================
--- roller/trunk/planet-business/pom.xml (original)
+++ roller/trunk/planet-business/pom.xml Sun Jan 27 21:19:14 2013
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -19,7 +19,7 @@
     </description>
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-planet-business</artifactId>
-    <version>5.1.0</version>
+    <version>5.1.0-SNAPSHOT</version>
 
     <properties>
         <testOutputDirectory>${project.build.testOutputDirectory}</testOutputDirectory>
@@ -111,7 +111,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.guice</groupId>
+            <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
 

Modified: roller/trunk/planet-web/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/pom.xml?rev=1439181&r1=1439180&r2=1439181&view=diff
==============================================================================
--- roller/trunk/planet-web/pom.xml (original)
+++ roller/trunk/planet-web/pom.xml Sun Jan 27 21:19:14 2013
@@ -7,14 +7,14 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>Apache Roller Planet Web Application</name>
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-planet-web</artifactId>
-    <version>5.1.0</version>
+    <version>5.1.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <dependencies>
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-core</artifactId>
-            <version>5.1.0</version>
+            <version>5.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-planet-business</artifactId>
-            <version>5.1.0</version>
+            <version>5.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -173,7 +173,7 @@
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>test-utils</artifactId>
-            <version>5.1.0</version>
+            <version>5.1.0-SNAPSHOT</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -293,7 +293,7 @@
                     <dependency>
                         <groupId>org.apache.roller</groupId>
                         <artifactId>test-utils</artifactId>
-                        <version>5.1.0</version>
+                        <version>5.1.0-SNAPSHOT</version>
                     </dependency>
                     <dependency>
                         <groupId>log4j</groupId>
@@ -303,7 +303,7 @@
                     <dependency>
                         <groupId>org.apache.roller</groupId>
                         <artifactId>test-utils</artifactId>
-                        <version>5.1.0</version>
+                        <version>5.1.0-SNAPSHOT</version>
                     </dependency>
                 </dependencies>
             </plugin>

Modified: roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1439181&r1=1439180&r2=1439181&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Sun Jan 27 21:19:14 2013
@@ -7,7 +7,7 @@
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-project</artifactId>
 
-    <version>5.1.0</version>
+    <version>5.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Roller Project - Trunk</name>
@@ -26,7 +26,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <roller.version>5.1.0</roller.version>
+        <roller.version>5.1.0-SNAPSHOT</roller.version>
         <!-- avoid CLOB/BLOB error in all later versions of Derby -->
         <derby.version>10.1.3.1</derby.version>
     </properties>
@@ -99,11 +99,6 @@
         </repository>
 
         <repository>
-            <id>guice</id>
-            <url>http://guice-maven.googlecode.com/svn/trunk/</url>
-        </repository>
-
-        <repository>
             <id>oss.sonatype.org</id>
             <url>http://oss.sonatype.org/content/groups/public</url>
         </repository>
@@ -172,7 +167,7 @@
             </dependency>
 
             <dependency>
-                <groupId>com.google.code.guice</groupId>
+                <groupId>com.google.inject</groupId>
                 <artifactId>guice</artifactId>
                 <version>2.0</version>
             </dependency>

Modified: roller/trunk/roller-core/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/roller-core/pom.xml?rev=1439181&r1=1439180&r2=1439181&view=diff
==============================================================================
--- roller/trunk/roller-core/pom.xml (original)
+++ roller/trunk/roller-core/pom.xml Sun Jan 27 21:19:14 2013
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     </description>
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-core</artifactId>
-    <version>5.1.0</version>
+    <version>5.1.0-SNAPSHOT</version>
 
     <dependencies>
 

Modified: roller/trunk/test-utils/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/test-utils/pom.xml?rev=1439181&r1=1439180&r2=1439181&view=diff
==============================================================================
--- roller/trunk/test-utils/pom.xml (original)
+++ roller/trunk/test-utils/pom.xml Sun Jan 27 21:19:14 2013
@@ -7,21 +7,21 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>Roller Test Utilities - Trunk</name>
     <groupId>org.apache.roller</groupId>
     <artifactId>test-utils</artifactId>
-    <version>5.1.0</version>
+    <version>5.1.0-SNAPSHOT</version>
 
     <dependencies>
 
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-core</artifactId>
-            <version>5.1.0</version>
+            <version>5.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

Modified: roller/trunk/weblogger-assembly/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-assembly/pom.xml?rev=1439181&r1=1439180&r2=1439181&view=diff
==============================================================================
--- roller/trunk/weblogger-assembly/pom.xml (original)
+++ roller/trunk/weblogger-assembly/pom.xml Sun Jan 27 21:19:14 2013
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

Modified: roller/trunk/weblogger-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/pom.xml?rev=1439181&r1=1439180&r2=1439181&view=diff
==============================================================================
--- roller/trunk/weblogger-business/pom.xml (original)
+++ roller/trunk/weblogger-business/pom.xml Sun Jan 27 21:19:14 2013
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     </description>
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-weblogger-business</artifactId>
-    <version>5.1.0</version>
+    <version>5.1.0-SNAPSHOT</version>
 
     <properties>
         <testOutputDirectory>${project.build.testOutputDirectory}</testOutputDirectory>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-core</artifactId>
-            <version>5.1.0</version>
+            <version>5.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-planet-business</artifactId>
-            <version>5.1.0</version>
+            <version>5.1.0-SNAPSHOT</version>
         </dependency>
 
         <!-- OpenJPA deps -->
@@ -119,7 +119,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.guice</groupId>
+            <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
 

Modified: roller/trunk/weblogger-war-assembly/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-war-assembly/pom.xml?rev=1439181&r1=1439180&r2=1439181&view=diff
==============================================================================
--- roller/trunk/weblogger-war-assembly/pom.xml (original)
+++ roller/trunk/weblogger-war-assembly/pom.xml Sun Jan 27 21:19:14 2013
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

Modified: roller/trunk/weblogger-web/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/pom.xml?rev=1439181&r1=1439180&r2=1439181&view=diff
==============================================================================
--- roller/trunk/weblogger-web/pom.xml (original)
+++ roller/trunk/weblogger-web/pom.xml Sun Jan 27 21:19:14 2013
@@ -16,14 +16,14 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>Roller Weblogger Web Module - Trunk</name>
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-weblogger-web</artifactId>
-    <version>5.1.0</version>
+    <version>5.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -31,13 +31,13 @@
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-core</artifactId>
-            <version>5.1.0</version>
+            <version>5.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-planet-business</artifactId>
-            <version>5.1.0</version>
+            <version>5.1.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-weblogger-business</artifactId>
-            <version>5.1.0</version>
+            <version>5.1.0-SNAPSHOT</version>
         </dependency>
 
         <!-- OpenJPA deps -->
@@ -310,6 +310,12 @@
             <artifactId>openid4java-consumer</artifactId>
             <version>0.9.6</version>
             <type>pom</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.guice</groupId>
+                    <artifactId>guice</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -389,7 +395,7 @@
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>test-utils</artifactId>
-            <version>5.1.0</version>
+            <version>5.1.0-SNAPSHOT</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

Modified: roller/trunk/weblogger-webapp/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/pom.xml?rev=1439181&r1=1439180&r2=1439181&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/pom.xml (original)
+++ roller/trunk/weblogger-webapp/pom.xml Sun Jan 27 21:19:14 2013
@@ -7,14 +7,14 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>Roller Weblogger Web Application - Trunk</name>
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-weblogger-webapp</artifactId>
-    <version>5.1.0</version>
+    <version>5.1.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <dependencies>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-weblogger-web</artifactId>
-            <version>5.1.0</version>
+            <version>5.1.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <artifactId>servlet-api</artifactId>
@@ -106,19 +106,14 @@
                     <dependency>
                         <groupId>org.apache.roller</groupId>
                         <artifactId>test-utils</artifactId>
-                        <version>5.1.0</version>
+                        <version>5.1.0-SNAPSHOT</version>
                     </dependency>
                     <dependency>
                         <groupId>log4j</groupId>
                         <artifactId>log4j</artifactId>
                         <version>1.2.12</version>
                     </dependency>
-                    <dependency>
-                        <groupId>org.apache.roller</groupId>
-                        <artifactId>test-utils</artifactId>
-                        <version>5.1.0</version>
-                    </dependency>
-                    
+                   
                     <dependency>
                         <groupId>org.apache.derby</groupId>
                         <artifactId>derby</artifactId>



Mime
View raw message