You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by wo...@apache.org on 2009/04/23 11:32:43 UTC
svn commit: r767872 - in /portals/jetspeed-2/portal/trunk: ./
applications/jetspeed-dependencies/ components/jetspeed-capability/
components/jetspeed-cm/ components/jetspeed-portal/
components/jetspeed-rdbms/ components/jetspeed-security/ components/je...
Author: woonsan
Date: Thu Apr 23 09:32:43 2009
New Revision: 767872
URL: http://svn.apache.org/viewvc?rev=767872&view=rev
Log:
JS2-976: Upgrading spring framework dependency version to 2.5.6.
Also, adds jcl-over-slf4j dependency into all the subprojects which has already spring framework dependencies because spring framework core library is dependent on commons logging.
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml
portals/jetspeed-2/portal/trunk/pom.xml
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml?rev=767872&r1=767871&r2=767872&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml Thu Apr 23 09:32:43 2009
@@ -147,7 +147,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml?rev=767872&r1=767871&r2=767872&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml Thu Apr 23 09:32:43 2009
@@ -65,6 +65,11 @@
<artifactId>jetspeed-cm</artifactId>
<scope>test</scope>
</dependency>
+ <!-- for spring-core we require JCL -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml?rev=767872&r1=767871&r2=767872&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml Thu Apr 23 09:32:43 2009
@@ -95,6 +95,11 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+ <!-- for spring-core we require JCL -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml?rev=767872&r1=767871&r2=767872&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml Thu Apr 23 09:32:43 2009
@@ -155,6 +155,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <!-- for spring-core we require JCL -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml?rev=767872&r1=767871&r2=767872&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml Thu Apr 23 09:32:43 2009
@@ -71,7 +71,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml?rev=767872&r1=767871&r2=767872&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml Thu Apr 23 09:32:43 2009
@@ -62,6 +62,11 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
+ <!-- for spring-core we require JCL -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml?rev=767872&r1=767871&r2=767872&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml Thu Apr 23 09:32:43 2009
@@ -57,6 +57,11 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
+ <!-- for spring-core we require JCL -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<!-- Test Dependencies -->
<dependency>
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=767872&r1=767871&r2=767872&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Thu Apr 23 09:32:43 2009
@@ -325,10 +325,9 @@
<regexp.version>1.2</regexp.version>
<rome.version>0.8</rome.version>
<saxpath.version>1.0-FCS</saxpath.version>
- <spring.version>2.5.2</spring.version>
+ <spring.version>2.5.6</spring.version>
<spring.ldap.version>1.3.0.RELEASE</spring.ldap.version>
- <spring.portlet.version>2.0.6</spring.portlet.version>
- <spring.modules.version>2.0-rc2</spring.modules.version>
+ <spring.ojb.version>2.0-rc2</spring.ojb.version>
<taglibs-random.version>1.0.2</taglibs-random.version>
<taglibs-request.version>1.0.1</taglibs-request.version>
<taglibs-standard.version>1.1.2</taglibs-standard.version>
@@ -628,25 +627,8 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-core</artifactId>
<version>${spring.version}</version>
- </dependency>
- <dependency>
- <artifactId>spring-ldap</artifactId>
- <groupId>org.springframework.ldap</groupId>
- <version>${spring.ldap.version}</version>
- <classifier>all</classifier>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-portlet</artifactId>
- <version>${spring.portlet.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -689,17 +671,6 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>${spring.version}</version>
<exclusions>
@@ -786,10 +757,11 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- Spring Framework OJB Modules -->
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-support</artifactId>
- <version>${spring.version}</version>
+ <artifactId>spring-ojb</artifactId>
+ <version>${spring.ojb.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -797,11 +769,12 @@
</exclusion>
</exclusions>
</dependency>
- <!-- Spring Framework Modules -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-ojb</artifactId>
- <version>${spring.modules.version}</version>
+ <!-- Spring Framework LDAP Modules -->
+ <dependency>
+ <artifactId>spring-ldap</artifactId>
+ <groupId>org.springframework.ldap</groupId>
+ <version>${spring.ldap.version}</version>
+ <classifier>all</classifier>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org