Author: taylor
Date: Tue Dec 30 00:09:38 2014
New Revision: 1648449
URL: http://svn.apache.org/r1648449
Log:
APA-70: update deps
Modified:
portals/applications/rss/trunk/rss-jar/pom.xml
portals/applications/rss/trunk/rss-war/pom.xml
Modified: portals/applications/rss/trunk/rss-jar/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/rss/trunk/rss-jar/pom.xml?rev=1648449&r1=1648448&r2=1648449&view=diff
==============================================================================
--- portals/applications/rss/trunk/rss-jar/pom.xml (original)
+++ portals/applications/rss/trunk/rss-jar/pom.xml Tue Dec 30 00:09:38 2014
@@ -25,22 +25,22 @@
</parent>
<artifactId>apa-rss-jar</artifactId>
+ <version>1.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Portals Applications RSS Application JAR</name>
<properties>
<portals.portlet2-api-spec.version>1.0</portals.portlet2-api-spec.version>
- <javax.servlet.version>2.4</javax.servlet.version>
-
<org.apache.portals.bridges.common.version>2.0</org.apache.portals.bridges.common.version>
-
<org.apache.portals.bridges.velocity.version>2.0</org.apache.portals.bridges.velocity.version>
+ <javax.servlet.version>3.0.1</javax.servlet.version>
+
<org.apache.portals.bridges.common.version>2.1-SNAPSHOT</org.apache.portals.bridges.common.version>
+
<org.apache.portals.bridges.velocity.version>2.1-SNAPSHOT</org.apache.portals.bridges.velocity.version>
<spring.version>2.5.6</spring.version>
- <velocity.version>1.6.3</velocity.version>
+ <velocity.version>1.7</velocity.version>
<velocity-tools.version>1.3</velocity-tools.version>
<rome.version>0.8</rome.version>
- <rome.version>0.8</rome.version>
- <jdom.version>1.0</jdom.version>
<slf4j.version>1.5.6</slf4j.version>
- <junit.version>3.8.1</junit.version>
+ <junit.version>4.12</junit.version>
+ <xerces.version>2.11.0</xerces.version>
</properties>
<!-- Dependencies -->
@@ -56,7 +56,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet.version}</version>
<scope>provided</scope>
</dependency>
@@ -114,11 +114,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -137,10 +132,21 @@
<version>${rome.version}</version>
</dependency>
<dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>${jdom.version}</version>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
+
<!-- Test dependencies -->
<dependency>
@@ -167,19 +173,7 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
+
</dependencies>
</project>
Modified: portals/applications/rss/trunk/rss-war/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/rss/trunk/rss-war/pom.xml?rev=1648449&r1=1648448&r2=1648449&view=diff
==============================================================================
--- portals/applications/rss/trunk/rss-war/pom.xml (original)
+++ portals/applications/rss/trunk/rss-war/pom.xml Tue Dec 30 00:09:38 2014
@@ -19,6 +19,7 @@
<!-- POM Identification -->
<artifactId>apa-rss-war</artifactId>
+ <version>1.3-SNAPSHOT</version>
<parent>
<groupId>org.apache.portals.applications</groupId>
<artifactId>apa-rss</artifactId>
@@ -29,21 +30,22 @@
<!-- Dependencies -->
<properties>
- <javax.servlet.version>2.4</javax.servlet.version>
-
<org.apache.portals.bridges.common.version>2.0</org.apache.portals.bridges.common.version>
+ <javax.servlet.version>3.0.1</javax.servlet.version>
+
<org.apache.portals.bridges.common.version>2.1-SNAPSHOT</org.apache.portals.bridges.common.version>
<commons-digester.version>1.8</commons-digester.version>
<commons-lang.version>2.4</commons-lang.version>
<commons-collections.version>3.2</commons-collections.version>
<oro.version>2.0.8</oro.version>
<slf4j.version>1.5.6</slf4j.version>
</properties>
+
<dependencies>
<!-- Runtime Dependencies -->
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet.version}</version>
<scope>provided</scope>
</dependency>
@@ -58,50 +60,14 @@
<groupId>${project.groupId}</groupId>
<artifactId>apa-rss-jar</artifactId>
<version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <scope>runtime</scope>
- <version>${commons-digester.version}</version>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>${oro.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
+
</dependencies>
<build>
