439964 - Bumps from Spring Framework 3.2.10.RELEASE to 4.2.1.RELEASE
diff --git a/build.gradle b/build.gradle
index 0697a64..bcd6b5b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,6 +58,7 @@
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
repositoryExt group: "org.aopalliance", name: "com.springsource.org.aopalliance", version: orgAopAllianceVersion, configuration: "compile", ext: "jar"
+ repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.codec", version: commonsCodecVersion, configuration: "compile", ext: "jar"
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.aop", version: springframeworkVersion, configuration: "compile", ext: "jar"
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.beans", version: springframeworkVersion, configuration: "compile", ext: "jar"
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.context", version: springframeworkVersion, configuration: "compile", ext: "jar"
@@ -99,18 +100,20 @@
// 3rd party dependencies from Spring Framework
repositoryExt group: "org.eclipse.virgo.mirrored", name: "javax.jms", version: javaxJmsVersion, configuration: "compile", ext: "jar"
+ repositoryExt group: "org.eclipse.virgo.mirrored", name: "javax.servlet", version: javaxServletVersion, configuration: "compile", ext: "jar"
// missing Spring Framework dependencies
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.aspects", version: springframeworkVersion, configuration: "compile", ext: "jar"
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.context.support", version: springframeworkVersion, configuration: "compile", ext: "jar"
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.jdbc", version: springframeworkVersion, configuration: "compile", ext: "jar"
+ repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.messaging", version: springframeworkVersion, configuration: "compile", ext: "jar"
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.jms", version: springframeworkVersion, configuration: "compile", ext: "jar"
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.orm", version: springframeworkVersion, configuration: "compile", ext: "jar"
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.oxm", version: springframeworkVersion, configuration: "compile", ext: "jar"
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.transaction", version: springframeworkVersion, configuration: "compile", ext: "jar"
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.web", version: springframeworkVersion, configuration: "compile", ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.web.servlet", version: springframeworkVersion, configuration: "compile", ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.web.portlet", version: springframeworkVersion, configuration: "compile", ext: "jar"
+ repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.webmvc", version: springframeworkVersion, configuration: "compile", ext: "jar"
+ repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.webmvc.portlet", version: springframeworkVersion, configuration: "compile", ext: "jar"
repositoryExt group: "org.eclipse.virgo.mirrored", name: "com.springsource.org.aspectj.weaver", version: orgAspectjVersion, configuration: "compile", ext: "jar"
diff --git a/jetty-server/org.eclipse.virgo.jetty.sample.tags/build.gradle b/jetty-server/org.eclipse.virgo.jetty.sample.tags/build.gradle
index cfcfccb..cdfca84 100644
--- a/jetty-server/org.eclipse.virgo.jetty.sample.tags/build.gradle
+++ b/jetty-server/org.eclipse.virgo.jetty.sample.tags/build.gradle
@@ -7,5 +7,5 @@
compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.context", version: springframeworkVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.core", version: springframeworkVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.web", version: springframeworkVersion, configuration: "compile", ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.web.servlet", version: springframeworkVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.webmvc", version: springframeworkVersion, configuration: "compile", ext: "jar"
}
diff --git a/jetty-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties b/jetty-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
index 0b1787f..bf57be3 100644
--- a/jetty-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
+++ b/jetty-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
@@ -46,7 +46,7 @@
org.slf4j;version="[1.6.4,2)",\
org.slf4j.helpers;version="[1.6.4,2)",\
org.slf4j.spi;version="[1.6.4,2)",\
- org.springframework.util;version="[2.5.6,4)"
+ org.springframework.util;version="[4.2.1,5)"
serviceImports =\
org.eclipse.equinox.region.Region,\
diff --git a/kernel/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties b/kernel/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
index bce27f8..ad40351 100644
--- a/kernel/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
+++ b/kernel/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
@@ -47,7 +47,7 @@
org.slf4j;version="[1.6.4,2)",\
org.slf4j.helpers;version="[1.6.4,2)",\
org.slf4j.spi;version="[1.6.4,2)",\
- org.springframework.util;version="[2.5.6,4)"
+ org.springframework.util;version="[4.2.1,5)"
serviceImports =\
org.eclipse.equinox.region.Region,\
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
deleted file mode 100644
index fd2ed84..0000000
--- a/tomcat-server/src/main/dist/repository/ext/org.springframework.spring-library-3.2.10.RELEASE.libd
+++ /dev/null
@@ -1,20 +0,0 @@
-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/tomcat-server/src/main/dist/repository/ext/org.springframework.spring-library-4.2.1.RELEASE.libd b/tomcat-server/src/main/dist/repository/ext/org.springframework.spring-library-4.2.1.RELEASE.libd
new file mode 100644
index 0000000..743c441
--- /dev/null
+++ b/tomcat-server/src/main/dist/repository/ext/org.springframework.spring-library-4.2.1.RELEASE.libd
@@ -0,0 +1,21 @@
+Library-SymbolicName: org.springframework.spring
+Library-Version: 4.2.1.RELEASE
+Library-Name: Spring Framework
+Import-Bundle:
+ org.springframework.aop;version="[4.2.1.RELEASE, 4.2.1.RELEASE]",
+ org.springframework.aspects;version="[4.2.1.RELEASE, 4.2.1.RELEASE]",
+ org.springframework.beans;version="[4.2.1.RELEASE, 4.2.1.RELEASE]",
+ org.springframework.context;version="[4.2.1.RELEASE, 4.2.1.RELEASE]",
+ org.springframework.context.support;version="[4.2.1.RELEASE, 4.2.1.RELEASE]",
+ org.springframework.core;version="[4.2.1.RELEASE, 4.2.1.RELEASE]",
+ org.springframework.expression;version="[4.2.1.RELEASE, 4.2.1.RELEASE]",
+ org.springframework.jdbc;version="[4.2.1.RELEASE, 4.2.1.RELEASE]",
+ org.springframework.jms;version="[4.2.1.RELEASE, 4.2.1.RELEASE]",
+ org.springframework.messages;version="[4.2.1.RELEASE, 4.2.1.RELEASE]",
+ org.springframework.orm;version="[4.2.1.RELEASE, 4.2.1.RELEASE]",
+ org.springframework.oxm;version="[4.2.1.RELEASE, 4.2.1.RELEASE]",
+ org.springframework.transaction;version="[4.2.1.RELEASE, 4.2.1.RELEASE]",
+ org.springframework.web;version="[4.2.1.RELEASE, 4.2.1.RELEASE]",
+ org.springframework.web.servlet;version="[4.2.1.RELEASE, 4.2.1.RELEASE]",
+ org.springframework.web.portlet;version="[4.2.1.RELEASE, 4.2.1.RELEASE]",
+ com.springsource.org.aopalliance;version="[1.0.0, 1.0.0]"
diff --git a/tomcat-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties b/tomcat-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
index 199c5a9..c576294 100644
--- a/tomcat-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
+++ b/tomcat-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
@@ -47,7 +47,7 @@
org.slf4j;version="[1.6.4,2)",\
org.slf4j.helpers;version="[1.6.4,2)",\
org.slf4j.spi;version="[1.6.4,2)",\
- org.springframework.util;version="[2.5.6,4)"
+ org.springframework.util;version="[4.2.1,5)"
serviceImports =\
org.eclipse.equinox.region.Region,\
