From 84820dd81a896a9e6932f90407f7b201b5fad8ac Mon Sep 17 00:00:00 2001
From: Aaron Whiteside
Date: Sat, 14 Apr 2012 19:22:56 -0400
Subject: - removed support in AbstractDependencyManagerTests for jdk versions
 less than 1.5 - this shouldn't bother anyone since spring 3.0.x has required
 jdk 1.5 from the beginning

---
 .../blueprint/test/AbstractDependencyManagerTests.java   | 16 +---------------
 .../blueprint/test/internal/boot-bundles.properties      | 13 +------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/test-support/src/main/java/org/eclipse/gemini/blueprint/test/AbstractDependencyManagerTests.java b/test-support/src/main/java/org/eclipse/gemini/blueprint/test/AbstractDependencyManagerTests.java
index 053b4ab..2538559 100644
--- a/test-support/src/main/java/org/eclipse/gemini/blueprint/test/AbstractDependencyManagerTests.java
+++ b/test-support/src/main/java/org/eclipse/gemini/blueprint/test/AbstractDependencyManagerTests.java
@@ -22,7 +22,6 @@ import org.eclipse.gemini.blueprint.test.internal.util.PropertiesUtil;
 import org.eclipse.gemini.blueprint.test.provisioning.ArtifactLocator;
 import org.eclipse.gemini.blueprint.test.provisioning.internal.LocalFileSystemMavenRepository;
 import org.osgi.framework.BundleContext;
-import org.springframework.core.JdkVersion;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;
 import org.springframework.util.Assert;
@@ -189,20 +188,7 @@ public abstract class AbstractDependencyManagerTests extends AbstractSynchronize
 			logger.trace("Excluded ignored properties " + excluded);
 		}
 
-		// filter bundles which are Tiger/JDK 1.5 specific
-		String sign = null;
-		if (JdkVersion.isAtLeastJava15()) {
-			sign = "-15";
-		}
-		else {
-			sign = "+15";
-		}
-
-		excluded = PropertiesUtil.filterValuesStartingWith(props, sign);
-		if (trace)
-			logger.trace("JDK " + JdkVersion.getJavaVersion() + " excluded bundles " + excluded);
-
-		String[] bundles = (String[]) props.keySet().toArray(new String[props.size()]);
+		String[] bundles = props.keySet().toArray(new String[props.size()]);
 		// sort the array (as the Properties file doesn't respect the order)
 		//bundles = StringUtils.sortStringArray(bundles);
 
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 aafbd8d..53c2c60 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
@@ -6,11 +6,6 @@
 # Users that want to install bundles before starting a test, should use #bundles() method.
 #
 
-#
-# format: <groupId,artifactId,version>=+/-15
-# - the optional value is used to install/remove bundles if running on JDK >= 1.5
-# - see Spring org.springframework.core.JdkVersion for jdk major version codes.
-
 # elements that have to be ignored should star with
 # ignore
 
@@ -39,18 +34,13 @@ ignore.slf4j.groupId=org.slf4j
 #
 # listed in dependency order to ease deployment
 
-
 # dependencies
 
 # junit
 org.junit,com.springsource.org.junit,${ignore.junit.version}=
 # log4j
 org.apache.log4j,com.springsource.org.apache.log4j,${ignore.log4j.version}=
-# slf4j (commons-logging API)
-#${ignore.slf4j.groupId},slf4j-api,${ignore.slf4j.version}=
-#${ignore.slf4j.groupId},slf4j-log4j12,${ignore.slf4j.version}=
-#${ignore.slf4j.groupId},jcl104-over-slf4j,${ignore.slf4j.version}=
-# slf4j (BRITS)
+# slf4j
 ${ignore.slf4j.groupId},slf4j-api,${ignore.slf4j.version}=
 ${ignore.slf4j.groupId},slf4j-log4j12,${ignore.slf4j.version}=
 ${ignore.slf4j.groupId},jcl-over-slf4j,${ignore.slf4j.version}=
@@ -68,7 +58,6 @@ ${ignore.spring.groupId},spring-expression,${ignore.spring.version}=
 ${ignore.spring.groupId},spring-aop,${ignore.spring.version}=
 ${ignore.spring.groupId},spring-test,${ignore.spring.version}=
 
-
 # gemini blueprint libs
 ${ignore.gemini.blueprint.groupId},gemini-blueprint-io,${ignore.gemini.blueprint.version}=
 ${ignore.gemini.blueprint.groupId},gemini-blueprint-core,${ignore.gemini.blueprint.version}=
-- 
cgit v1.2.3