Author: gmazza
Date: Fri Jul 19 15:15:15 2013
New Revision: 1504912
URL: http://svn.apache.org/r1504912
Log:
Fixed EclipseLink warning during test runs, further simplified pom.xml &
updated its dependencies (results always viewable via mvn dependency:tree and
mvn versions:display-dependency-updates)
Modified:
roller/trunk/app/pom.xml
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
roller/trunk/test-utils/pom.xml
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1504912&r1=1504911&r2=1504912&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Fri Jul 19 15:15:15 2013
@@ -101,13 +101,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <version>1.2.17</version>
</dependency>
<dependency>
@@ -184,21 +178,8 @@
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-core</artifactId>
- <version>2.3.14</version>
- </dependency>
-
- <!-- needed by Struts, except on JBoss -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>javassist</artifactId>
- <version>3.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
<artifactId>struts2-spring-plugin</artifactId>
- <version>2.3.14</version>
+ <version>2.3.15.1</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -213,8 +194,8 @@
<artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
- <artifactId>spring-web</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -222,35 +203,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-tiles-plugin</artifactId>
- <version>2.3.14</version>
- <exclusions>
- <!-- Excluding commons-logging-api as it's a subset of
- already-supplied commons-logging -->
- <exclusion>
- <artifactId>commons-logging-api</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-jsp</artifactId>
- <version>2.0.6</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-api</artifactId>
- <version>2.0.6</version>
- <exclusions>
- <!-- Excluding commons-logging-api as it's a subset of
- already-supplied commons-logging -->
- <exclusion>
- <artifactId>commons-logging-api</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
+ <version>2.3.15.1</version>
</dependency>
<dependency>
@@ -274,20 +227,20 @@
<scope>compile</scope>
<exclusions>
<exclusion>
- <artifactId>xmlrpc-common</artifactId>
<groupId>xmlrpc</groupId>
+ <artifactId>xmlrpc-common</artifactId>
</exclusion>
<exclusion>
- <artifactId>xmlrpc-client</artifactId>
<groupId>xmlrpc</groupId>
+ <artifactId>xmlrpc-client</artifactId>
</exclusion>
<exclusion>
- <artifactId>ws-commons-util</artifactId>
<groupId>ws-commons-util</groupId>
+ <artifactId>ws-commons-util</artifactId>
</exclusion>
<exclusion>
- <artifactId>activation</artifactId>
<groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -371,33 +324,22 @@
<dependency>
<groupId>org.openxri</groupId>
<artifactId>openxri-client</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
<exclusions>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jug</groupId>
- <artifactId>jug</artifactId>
- </exclusion>
- <exclusion>
<artifactId>xml-apis</artifactId>
<groupId>xml-apis</groupId>
</exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.openxri</groupId>
- <artifactId>openxri-syntax</artifactId>
- <version>1.2.0</version>
- <exclusions>
+ <!-- unsure if following exclusions are necessary -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
</exclusion>
<exclusion>
+ <groupId>jug</groupId>
+ <artifactId>jug</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
</exclusion>
@@ -482,6 +424,28 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.4.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.8</version>
+ </dependency>
+
<!-- test deps -->
<dependency>
@@ -503,27 +467,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.3.1</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -873,7 +816,7 @@
</excludes>
</resource>
<resource>
- <!-- ensure version and persistence files get substitions -->
+ <!-- ensure version and persistence files get substitutions -->
<directory>${project.basedir}/src/main/resources</directory>
<filtering>true</filtering>
<includes>
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java?rev=1504912&r1=1504911&r2=1504912&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
Fri Jul 19 15:15:15 2013
@@ -849,11 +849,6 @@ public class Weblog implements Serializa
return
WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogURL(this, null,
false);
}
- public void setURL(String url) {
- // noop
- }
-
-
/**
* @roller.wrapPojoMethod type="simple"
*/
@@ -1057,7 +1052,7 @@ public class Weblog implements Serializa
/**
* Get up to 100 most recent published entries in weblog.
- * @param cat Category path or null for no category restriction
+ * @param tag Blog entry tag to query by
* @param length Max entries to return (1-100)
* @return List of weblog entry objects.
*
Modified:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml?rev=1504912&r1=1504911&r2=1504912&view=diff
==============================================================================
---
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
(original)
+++
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
Fri Jul 19 15:15:15 2013
@@ -213,7 +213,6 @@
<transient name="commentModerationRequired"/>
<transient name="todaysHits"/>
<transient name="todaysReferrers"/>
- <transient name="uRL"/>
<transient name="URL"/>
<transient name="userCount"/>
<transient name="entryCount"/>
Modified: roller/trunk/test-utils/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/test-utils/pom.xml?rev=1504912&r1=1504911&r2=1504912&view=diff
==============================================================================
--- roller/trunk/test-utils/pom.xml (original)
+++ roller/trunk/test-utils/pom.xml Fri Jul 19 15:15:15 2013
@@ -34,8 +34,8 @@
<dependency>
<groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.3</version>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>