roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r1067580 - in /roller/trunk: planet-business/pom.xml pom.xml roller-core/pom.xml test-utils/pom.xml weblogger-assembly/pom.xml weblogger-business/pom.xml weblogger-war-assembly/pom.xml weblogger-web/pom.xml weblogger-webapp/pom.xml
Date Sun, 06 Feb 2011 03:31:29 GMT
Author: snoopdave
Date: Sun Feb  6 03:31:27 2011
New Revision: 1067580

URL: http://svn.apache.org/viewvc?rev=1067580&view=rev
Log:
- Removing redundant deps from weblogger-webapp
- Changing version from RC3 to RC4

Modified:
    roller/trunk/planet-business/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=1067580&r1=1067579&r2=1067580&view=diff
==============================================================================
--- roller/trunk/planet-business/pom.xml (original)
+++ roller/trunk/planet-business/pom.xml Sun Feb  6 03:31:27 2011
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.0.0-RC3</version>
+        <version>5.0.0-RC4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -19,7 +19,7 @@
     </description>
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-planet-business</artifactId>
-    <version>5.0.0-RC3</version>
+    <version>5.0.0-RC4</version>
 
     <properties>
         <testOutputDirectory>${project.build.testOutputDirectory}</testOutputDirectory>

Modified: roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1067580&r1=1067579&r2=1067580&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Sun Feb  6 03:31:27 2011
@@ -8,7 +8,7 @@
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-project</artifactId>
 
-    <version>5.0.0-RC3</version>
+    <version>5.0.0-RC4</version>
     <packaging>pom</packaging>
 
     <name>Apache Roller Project</name>
@@ -27,7 +27,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <roller.version>5.0.0-RC3</roller.version>
+        <roller.version>5.0.0-RC4</roller.version>
         <!-- avoid CLOB/BLOB error in all later versions of Derby -->
         <derby.version>10.1.3.1</derby.version>
     </properties>

Modified: roller/trunk/roller-core/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/roller-core/pom.xml?rev=1067580&r1=1067579&r2=1067580&view=diff
==============================================================================
--- roller/trunk/roller-core/pom.xml (original)
+++ roller/trunk/roller-core/pom.xml Sun Feb  6 03:31:27 2011
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.0.0-RC3</version>
+        <version>5.0.0-RC4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     </description>
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-core</artifactId>
-    <version>5.0.0-RC3</version>
+    <version>5.0.0-RC4</version>
 
     <dependencies>
 

Modified: roller/trunk/test-utils/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/test-utils/pom.xml?rev=1067580&r1=1067579&r2=1067580&view=diff
==============================================================================
--- roller/trunk/test-utils/pom.xml (original)
+++ roller/trunk/test-utils/pom.xml Sun Feb  6 03:31:27 2011
@@ -7,21 +7,21 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.0.0-RC3</version>
+        <version>5.0.0-RC4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>Apache Roller Test Utilities</name>
     <groupId>org.apache.roller</groupId>
     <artifactId>test-utils</artifactId>
-    <version>5.0.0-RC3</version>
+    <version>5.0.0-RC4</version>
 
     <dependencies>
 
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-core</artifactId>
-            <version>5.0.0-RC3</version>
+            <version>5.0.0-RC4</version>
         </dependency>
 
         <dependency>

Modified: roller/trunk/weblogger-assembly/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-assembly/pom.xml?rev=1067580&r1=1067579&r2=1067580&view=diff
==============================================================================
--- roller/trunk/weblogger-assembly/pom.xml (original)
+++ roller/trunk/weblogger-assembly/pom.xml Sun Feb  6 03:31:27 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.0.0-RC3</version>
+        <version>5.0.0-RC4</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=1067580&r1=1067579&r2=1067580&view=diff
==============================================================================
--- roller/trunk/weblogger-business/pom.xml (original)
+++ roller/trunk/weblogger-business/pom.xml Sun Feb  6 03:31:27 2011
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.0.0-RC3</version>
+        <version>5.0.0-RC4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     </description>
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-weblogger-business</artifactId>
-    <version>5.0.0-RC3</version>
+    <version>5.0.0-RC4</version>
 
     <properties>
         <testOutputDirectory>${project.build.testOutputDirectory}</testOutputDirectory>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-core</artifactId>
-            <version>5.0.0-RC3</version>
+            <version>5.0.0-RC4</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-planet-business</artifactId>
-            <version>5.0.0-RC3</version>
+            <version>5.0.0-RC4</version>
         </dependency>
 
         <!-- OpenJPA deps -->
@@ -95,6 +95,7 @@
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: roller/trunk/weblogger-war-assembly/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-war-assembly/pom.xml?rev=1067580&r1=1067579&r2=1067580&view=diff
==============================================================================
--- roller/trunk/weblogger-war-assembly/pom.xml (original)
+++ roller/trunk/weblogger-war-assembly/pom.xml Sun Feb  6 03:31:27 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.0.0-RC3</version>
+        <version>5.0.0-RC4</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=1067580&r1=1067579&r2=1067580&view=diff
==============================================================================
--- roller/trunk/weblogger-web/pom.xml (original)
+++ roller/trunk/weblogger-web/pom.xml Sun Feb  6 03:31:27 2011
@@ -8,14 +8,14 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.0.0-RC3</version>
+        <version>5.0.0-RC4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>Apache Roller Weblogger Web Module</name>
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-weblogger-web</artifactId>
-    <version>5.0.0-RC3</version>
+    <version>5.0.0-RC4</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-core</artifactId>
-            <version>5.0.0-RC3</version>
+            <version>5.0.0-RC4</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-planet-business</artifactId>
-            <version>5.0.0-RC3</version>
+            <version>5.0.0-RC4</version>
             <exclusions>
                 <exclusion>
                     <artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-weblogger-business</artifactId>
