Bump Spring Framework to version 5.1.11
diff --git a/3rd-party/build.gradle b/3rd-party/build.gradle
index 5a374f2..651b881 100644
--- a/3rd-party/build.gradle
+++ b/3rd-party/build.gradle
@@ -181,6 +181,7 @@
optionalImport 'org.reactivestreams.*'
optionalImport 'reactor.core.*'
optionalImport 'reactor.ipc.*'
+ optionalImport 'reactor.netty.*'
}
}
@@ -258,9 +259,12 @@
optionalImport 'org.w3c.dom.*'
optionalImport 'io.undertow.*'
optionalImport 'org.apache.catalina.*'
+ optionalImport 'org.apache.coyote'
+ optionalImport 'org.apache.tomcat.util.*'
optionalImport 'org.eclipse.jetty.*'
optionalImport 'reactor.core.*'
optionalImport 'reactor.ipc.*'
+ optionalImport 'reactor.netty.*'
optionalImport 'reactor.util.*'
optionalImport 'javax.json.bind'
optionalImport 'org.synchronoss.cloud.nio.*'
@@ -286,6 +290,7 @@
optionalImport 'org.xnio'
optionalImport 'reactor.core.*'
optionalImport 'reactor.ipc.*'
+ optionalImport 'reactor.netty.*'
optionalImport 'reactor.util.*'
}
}
diff --git a/gradle.properties b/gradle.properties
index 9c1e2b4..1dfe746 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -154,7 +154,7 @@
#CQ 13704 org.springframework.webmvc
#CQ 13705 org.springframework.webmvc.portlet
#CQ 13706 org.springframework.websocket
-springframeworkVersion = 5.0.8.RELEASE
+springframeworkVersion = 5.1.11.RELEASE
springAopHash = 323910d0bd37c13ff534ef62fba303a9bcef1451
springBeansHash = bf5fd324c11eb63777f810250cb8c2ea292f9279
springExpressionHash = 92cc7dd736b78420d7a1bcc76b4946f847b0501
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index 5294282..8778f44 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -3,7 +3,7 @@
aopallianceVersion = 1.0.0
-springframeworkVersion = 5.0.8.RELEASE
+springframeworkVersion = 5.1.11.RELEASE
geminiBlueprintVersion = 3.0.0.M01
blueprintIoHash = 4a555fe19c736d7f919114e29f6fc01d4702c8ac
@@ -95,8 +95,8 @@
org.slf4j.spi;version="[1.6.4,2)",\
org.junit;version="[4.7.0,5.0.0)",\
org.junit.runner;version="[4.7.0,5.0.0)",\
- org.springframework.lang;version="[5.0.8,6)",\
- org.springframework.util;version="[5.0.8,6)"
+ org.springframework.lang;version="[5.1.11,6)",\
+ org.springframework.util;version="[5.1.11,6)"
serviceImports =\
org.eclipse.equinox.region.Region,\
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF
index 60d5b24..c3cc4d4 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF
@@ -22,6 +22,6 @@
org.eclipse.virgo.util.osgi.manifest;version="[3.8.0,4)",
org.junit;version="[4.7.0,5)",
org.junit.runner;version="[4.7.0,5)",
- org.springframework.aop;version="[5.0.8,6)",
- org.springframework.context;version="[5.0.8,6)"
+ org.springframework.aop;version="[5.1.11,6)",
+ org.springframework.context;version="[5.1.11,6)"
Tool: Bundlor 1.1.3.M01
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index 9a777e9..b412dc9 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -4,7 +4,7 @@
aopallianceVersion = 1.0.0
-springframeworkVersion = 5.0.8.RELEASE
+springframeworkVersion = 5.1.11.RELEASE
geminiBlueprintVersion = 3.0.0.M01
blueprintIoHash = 4a555fe19c736d7f919114e29f6fc01d4702c8ac
@@ -91,8 +91,8 @@
org.slf4j.spi;version="[1.6.4,2)",\
org.junit;version="[4.7.0,5.0.0)",\
org.junit.runner;version="[4.7.0,5.0.0)",\
- org.springframework.lang;version="[5.0.8,6)",\
- org.springframework.util;version="[5.0.8,6)"
+ org.springframework.lang;version="[5.1.11,6)",\
+ org.springframework.util;version="[5.1.11,6)"
serviceImports =\
org.eclipse.equinox.region.Region,\
diff --git a/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java b/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java
index c0aa10f..de01a39 100644
--- a/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java
+++ b/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java
@@ -101,7 +101,7 @@
for (ImportedPackage packageImport : packageImports) {
Map<String, String> attributes = packageImport.getAttributes();
assertEquals("oevm.org.springframework.core", attributes.get("bundle-symbolic-name"));
- assertEquals(new VersionRange("[5.0.8.RELEASE,5.0.8.RELEASE]"), new VersionRange(attributes.get("bundle-version")));
+ assertEquals(new VersionRange("[5.1.11.RELEASE,5.1.11.RELEASE]"), new VersionRange(attributes.get("bundle-version")));
}
}
@@ -136,7 +136,7 @@
} else {
assertEquals("oevm.org.springframework.core", attributes.get("bundle-symbolic-name"));
}
- assertEquals(new VersionRange("[5.0.8.RELEASE,5.0.8.RELEASE]"), new VersionRange(attributes.get("bundle-version")));
+ assertEquals(new VersionRange("[5.1.11.RELEASE,5.1.11.RELEASE]"), new VersionRange(attributes.get("bundle-version")));
}
}
@@ -496,13 +496,13 @@
ImportedBundle bundleImport = createAndStoreMock(ImportedBundle.class, mocks);
expect(bundleImport.getBundleSymbolicName()).andReturn("oevm.org.springframework.core").atLeastOnce();
- expect(bundleImport.getVersion()).andReturn(new VersionRange("[5.0.8,6)")).atLeastOnce();
+ expect(bundleImport.getVersion()).andReturn(new VersionRange("[5.1.11,6)")).atLeastOnce();
expect(bundleImport.isApplicationImportScope()).andReturn(false).atLeastOnce();
expect(bundleImport.getResolution()).andReturn(Resolution.MANDATORY).atLeastOnce();
ImportedLibrary libraryImport = createAndStoreMock(ImportedLibrary.class, mocks);
expect(libraryImport.getLibrarySymbolicName()).andReturn("org.springframework").atLeastOnce();
- expect(libraryImport.getVersion()).andReturn(new VersionRange("[5.0.8,6)")).atLeastOnce();
+ expect(libraryImport.getVersion()).andReturn(new VersionRange("[5.1.11,6)")).atLeastOnce();
expect(libraryImport.getResolution()).andReturn(Resolution.MANDATORY).atLeastOnce();
ImportExpansionHandler handler = new ImportExpansionHandler(repository, packagesExportedBySystemBundle, new MockEventLogger());
diff --git a/kernel/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd b/kernel/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd
index 5ecf6a4..97ef915 100644
--- a/kernel/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd
+++ b/kernel/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd
@@ -1,4 +1,4 @@
Library-SymbolicName: org.springframework
-Library-Version: 5.0.8
-Import-Bundle: oevm.org.springframework.core;version="[5.0.8.RELEASE,5.0.8.RELEASE]",
- oevm.org.springframework.beans;version="[5.0.8.RELEASE,5.0.8.RELEASE]"
+Library-Version: 5.1.11
+Import-Bundle: oevm.org.springframework.core;version="[5.1.11.RELEASE,5.1.11.RELEASE]",
+ oevm.org.springframework.beans;version="[5.1.11.RELEASE,5.1.11.RELEASE]"
diff --git a/packaging/kernel/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties b/packaging/kernel/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
index 5457763..494d6cd 100644
--- a/packaging/kernel/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
+++ b/packaging/kernel/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
@@ -47,8 +47,8 @@
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.lang;version="[5.0.8,6)",\
- org.springframework.util;version="[5.0.8,6)"
+ org.springframework.lang;version="[5.1.11,6)",\
+ org.springframework.util;version="[5.1.11,6)"
serviceImports =\
org.eclipse.equinox.region.Region,\
diff --git a/packaging/tomcat-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties b/packaging/tomcat-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
index d2088a5..cb55034 100644
--- a/packaging/tomcat-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
+++ b/packaging/tomcat-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
@@ -45,8 +45,8 @@
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.lang;version="[5.0.8,6)",\
- org.springframework.util;version="[5.0.8,6)"
+ org.springframework.lang;version="[5.1.11,6)",\
+ org.springframework.util;version="[5.1.11,6)"
serviceImports =\
org.eclipse.equinox.region.Region,\
diff --git a/web/org.eclipse.virgo.web.test/src/test/resources/META-INF/MANIFEST.MF b/web/org.eclipse.virgo.web.test/src/test/resources/META-INF/MANIFEST.MF
index f3051ef..d139073 100644
--- a/web/org.eclipse.virgo.web.test/src/test/resources/META-INF/MANIFEST.MF
+++ b/web/org.eclipse.virgo.web.test/src/test/resources/META-INF/MANIFEST.MF
@@ -21,9 +21,9 @@
org.eclipse.virgo.shell.osgicommand.helper,
org.eclipse.virgo.util.io;version="[3.8.0,4)",
org.eclipse.virgo.util.osgi.manifest;version="[3.8.0,4)",
- org.springframework.aop;version="[5.0.8,6)",
- org.springframework.context;version="[5.0.8,6)",
- org.springframework.util;version="[5.0.8,6)",
+ org.springframework.aop;version="[5.1.11,6)",
+ org.springframework.context;version="[5.1.11,6)",
+ org.springframework.util;version="[5.1.11,6)",
org.apache.http,
org.apache.http.client.entity,
org.apache.http.client.methods,
diff --git a/web/org.eclipse.virgo.web.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/web/org.eclipse.virgo.web.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index 73dc04e..fe5f64b 100644
--- a/web/org.eclipse.virgo.web.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/web/org.eclipse.virgo.web.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -4,7 +4,7 @@
aopallianceVersion = 1.0.0
-springframeworkVersion = 5.0.8.RELEASE
+springframeworkVersion = 5.1.11.RELEASE
geminiBlueprintVersion = 3.0.0.M01
blueprintIoHash = 4a555fe19c736d7f919114e29f6fc01d4702c8ac
@@ -97,8 +97,8 @@
org.apache.http.message;version="[4.4.12,5)",\
org.junit;version="[4.7.0,5.0.0)",\
org.junit.runner;version="[4.7.0,5.0.0)",\
- org.springframework.lang;version="[5.0.8,6)",\
- org.springframework.util;version="[5.0.8,6)"
+ org.springframework.lang;version="[5.1.11,6)",\
+ org.springframework.util;version="[5.1.11,6)"
serviceImports =\
org.eclipse.equinox.region.Region,\
