summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVikas Mishra2012-03-27 10:00:10 (EDT)
committer Manik Kishore2012-06-19 07:23:56 (EDT)
commit6ac0796d49d4f9169df7f7728deebcada211c1bb (patch)
tree6135e8485cdc80b1341396a8fac1b7c9e6fb9006
parent6cfbd795725310e2a465e9725146e3aa79204a66 (diff)
downloadorg.eclipse.stardust.ui.web-6ac0796d49d4f9169df7f7728deebcada211c1bb.zip
org.eclipse.stardust.ui.web-6ac0796d49d4f9169df7f7728deebcada211c1bb.tar.gz
org.eclipse.stardust.ui.web-6ac0796d49d4f9169df7f7728deebcada211c1bb.tar.bz2
Jira-ID: CRNT-24188
Upgrade Spring to version 3 - Portal 1)removed spring-code,spring-aop,spring-context dependencies from ivy.xml because dependencies will references from carnot-spring 2)added dependencies for backport-util-concurrent(earlier it was come from Trinidad) git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@54979 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--portal-common/ivy.xml7
1 files changed, 2 insertions, 5 deletions
diff --git a/portal-common/ivy.xml b/portal-common/ivy.xml
index ad8a4b0..1eceee0 100644
--- a/portal-common/ivy.xml
+++ b/portal-common/ivy.xml
@@ -120,17 +120,14 @@
<dependency org="net.sourceforge.jexcelapi" name="jxl" rev="2.6.10" conf="ipp-portal-base-lib-module-runtime->default">
<exclude org="log4j" module="log4j"/>
</dependency>
- <dependency org="org.springframework" name="spring-core" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-base-lib-module-runtime->default"/>
- <dependency org="org.springframework" name="spring-beans" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-base-lib-module-runtime->default"/>
- <dependency org="org.springframework" name="spring-context" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-base-lib-module-runtime->default"/>
<dependency org="org.springframework" name="spring-webmvc" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-base-lib-module-runtime->default"/>
- <dependency org="org.springframework" name="spring-web" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-base-lib-module-runtime->default"/>
- <dependency org="org.springframework" name="spring-aop" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-base-lib-module-runtime->default"/>
+ <dependency org="org.springframework" name="spring-web" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-base-lib-module-runtime->default"/>
<dependency org="aopalliance" name="aopalliance" transitive="false" rev="1.0" conf="ipp-portal-base-lib-module-runtime->default"/>
<dependency org="org.apache.geronimo.specs" name="geronimo-ejb_2.1_spec" transitive="false" rev="1.1" conf="ipp-portal-base-lib-module-runtime->default"/>
<dependency org="commons-discovery" name="commons-discovery" rev="0.4" conf="ipp-portal-base-lib-module-runtime->default"/>
<dependency org="javax.media" name="jai_imageio-infinity01" rev="1.1" conf="ipp-portal-base-lib-module-runtime->default"/>
<dependency org="net.sourceforge.htmlcleaner" name="htmlcleaner" rev="2.1" conf="ipp-portal-base-lib-module-runtime->default" />
+ <dependency org="backport-util-concurrent" name="backport-util-concurrent" rev="3.1" conf="ipp-portal-base-lib-module-runtime->default" />
<!-- test -->
<dependency org="junit" name="junit" rev="3.8.1" conf="test->default" />