-            <version>5.0.0-RC3</version>
+            <version>5.0.0-RC4</version>
         </dependency>
 
         <!-- OpenJPA deps -->
@@ -164,6 +164,20 @@
             <groupId>net.java.dev.rome</groupId>
             <artifactId>rome-propono</artifactId>
             <scope>compile</scope>
+            <exclusions>
+            	<exclusion>
+            		<artifactId>xmlrpc-common</artifactId>
+            		<groupId>xmlrpc</groupId>
+            	</exclusion>
+            	<exclusion>
+            		<artifactId>xmlrpc-client</artifactId>
+            		<groupId>xmlrpc</groupId>
+            	</exclusion>
+            	<exclusion>
+            		<artifactId>ws-commons-util</artifactId>
+            		<groupId>ws-commons-util</groupId>
+            	</exclusion>
+            </exclusions>
         </dependency>
 
         <!-- Spring Security deps -->
@@ -351,7 +365,7 @@
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>test-utils</artifactId>
-            <version>5.0.0-RC3</version>
+            <version>5.0.0-RC4</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=1067580&r1=1067579&r2=1067580&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/pom.xml (original)
+++ roller/trunk/weblogger-webapp/pom.xml Sun Feb  6 03:31:27 2011
@@ -7,326 +7,31 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.0.0-RC3</version>
+        <version>5.0.0-RC4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>Apache Roller Weblogger Web Application</name>
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-weblogger-webapp</artifactId>
-    <version>5.0.0-RC3</version>
+    <version>5.0.0-RC4</version>
     <packaging>war</packaging>
 
     <dependencies>
 
         <dependency>
             <groupId>org.apache.roller</groupId>
-            <artifactId>roller-core</artifactId>
-            <version>5.0.0-RC3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.roller</groupId>
-            <artifactId>roller-planet-business</artifactId>
-            <version>5.0.0-RC3</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>geronimo-jms_1.1_spec</artifactId>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>commons-pool</artifactId>
-                    <groupId>commons-pool</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>commons-logging-api</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.roller</groupId>
-            <artifactId>roller-weblogger-business</artifactId>
-            <version>5.0.0-RC3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.roller</groupId>
             <artifactId>roller-weblogger-web</artifactId>
-            <version>5.0.0-RC3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-spring-plugin</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-beans</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-context</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-tiles-plugin</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging-api</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tiles</groupId>
-            <artifactId>tiles-jsp</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tiles</groupId>
-            <artifactId>tiles-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging-api</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
+            <version>5.0.0-RC4</version>
         </dependency>
-
-        <dependency>
-            <groupId>net.java.dev.rome</groupId>
-            <artifactId>rome-propono</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- Spring Security deps -->
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>2.5.6</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>aopalliance</groupId>
-                    <artifactId>aopalliance</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.ldap</groupId>
-            <artifactId>spring-ldap</artifactId>
-            <version>1.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-core</artifactId>
-            <version>2.0.5.RELEASE</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-support</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-openid</artifactId>
-            <version>2.0.5.RELEASE</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-taglibs</artifactId>
-            <version>2.0.5.RELEASE</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-acl</artifactId>
-            <version>2.0.5.RELEASE</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-jdbc</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-dao</artifactId>
-            <version>2.0.6</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>aopalliance</groupId>
-                    <artifactId>aopalliance</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- OpenID deps -->
-
-        <dependency>
-            <groupId>org.openxri</groupId>
-            <artifactId>openxri-client</artifactId>
-            <version>1.2.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-jcl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>jug</groupId>
-                    <artifactId>jug</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.openxri</groupId>
-            <artifactId>openxri-syntax</artifactId>
-            <version>1.2.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-jcl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.ibm.icu</groupId>
-                    <artifactId>icu4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.openid4java</groupId>
-            <artifactId>openid4java-consumer</artifactId>
-            <version>0.9.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-            <version>1.6.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xml-security</groupId>
-            <artifactId>xmlsec</artifactId>
-            <version>1.3.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>2.9.1</version>
-        </dependency>
-
-        <!-- Java EE deps -->
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <!-- <scope>provided</scope> -->
-        </dependency>
-
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
-            <version>2.1</version>
-            <scope>provided</scope>
-        </dependency>
-
+        
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
             <version>6.1.26</version>
             <scope>provided</scope>
         </dependency>
-
-        <!-- test deps -->
-
-        <dependency>
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
-            <version>1.2.2</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-pool</artifactId>
-                    <groupId>commons-pool</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-
-        <dependency>
-            <groupId>simple-jndi</groupId>
-            <artifactId>simple-jndi</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.roller</groupId>
-            <artifactId>test-utils</artifactId>
-            <version>5.0.0-RC3</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.derby</groupId>
-                    <artifactId>derby</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.derby</groupId>
-                    <artifactId>derby</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbyclient</artifactId>
-            <scope>test</scope>
-        </dependency>
-
+        
     </dependencies>
 
     <build>
@@ -395,7 +100,7 @@
                     <dependency>
                         <groupId>org.apache.roller</groupId>
                         <artifactId>test-utils</artifactId>
-                        <version>5.0.0-RC3</version>
+                        <version>5.0.0-RC4</version>
                     </dependency>
                     <dependency>
                         <groupId>log4j</groupId>
@@ -405,7 +110,7 @@
                     <dependency>
                         <groupId>org.apache.roller</groupId>
                         <artifactId>test-utils</artifactId>
-                        <version>5.0.0-RC3</version>
+                        <version>5.0.0-RC4</version>
                     </dependency>
                     
                     <dependency>



Mime
View raw message