511911: Update to Spring 4.3.x
Signed-off-by: Olaf Otto <olaf@x100.de>
diff --git a/core/src/main/java/org/eclipse/gemini/blueprint/compendium/internal/cm/ManagedServiceInstanceTrackerPostProcessor.java b/core/src/main/java/org/eclipse/gemini/blueprint/compendium/internal/cm/ManagedServiceInstanceTrackerPostProcessor.java
index dff3449..e2ffc22 100644
--- a/core/src/main/java/org/eclipse/gemini/blueprint/compendium/internal/cm/ManagedServiceInstanceTrackerPostProcessor.java
+++ b/core/src/main/java/org/eclipse/gemini/blueprint/compendium/internal/cm/ManagedServiceInstanceTrackerPostProcessor.java
@@ -73,6 +73,16 @@
}
}
+ /**
+ * @param o is ignored.
+ * @return always <code>true</code> as this post processor is unaware of bean instances and
+ * will determine whether a bean requires destruction using the bean name in {@link #postProcessBeforeDestruction(Object, String)}.
+ */
+ @Override
+ public boolean requiresDestruction(Object o) {
+ return true;
+ }
+
public void setBundleContext(BundleContext bundleContext) {
this.bundleContext = bundleContext;
}
diff --git a/core/src/main/java/org/eclipse/gemini/blueprint/service/dependency/internal/MandatoryDependencyBeanPostProcessor.java b/core/src/main/java/org/eclipse/gemini/blueprint/service/dependency/internal/MandatoryDependencyBeanPostProcessor.java
index 532c4c1..7f333d1 100644
--- a/core/src/main/java/org/eclipse/gemini/blueprint/service/dependency/internal/MandatoryDependencyBeanPostProcessor.java
+++ b/core/src/main/java/org/eclipse/gemini/blueprint/service/dependency/internal/MandatoryDependencyBeanPostProcessor.java
@@ -76,4 +76,14 @@
manager.removeServiceExporter(bean, beanName);
}
}
+
+ /**
+ * @param o is ignored.
+ * @return always <code>true</code> as this post processor is unaware of bean instances and
+ * will determine whether a bean requires destruction using the bean name in {@link #postProcessBeforeDestruction(Object, String)}.
+ */
+ @Override
+ public boolean requiresDestruction(Object o) {
+ return true;
+ }
}
\ No newline at end of file
diff --git a/integration-tests/bundles/proxy.creator.bundle/src/main/resources/META-INF/MANIFEST.MF b/integration-tests/bundles/proxy.creator.bundle/src/main/resources/META-INF/MANIFEST.MF
index 12d210c..361a3bb 100644
--- a/integration-tests/bundles/proxy.creator.bundle/src/main/resources/META-INF/MANIFEST.MF
+++ b/integration-tests/bundles/proxy.creator.bundle/src/main/resources/META-INF/MANIFEST.MF
@@ -4,6 +4,7 @@
Bundle-Version: 1.0
Import-Package: org.apache.commons.logging,org.springframework.aop.interceptor,
org.springframework.aop.framework,org.springframework.aop,org.aopalliance.aop,
- org.springframework.cglib.proxy,org.springframework.cglib.core,org.springframework.cglib.reflect
+ org.springframework.cglib.proxy,org.springframework.cglib.core,org.springframework.cglib.reflect,
+ org.springframework.core
Export-Package: org.eclipse.gemini.blueprint.iandt.service.listener
Spring-Context: *; eagerly-init-importers:=true
diff --git a/pom.xml b/pom.xml
index b6e9b72..9bcca6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,8 +25,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Spring version -->
- <spring.maven.artifact.version>4.2.5.RELEASE_1</spring.maven.artifact.version>
- <spring.base.version>4.2.0</spring.base.version>
+ <spring.maven.artifact.version>4.3.6.RELEASE_1</spring.maven.artifact.version>
+ <spring.base.version>4.3.0</spring.base.version>
<symName.prefix>org.eclipse.gemini.blueprint</symName.prefix>
<spring.osgi.symbolic.name>${project.groupId}.${project.artifactId}</spring.osgi.symbolic.name>
@@ -63,7 +63,7 @@
<policy.url>..${file.separator}policy.all</policy.url>
<!-- common version ranges -->
- <spring.version.range.nq>[${spring.base.version},4.3)</spring.version.range.nq>
+ <spring.version.range.nq>[${spring.base.version},4.4)</spring.version.range.nq>
<spring.version.range>"${spring.version.range.nq}"</spring.version.range>
<gemini.blueprint.version.range.nq>[${project.version},${project.version}]</gemini.blueprint.version.range.nq>
<gemini.blueprint.version.range>"${gemini.blueprint.version.range.nq}"</gemini.blueprint.version.range>
@@ -264,7 +264,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
- <version>4.9_1</version>
+ <version>4.12_1</version>
</dependency>
<dependency>
diff --git a/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties b/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties
index 40f25a3..1ac44e9 100644
--- a/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties
+++ b/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties
@@ -16,10 +16,10 @@
#
# versioning
-ignore.junit.version=4.9_1
+ignore.junit.version=4.12_1
ignore.logback.version=1.0.13
-ignore.spring.version=4.2.5.RELEASE_1
+ignore.spring.version=4.3.6.RELEASE_1
ignore.gemini.blueprint.version=${project.version}
ignore.slf4j.version=1.7.5
ignore.asm.version=2.2.3_1
