You are viewing a plain text version of this content. The canonical link for it is here.
Posted to portalapps-dev@portals.apache.org by at...@apache.org on 2011/03/08 01:49:33 UTC
svn commit: r1079054 - in /portals/applications: dbbrowser/trunk/
dbbrowser/trunk/dbbrowser-war/ demo/trunk/ rss/trunk/rss-war/
webcontent/trunk/ webcontent/trunk/webcontent-jar/
webcontent/trunk/webcontent-war/
Author: ate
Date: Tue Mar 8 00:49:33 2011
New Revision: 1079054
URL: http://svn.apache.org/viewvc?rev=1079054&view=rev
Log:
APA-43: Update some external artifact dependencies to more recent and general available versions
See: https://issues.apache.org/jira/browse/APA-43
- update castor:castor:jar:1.1.1-xml to org.codehaus.castor:castor:jar:1.1.1
castor-1.1.1-xml.jar was a subset package of castor-1.1.1 with only the xml handler.
That subset jar (for that version) is not available from maven central but the full 1.1.1 package is.
- also cleanup some minor maven-3 warnings
- all Portals Apps now rely only on external dependencies available from default maven central repository
Modified:
portals/applications/dbbrowser/trunk/dbbrowser-war/pom.xml
portals/applications/dbbrowser/trunk/pom.xml
portals/applications/demo/trunk/pom.xml
portals/applications/rss/trunk/rss-war/pom.xml
portals/applications/webcontent/trunk/pom.xml
portals/applications/webcontent/trunk/webcontent-jar/pom.xml
portals/applications/webcontent/trunk/webcontent-war/pom.xml
Modified: portals/applications/dbbrowser/trunk/dbbrowser-war/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/dbbrowser/trunk/dbbrowser-war/pom.xml?rev=1079054&r1=1079053&r2=1079054&view=diff
==============================================================================
--- portals/applications/dbbrowser/trunk/dbbrowser-war/pom.xml (original)
+++ portals/applications/dbbrowser/trunk/dbbrowser-war/pom.xml Tue Mar 8 00:49:33 2011
@@ -33,7 +33,7 @@
<javax.servlet.version>2.4</javax.servlet.version>
<org.apache.portals.bridges.common.version>2.0</org.apache.portals.bridges.common.version>
<slf4j.version>1.5.6</slf4j.version>
- <derby.version>10.5.1.1</derby.version>
+ <derby.version>10.5.3.0_1</derby.version>
</properties>
<dependencies>
@@ -50,9 +50,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apa-dbbrowser-jar</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -86,7 +86,7 @@
<goal>process</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.directory}/${build.finalName}</outputDirectory>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
<attached>false</attached>
</configuration>
</execution>
Modified: portals/applications/dbbrowser/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/dbbrowser/trunk/pom.xml?rev=1079054&r1=1079053&r2=1079054&view=diff
==============================================================================
--- portals/applications/dbbrowser/trunk/pom.xml (original)
+++ portals/applications/dbbrowser/trunk/pom.xml Tue Mar 8 00:49:33 2011
@@ -31,14 +31,6 @@
<version>1.2-SNAPSHOT</version>
<description>Database browser Portlet Application</description>
- <repositories>
- <repository>
- <id>com.bluesunrise.m2</id>
- <name>Maven2 BlueSunrise</name>
- <url>http://www.bluesunrise.com/maven2</url>
- </repository>
- </repositories>
-
<!-- Application Modules -->
<modules>
<module>dbbrowser-jar</module>
Modified: portals/applications/demo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/pom.xml?rev=1079054&r1=1079053&r2=1079054&view=diff
==============================================================================
--- portals/applications/demo/trunk/pom.xml (original)
+++ portals/applications/demo/trunk/pom.xml Tue Mar 8 00:49:33 2011
@@ -32,14 +32,6 @@
<version>1.2-SNAPSHOT</version>
<description>Portals Applications Demo</description>
- <repositories>
- <repository>
- <id>com.bluesunrise.m2</id>
- <name>Maven2 BlueSunrise</name>
- <url>http://www.bluesunrise.com/maven2</url>
- </repository>
- </repositories>
-
<properties>
<portals.portlet2-api-spec.version>1.0</portals.portlet2-api-spec.version>
<portals.applications.apa-gems.version>1.1</portals.applications.apa-gems.version>
@@ -58,7 +50,7 @@
<taglibs-request.version>1.0.1</taglibs-request.version>
<javax.servlet.version>2.4</javax.servlet.version>
<javax.servlet.jsp.version>2.0</javax.servlet.jsp.version>
- <castor.version>1.1.1-xml</castor.version>
+ <castor.version>1.1.1</castor.version>
<groovy.version>1.7.0</groovy.version>
<commons-collections.version>3.2</commons-collections.version>
<commons-digester.version>1.8</commons-digester.version>
@@ -237,10 +229,45 @@
</dependency>
<dependency>
- <groupId>castor</groupId>
+ <groupId>org.codehaus.castor</groupId>
<artifactId>castor</artifactId>
<version>${castor.version}</version>
<scope>runtime</scope>
+ <exclusions>
+ <!-- we only use/need the XML handling: excluding all other, non-test, dependencies -->
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-full</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta-regexp</groupId>
+ <artifactId>jakarta-regexp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ldapsdk</groupId>
+ <artifactId>ldapsdk</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -288,7 +315,7 @@
<goal>process</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.directory}/${build.finalName}</outputDirectory>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
<attached>false</attached>
</configuration>
</execution>
Modified: portals/applications/rss/trunk/rss-war/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/rss/trunk/rss-war/pom.xml?rev=1079054&r1=1079053&r2=1079054&view=diff
==============================================================================
--- portals/applications/rss/trunk/rss-war/pom.xml (original)
+++ portals/applications/rss/trunk/rss-war/pom.xml Tue Mar 8 00:49:33 2011
@@ -55,9 +55,9 @@
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apa-rss-jar</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -127,7 +127,7 @@
<goal>process</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.directory}/${build.finalName}</outputDirectory>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
<attached>false</attached>
</configuration>
</execution>
Modified: portals/applications/webcontent/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/pom.xml?rev=1079054&r1=1079053&r2=1079054&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/pom.xml (original)
+++ portals/applications/webcontent/trunk/pom.xml Tue Mar 8 00:49:33 2011
@@ -36,14 +36,6 @@
<!-- Application Modules -->
- <repositories>
- <repository>
- <id>com.bluesunrise.m2</id>
- <name>Maven2 BlueSunrise</name>
- <url>http://www.bluesunrise.com/maven2</url>
- </repository>
- </repositories>
-
<modules>
<module>webcontent-jar</module>
<module>webcontent-war</module>
Modified: portals/applications/webcontent/trunk/webcontent-jar/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-jar/pom.xml?rev=1079054&r1=1079053&r2=1079054&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/webcontent-jar/pom.xml (original)
+++ portals/applications/webcontent/trunk/webcontent-jar/pom.xml Tue Mar 8 00:49:33 2011
@@ -37,7 +37,7 @@
<slf4j.version>1.5.6</slf4j.version>
<junit.version>3.8.1</junit.version>
<nekohtml.version>0.9.5</nekohtml.version>
- <castor.version>1.1.1-xml</castor.version>
+ <castor.version>1.1.1</castor.version>
<httpcomponents-httpcore.version>4.0.1</httpcomponents-httpcore.version>
<httpcomponents-httpclient.version>4.0</httpcomponents-httpclient.version>
<jcip-annotations.version>1.0</jcip-annotations.version>
@@ -114,9 +114,44 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>castor</groupId>
+ <groupId>org.codehaus.castor</groupId>
<artifactId>castor</artifactId>
<version>${castor.version}</version>
+ <exclusions>
+ <!-- we only use/need the XML handling: excluding all other, non-test, dependencies -->
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-full</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta-regexp</groupId>
+ <artifactId>jakarta-regexp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ldapsdk</groupId>
+ <artifactId>ldapsdk</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>nekohtml</groupId>
Modified: portals/applications/webcontent/trunk/webcontent-war/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-war/pom.xml?rev=1079054&r1=1079053&r2=1079054&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/webcontent-war/pom.xml (original)
+++ portals/applications/webcontent/trunk/webcontent-war/pom.xml Tue Mar 8 00:49:33 2011
@@ -54,9 +54,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apa-webcontent-jar</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -106,7 +106,7 @@
<goal>process</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.directory}/${build.finalName}</outputDirectory>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
<attached>false</attached>
</configuration>
</execution>