dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #06888
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1928: Removed unnecessary Spring exclusions in root POM. Added explicit versions for Spring dependencie...
Merge authors:
Lars <larshelg@larshelg-laptop>
------------------------------------------------------------
revno: 1928 [merge]
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Wed 2010-08-18 09:19:54 +0200
message:
Removed unnecessary Spring exclusions in root POM. Added explicit versions for Spring dependencies in dependency management.
modified:
dhis-2/dhis-services/dhis-service-core/pom.xml
dhis-2/dhis-support/dhis-support-external/pom.xml
dhis-2/dhis-support/dhis-support-hibernate/pom.xml
dhis-2/dhis-support/dhis-support-test/pom.xml
dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml
dhis-2/pom.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-core/pom.xml'
--- dhis-2/dhis-services/dhis-service-core/pom.xml 2010-05-11 14:20:51 +0000
+++ dhis-2/dhis-services/dhis-service-core/pom.xml 2010-08-09 16:29:04 +0000
@@ -41,17 +41,6 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-support-jdbc</artifactId>
</dependency>
-
- <!-- Spring Security -->
-
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- </dependency>
<!-- Other -->
@@ -68,10 +57,6 @@
<artifactId>commons-collections</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- </dependency>
- <dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
</dependency>
=== modified file 'dhis-2/dhis-support/dhis-support-external/pom.xml'
--- dhis-2/dhis-support/dhis-support-external/pom.xml 2010-05-17 20:22:43 +0000
+++ dhis-2/dhis-support/dhis-support-external/pom.xml 2010-08-09 16:29:04 +0000
@@ -26,13 +26,71 @@
<artifactId>dhis-support-test</artifactId>
</dependency>
+ <!-- Spring -->
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-asm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </dependency>
+
+ <!--Spring Security -->
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</artifactId>
+ </dependency>
+
<!-- Other -->
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/pom.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/pom.xml 2010-05-09 12:59:49 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/pom.xml 2010-08-09 16:29:04 +0000
@@ -41,7 +41,6 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
</dependency>
-
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jta</artifactId>
=== modified file 'dhis-2/dhis-support/dhis-support-test/pom.xml'
--- dhis-2/dhis-support/dhis-support-test/pom.xml 2010-05-09 12:59:49 +0000
+++ dhis-2/dhis-support/dhis-support-test/pom.xml 2010-08-09 16:29:04 +0000
@@ -33,6 +33,10 @@
<artifactId>spring-orm</artifactId>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
@@ -44,10 +48,6 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- </dependency>
</dependencies>
<properties>
<rootDir>../../</rootDir>
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2010-07-31 09:42:40 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2010-08-18 07:19:54 +0000
@@ -20,15 +20,6 @@
</property>
</bean>
- <bean id="filterChainProxy" class="org.springframework.security.web.FilterChainProxy">
- <sec:filter-chain-map path-type="ant">
- <sec:filter-chain pattern="/dhis-web-commons/security/**" filters="none"/>
- <sec:filter-chain pattern="/dhis-web-commons/util/**" filters="none"/>
- <sec:filter-chain pattern="/dhis-web-commons/css/**" filters="none"/>
- <sec:filter-chain pattern="/**" filters="httpSessionContextIntegrationFilter,authenticationProcessingFilter,logoutFilter,automaticAccessFilter,basicAuthenticationFilter,requiredLoginFilter"/>
- </sec:filter-chain-map>
- </bean>
-
<bean id="org.hisp.dhis.webportal.module.ConfigurableModuleComparator"
class="org.hisp.dhis.webportal.module.ConfigurableModuleComparator">
<property name="order">
@@ -273,6 +264,15 @@
<!-- Security : Filter -->
+ <bean id="filterChainProxy" class="org.springframework.security.web.FilterChainProxy">
+ <sec:filter-chain-map path-type="ant">
+ <sec:filter-chain pattern="/dhis-web-commons/security/**" filters="none"/>
+ <sec:filter-chain pattern="/dhis-web-commons/util/**" filters="none"/>
+ <sec:filter-chain pattern="/dhis-web-commons/css/**" filters="none"/>
+ <sec:filter-chain pattern="/**" filters="httpSessionContextIntegrationFilter,authenticationProcessingFilter,logoutFilter,automaticAccessFilter,basicAuthenticationFilter,requiredLoginFilter"/>
+ </sec:filter-chain-map>
+ </bean>
+
<bean id="httpSessionContextIntegrationFilter"
class="org.springframework.security.web.context.HttpSessionContextIntegrationFilter" />
@@ -284,14 +284,14 @@
<property name="filterProcessesUrl" value="/dhis-web-commons-security/login.action" />
</bean>
- <bean id="successHandler" class="org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler" >
- <property name="defaultTargetUrl" value="/dhis-web-commons-security/loggedIn.action" />
- <property name="alwaysUseDefaultTargetUrl" value="true" />
- </bean>
+ <bean id="successHandler" class="org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler" >
+ <property name="defaultTargetUrl" value="/dhis-web-commons-security/loggedIn.action" />
+ <property name="alwaysUseDefaultTargetUrl" value="true" />
+ </bean>
- <bean id="failureHandler" class="org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler" >
- <property name="defaultFailureUrl" value="/dhis-web-commons/security/loginfailed.jsp" />
- </bean>
+ <bean id="failureHandler" class="org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler" >
+ <property name="defaultFailureUrl" value="/dhis-web-commons/security/loginfailed.jsp" />
+ </bean>
<bean id="logoutFilter" class="org.springframework.security.web.authentication.logout.LogoutFilter">
<constructor-arg value="/" />
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2010-06-18 15:21:28 +0000
+++ dhis-2/pom.xml 2010-08-09 16:29:04 +0000
@@ -239,6 +239,88 @@
<artifactId>dhis-support-external</artifactId>
<version>${version}</version>
</dependency>
+ <!-- Spring -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-asm</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.6.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>1.6.4</version>
+ </dependency>
+ <!--Spring Security -->
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
<!--Other -->
<dependency>
<groupId>org.apache.struts</groupId>
@@ -249,20 +331,6 @@
<groupId>org.apache.struts</groupId>
<artifactId>struts2-spring-plugin</artifactId>
<version>2.1.8.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>velocity</groupId>
@@ -285,40 +353,43 @@
<version>2.1.5</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>1.6.4</version>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <version>1.6.4</version>
- </dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>1.1.3.3</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>jep</groupId>
+ <artifactId>jep</artifactId>
+ <version>2.24</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.amplecode</groupId>
+ <artifactId>cave-process</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Apache Commons -->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -375,49 +446,6 @@
<artifactId>commons-email</artifactId>
<version>1.1</version>
</dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.3.3</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>jep</groupId>
- <artifactId>jep</artifactId>
- <version>2.24</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- </dependency>
- <dependency>
- <groupId>org.amplecode</groupId>
- <artifactId>cave-process</artifactId>
- <version>1.0.3</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
<!--DBMS -->
<dependency>
<groupId>com.h2database</groupId>
@@ -434,7 +462,6 @@
<artifactId>ibatis2-sqlmap</artifactId>
<version>2.1.7.597</version>
</dependency>
-
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
@@ -461,7 +488,6 @@
<artifactId>slf4j-log4j12</artifactId>
<version>1.5.8</version>
</dependency>
-
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
@@ -487,40 +513,6 @@
<artifactId>postgresql</artifactId>
<version>8.4-701.jdbc4</version>
</dependency>
- <!--Security -->
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>3.0.2.RELEASE</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-support</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <version>3.0.2.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- <version>3.0.2.RELEASE</version>
- </dependency>
<!--Reporting -->
<dependency>
<groupId>net.sf.jasperreports</groupId>
@@ -603,8 +595,7 @@
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-codec</artifactId>
<version>1.7</version>
- </dependency>
-
+ </dependency>
<!-- Relaxng schema validation. -->
<dependency>
<groupId>net.java.dev.msv</groupId>
@@ -613,7 +604,6 @@
<scope>test</scope>
<type>jar</type>
</dependency>
-
<dependency>
<groupId>net.java.dev.msv</groupId>
<artifactId>relaxngDatatype</artifactId>
@@ -621,7 +611,6 @@
<scope>test</scope>
<type>jar</type>
</dependency>
-
<dependency>
<groupId>net.java.dev.msv</groupId>
<artifactId>xsdlib</artifactId>
@@ -632,10 +621,9 @@
</dependencies>
</dependencyManagement>
-
<properties>
<rootDir></rootDir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spring.version>3.0.2.RELEASE</spring.version>
+ <spring.version>3.0.2.RELEASE</spring.version>
</properties>
</project>
