Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Waibel2018-12-09 07:46:40 -0500
committerFlorian Waibel2018-12-09 07:46:40 -0500
commit2ac7f7b6ba147ce30004d0a2c5eb4b5711d09945 (patch)
tree4b55134026fe92265059ab45fb79bbcd060dd336
parentb83c186b1705b8105dbf59e712b3c29bd27b6d71 (diff)
downloadorg.eclipse.virgo.kernel-2ac7f7b6ba147ce30004d0a2c5eb4b5711d09945.tar.gz
org.eclipse.virgo.kernel-2ac7f7b6ba147ce30004d0a2c5eb4b5711d09945.tar.xz
org.eclipse.virgo.kernel-2ac7f7b6ba147ce30004d0a2c5eb4b5711d09945.zip
Bump version of Spring Framework to 4.3.21.RELEASEHEADmaster
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java4
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java12
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd6
3 files changed, 11 insertions, 11 deletions
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java
index e83db563..4055470d 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java
@@ -103,7 +103,7 @@ public class EquinoxOsgiFrameworkTests extends AbstractOsgiFrameworkLaunchingTes
+ "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.apache.commons.codec/1.10.0/"
+ "8aff50e99bd7e53f8c4f5fe45c2a63f1d47dd19c/org.apache.commons.codec-1.10.0.jar").getAbsolutePath());
return osgi.getBundleContext().installBundle("file:///" + new File(System.getProperty("user.home")
- + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.springframework.core/4.3.18.RELEASE"
- + "/74796680c0057c1cdc78f07a3d1194d237a73c29/org.springframework.core-4.3.18.RELEASE.jar").getAbsolutePath());
+ + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.springframework.core/4.3.21.RELEASE"
+ + "/f34af5b4dae5ba6f4c5d949b3b8ac2be41e1266a/org.springframework.core-4.3.21.RELEASE.jar").getAbsolutePath());
}
}
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java
index 89c8d426..55ad8752 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java
@@ -76,11 +76,11 @@ public class ImportExpansionHandlerTests {
LibraryBridge libraryBridge = new LibraryBridge(new StubHashGenerator());
this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File(System.getProperty("user.home")
- + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.springframework.core/4.3.18.RELEASE"
- + "/74796680c0057c1cdc78f07a3d1194d237a73c29/org.springframework.core-4.3.18.RELEASE.jar")));
+ + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.springframework.core/4.3.21.RELEASE"
+ + "/f34af5b4dae5ba6f4c5d949b3b8ac2be41e1266a/org.springframework.core-4.3.21.RELEASE.jar")));
this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File(System.getProperty("user.home")
- + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.springframework.beans/4.3.18.RELEASE"
- + "/56f156056a8c5df4c7ed2ce664b02ae2e0b1321/org.springframework.beans-4.3.18.RELEASE.jar")));
+ + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.springframework.beans/4.3.21.RELEASE"
+ + "/85792e44bd0d8fe022b1acf52250e1e3d3d37d12/org.springframework.beans-4.3.21.RELEASE.jar")));
this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File("src/test/resources/silht/bundles/fragmentOne")));
this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File("src/test/resources/silht/bundles/fragmentTwo")));
this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File("src/test/resources/silht/bundles/fragmentThree")));
@@ -120,7 +120,7 @@ public class ImportExpansionHandlerTests {
for (ImportedPackage packageImport : packageImports) {
Map<String, String> attributes = packageImport.getAttributes();
assertEquals("org.springframework.core", attributes.get("bundle-symbolic-name"));
- assertEquals(new VersionRange("[4.3.18.RELEASE,4.3.18.RELEASE]"), new VersionRange(attributes.get("bundle-version")));
+ assertEquals(new VersionRange("[4.3.21.RELEASE,4.3.21.RELEASE]"), new VersionRange(attributes.get("bundle-version")));
}
}
@@ -155,7 +155,7 @@ public class ImportExpansionHandlerTests {
} else {
assertEquals("org.springframework.core", attributes.get("bundle-symbolic-name"));
}
- assertEquals(new VersionRange("[4.3.18.RELEASE,4.3.18.RELEASE]"), new VersionRange(attributes.get("bundle-version")));
+ assertEquals(new VersionRange("[4.3.21.RELEASE,4.3.21.RELEASE]"), new VersionRange(attributes.get("bundle-version")));
}
}
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd b/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd
index d38b3d86..7dab34b6 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd
+++ b/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd
@@ -1,4 +1,4 @@
Library-SymbolicName: org.springframework
-Library-Version: 4.3.18
-Import-Bundle: org.springframework.core;version="[4.3.18.RELEASE,4.3.18.RELEASE]",
- org.springframework.beans;version="[4.3.18.RELEASE,4.3.18.RELEASE]"
+Library-Version: 4.3.21
+Import-Bundle: org.springframework.core;version="[4.3.21.RELEASE,4.3.21.RELEASE]",
+ org.springframework.beans;version="[4.3.21.RELEASE,4.3.21.RELEASE]"

Back to the top