upgrade to 4.3.1 osgi core artifact. Fix test using stale version of cm artifact.
diff --git a/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertyplaceholder/PropertyPlaceholderTest.java b/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertyplaceholder/PropertyPlaceholderTest.java
index 1d66466..867db58 100644
--- a/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertyplaceholder/PropertyPlaceholderTest.java
+++ b/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertyplaceholder/PropertyPlaceholderTest.java
@@ -72,7 +72,7 @@
protected String[] getTestBundlesNames() {
return new String[] {
// required by cm_all for logging
- "org.apache.felix, org.apache.felix.configadmin, 1.2.8" };
+ "org.apache.felix, org.apache.felix.configadmin, 1.4.0" };
}
protected void onSetUp() throws Exception {
diff --git a/pom.xml b/pom.xml
index 4932784..e9c4d04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<env.buildNumber></env.buildNumber>
<!-- compiled against osgi Revision -->
- <osgi.ver>4.3.0</osgi.ver>
+ <osgi.ver>4.3.1</osgi.ver>
<!-- platform versions -->
<!-- equinox 3.7 is R4.3 impl -->
<!-- todo: would like to use this version - need ebr support -->
@@ -54,8 +54,6 @@
<kf.ver>6.0.2</kf.ver>
<!-- Felix 4.x supports OSGi R4.3 -->
<felix.ver>4.0.3</felix.ver>
- <!--<kf.ver>5.3.3</kf.ver>-->
- <!--<felix.ver>3.2.2</felix.ver>-->
<!-- javadoc configuration -->
<javadoc.loc>${basedir}/docs/src/javadoc</javadoc.loc>
@@ -570,8 +568,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
<debug>true</debug>
<fork>true</fork>
</configuration>
diff --git a/test-support/pom.xml b/test-support/pom.xml
index fde1253..cb7c97f 100644
--- a/test-support/pom.xml
+++ b/test-support/pom.xml
@@ -66,6 +66,13 @@
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<scope>provided</scope>
