351868 - bumps spring framework to version 3.2.10.RELEASE
diff --git a/build.gradle b/build.gradle
index c45ed41..cb04e27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -385,8 +385,9 @@
}
configure([
- project(':packaging:jetty-server'),
-]) { dependencies { } }
+ project(':packaging:jetty-server'),
+]) {
+ dependencies { repositoryExt project(':web:org.eclipse.virgo.web.servlet.adapter') } }
configure([
project(':packaging:tomcat-server'),
diff --git a/jetty-server/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml b/jetty-server/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
index d704392..0bfb8c9 100755
--- a/jetty-server/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
+++ b/jetty-server/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
@@ -18,12 +18,6 @@
%license
</license>
- <plugin
- id="org.springframework.asm"
- download-size="0"
- install-size="0"
- version="@SPRING.VERSION@"
- unpack="false"/>
<plugin
id="org.springframework.expression"
download-size="0"
diff --git a/jetty-server/src/main/dist/configuration/org.eclipse.virgo.kernel.userregion.properties b/jetty-server/src/main/dist/configuration/org.eclipse.virgo.kernel.userregion.properties
index 6612471..8d28a70 100644
--- a/jetty-server/src/main/dist/configuration/org.eclipse.virgo.kernel.userregion.properties
+++ b/jetty-server/src/main/dist/configuration/org.eclipse.virgo.kernel.userregion.properties
@@ -91,4 +91,4 @@
org.osgi.framework.BundleContext,\
org.eclipse.virgo.nano.deployer.api.config.ConfigurationDeployer
-initialArtifacts=repository:plan/org.eclipse.virgo.kernel.userregion.blueprint, repository:plan/org.eclipse.virgo.jetty.web,repository:plan/org.eclipse.virgo.management
+initialArtifacts=repository:plan/org.eclipse.virgo.kernel.userregion.blueprint, repository:plan/org.eclipse.virgo.web.jetty,repository:plan/org.eclipse.virgo.management
diff --git a/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.jetty.web.plan b/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.web.jetty.plan
similarity index 74%
rename from jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.jetty.web.plan
rename to jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.web.jetty.plan
index 40c5e59..ef633cf 100644
--- a/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.jetty.web.plan
+++ b/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.web.jetty.plan
@@ -1,4 +1,4 @@
-<plan name="org.eclipse.virgo.jetty.web" version="3.5.0" scoped="false" atomic="false"
+<plan name="org.eclipse.virgo.web.jetty" version="3.7.0" scoped="false" atomic="false"
xmlns="http://www.eclipse.org/virgo/schema/plan"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
@@ -8,4 +8,5 @@
<artifact type="bundle" name="org.eclipse.jetty.osgi.boot" version="[8.1, 9.0)"/>
<artifact type="bundle" name="org.eclipse.virgo.web.dm" version="[3.1, 4.0)"/>
+ <artifact type="bundle" name="org.eclipse.virgo.web.servlet.adapter" version="[3.0, 4.0)"/>
</plan>
diff --git a/jetty-server/src/main/dist/repository/ext/org.springframework.spring-library-3.1.0.RELEASE.libd b/jetty-server/src/main/dist/repository/ext/org.springframework.spring-library-3.1.0.RELEASE.libd
deleted file mode 100644
index 92403bb..0000000
--- a/jetty-server/src/main/dist/repository/ext/org.springframework.spring-library-3.1.0.RELEASE.libd
+++ /dev/null
@@ -1,21 +0,0 @@
-Library-SymbolicName: org.springframework.spring
-Library-Version: 3.1.0.RELEASE
-Library-Name: Spring Framework
-Import-Bundle:
- org.springframework.aop;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.asm;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.aspects;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.beans;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.context;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.context.support;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.core;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.expression;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.jdbc;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.jms;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.orm;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.oxm;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.transaction;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.web;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.web.servlet;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.web.portlet;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- com.springsource.org.aopalliance;version="[1.0.0, 1.0.0]"
diff --git a/jetty-server/src/main/dist/repository/ext/org.springframework.spring-library-3.2.10.RELEASE.libd b/jetty-server/src/main/dist/repository/ext/org.springframework.spring-library-3.2.10.RELEASE.libd
new file mode 100644
index 0000000..fd2ed84
--- /dev/null
+++ b/jetty-server/src/main/dist/repository/ext/org.springframework.spring-library-3.2.10.RELEASE.libd
@@ -0,0 +1,20 @@
+Library-SymbolicName: org.springframework.spring
+Library-Version: 3.2.10.RELEASE
+Library-Name: Spring Framework
+Import-Bundle:
+ org.springframework.aop;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.aspects;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.beans;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.context;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.context.support;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.core;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.expression;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.jdbc;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.jms;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.orm;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.oxm;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.transaction;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.web;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.web.servlet;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.web.portlet;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ com.springsource.org.aopalliance;version="[1.0.0, 1.0.0]"
diff --git a/kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml b/kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
index d704392..0bfb8c9 100755
--- a/kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
+++ b/kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
@@ -18,12 +18,6 @@
%license
</license>
- <plugin
- id="org.springframework.asm"
- download-size="0"
- install-size="0"
- version="@SPRING.VERSION@"
- unpack="false"/>
<plugin
id="org.springframework.expression"
download-size="0"
diff --git a/tomcat-server/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml b/tomcat-server/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
index d704392..0bfb8c9 100755
--- a/tomcat-server/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
+++ b/tomcat-server/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
@@ -18,12 +18,6 @@
%license
</license>
- <plugin
- id="org.springframework.asm"
- download-size="0"
- install-size="0"
- version="@SPRING.VERSION@"
- unpack="false"/>
<plugin
id="org.springframework.expression"
download-size="0"
diff --git a/tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.web.tomcat_3.7.0.D-20140919130336.plan b/tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.web.tomcat.plan
similarity index 100%
rename from tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.web.tomcat_3.7.0.D-20140919130336.plan
rename to tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.web.tomcat.plan
diff --git a/tomcat-server/src/main/dist/repository/ext/org.springframework.spring-library-3.1.0.RELEASE.libd b/tomcat-server/src/main/dist/repository/ext/org.springframework.spring-library-3.1.0.RELEASE.libd
deleted file mode 100644
index 92403bb..0000000
--- a/tomcat-server/src/main/dist/repository/ext/org.springframework.spring-library-3.1.0.RELEASE.libd
+++ /dev/null
@@ -1,21 +0,0 @@
-Library-SymbolicName: org.springframework.spring
-Library-Version: 3.1.0.RELEASE
-Library-Name: Spring Framework
-Import-Bundle:
- org.springframework.aop;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.asm;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.aspects;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.beans;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.context;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.context.support;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.core;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.expression;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.jdbc;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.jms;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.orm;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.oxm;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.transaction;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.web;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.web.servlet;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- org.springframework.web.portlet;version="[3.1.0.RELEASE, 3.1.0.RELEASE]",
- com.springsource.org.aopalliance;version="[1.0.0, 1.0.0]"
diff --git a/tomcat-server/src/main/dist/repository/ext/org.springframework.spring-library-3.2.10.RELEASE.libd b/tomcat-server/src/main/dist/repository/ext/org.springframework.spring-library-3.2.10.RELEASE.libd
new file mode 100644
index 0000000..fd2ed84
--- /dev/null
+++ b/tomcat-server/src/main/dist/repository/ext/org.springframework.spring-library-3.2.10.RELEASE.libd
@@ -0,0 +1,20 @@
+Library-SymbolicName: org.springframework.spring
+Library-Version: 3.2.10.RELEASE
+Library-Name: Spring Framework
+Import-Bundle:
+ org.springframework.aop;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.aspects;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.beans;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.context;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.context.support;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.core;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.expression;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.jdbc;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.jms;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.orm;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.oxm;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.transaction;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.web;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.web.servlet;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ org.springframework.web.portlet;version="[3.2.10.RELEASE, 3.2.10.RELEASE]",
+ com.springsource.org.aopalliance;version="[1.0.0, 1.0.0]"
