Author: cschneider
Date: Wed Apr 26 08:30:00 2017
New Revision: 1792711
URL: http://svn.apache.org/viewvc?rev=1792711&view=rev
Log:
Update blueprint dependencies to fix build
Modified:
aries/trunk/blueprint/blueprint-bundle/pom.xml
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
aries/trunk/blueprint/itests/blueprint-itests/pom.xml
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1792711&r1=1792710&r2=1792711&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-bundle/pom.xml Wed Apr 26 08:30:00 2017
@@ -122,13 +122,13 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.8.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>1.0.10-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java?rev=1792711&r1=1792710&r2=1792711&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
(original)
+++
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
Wed Apr 26 08:30:00 2017
@@ -896,8 +896,6 @@ public class BlueprintContainerImpl
eventDispatcher.blueprintEvent(new
BlueprintEvent(BlueprintEvent.DESTROYING, getBundle(), getExtenderBundle()));
- AriesFrameworkUtil.safeUnregisterService(registration);
-
executors.shutdownNow();
if (handlerSet != null) {
handlerSet.removeListener(this);
@@ -916,6 +914,17 @@ public class BlueprintContainerImpl
LOGGER.debug("Blueprint container {} destroyed",
getBundle().getSymbolicName(), getBundle().getVersion());
}
+ public static void safeUnregisterService(ServiceRegistration reg)
+ {
+ if(reg != null) {
+ try {
+ reg.unregister();
+ } catch (IllegalStateException e) {
+ //This can be safely ignored
+ }
+ }
+ }
+
protected void quiesce() {
destroyed.set(true);
eventDispatcher.blueprintEvent(new
BlueprintEvent(BlueprintEvent.DESTROYING, getBundle(), getExtenderBundle()));
Modified: aries/trunk/blueprint/itests/blueprint-itests/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-itests/pom.xml?rev=1792711&r1=1792710&r2=1792711&view=diff
==============================================================================
--- aries/trunk/blueprint/itests/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/itests/blueprint-itests/pom.xml Wed Apr 26 08:30:00
2017
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.7.2-SNAPSHOT</version>
+ <version>1.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>1.0.10-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<type>bundle</type>
<scope>compile</scope>
<exclusions>
Modified:
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java?rev=1792711&r1=1792710&r2=1792711&view=diff
==============================================================================
---
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
(original)
+++
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
Wed Apr 26 08:30:00 2017
@@ -46,9 +46,8 @@ import org.osgi.service.cm.Configuration
import org.osgi.service.cm.ConfigurationAdmin;
/**
- * Base class for Pax Exam 1.2.x based unit tests
- *
- * Contains the injection point and various utilities used in most tests
+ * Base class for Pax Exam 1.2.x based unit tests Contains the injection point
and various utilities used in
+ * most tests
*/
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
@@ -63,52 +62,52 @@ public abstract class AbstractBlueprintI
assertNotNull(beanContainer);
return beanContainer;
}
-
+
public Option baseOptions() {
String localRepo = System.getProperty("maven.repo.local");
if (localRepo == null) {
localRepo =
System.getProperty("org.ops4j.pax.url.mvn.localRepository");
}
- return composite(
- junitBundles(),
-
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
- when(localRepo !=
null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" +
localRepo)),
- mvnBundle("org.ops4j.pax.logging", "pax-logging-api"),
- mvnBundle("org.ops4j.pax.logging", "pax-logging-service"),
- systemProperty("pax.exam.osgi.unresolved.fail").value("true")
- );
+ return composite(junitBundles(),
+
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
+ when(localRepo != null)
+
.useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo)),
+ mvnBundle("org.ops4j.pax.logging", "pax-logging-api"),
+ mvnBundle("org.ops4j.pax.logging",
"pax-logging-service"),
+
systemProperty("pax.exam.osgi.unresolved.fail").value("true")
+ );
}
-
+
public InputStream getResource(String path) {
- InputStream is =
this.getClass().getClassLoader().getResourceAsStream(path);
- if (is == null) {
- throw new IllegalArgumentException("Resource not found " +
path);
- }
- return is;
- }
-
- protected void applyCommonConfiguration(BundleContext ctx) throws
Exception {
- ConfigurationAdmin ca = (new
RichBundleContext(ctx)).getService(ConfigurationAdmin.class);
- Configuration cf =
ca.getConfiguration("blueprint-sample-placeholder", null);
- Hashtable<String, String> props = new Hashtable<String, String>();
- props.put("key.b", "10");
- cf.update(props);
- }
-
- protected Bundle getSampleBundle() {
- Bundle bundle =
context().getBundleByName("org.apache.aries.blueprint.sample");
- assertNotNull(bundle);
- return bundle;
- }
-
- protected MavenArtifactProvisionOption sampleBundleOption() {
- return CoreOptions.mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample").versionAsInProject();
- }
-
- protected void startBlueprintBundles() throws BundleException,
- InterruptedException {
-
context().getBundleByName("org.apache.aries.blueprint.core").start();
-
context().getBundleByName("org.apache.aries.blueprint.cm").start();
- Thread.sleep(2000);
- }
+ InputStream is =
this.getClass().getClassLoader().getResourceAsStream(path);
+ if (is == null) {
+ throw new IllegalArgumentException("Resource not found " + path);
+ }
+ return is;
+ }
+
+ protected void applyCommonConfiguration(BundleContext ctx) throws
Exception {
+ ConfigurationAdmin ca = (new
RichBundleContext(ctx)).getService(ConfigurationAdmin.class);
+ Configuration cf = ca.getConfiguration("blueprint-sample-placeholder",
null);
+ Hashtable<String, String> props = new Hashtable<String, String>();
+ props.put("key.b", "10");
+ cf.update(props);
+ }
+
+ protected Bundle getSampleBundle() {
+ Bundle bundle =
context().getBundleByName("org.apache.aries.blueprint.sample");
+ assertNotNull(bundle);
+ return bundle;
+ }
+
+ protected MavenArtifactProvisionOption sampleBundleOption() {
+ return CoreOptions.mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample")
+ .versionAsInProject();
+ }
+
+ protected void startBlueprintBundles() throws BundleException,
InterruptedException {
+ context().getBundleByName("org.apache.aries.blueprint.core").start();
+ context().getBundleByName("org.apache.aries.blueprint.cm").start();
+ Thread.sleep(2000);
+ }
}
Modified:
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java?rev=1792711&r1=1792710&r2=1792711&view=diff
==============================================================================
---
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
(original)
+++
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
Wed Apr 26 08:30:00 2017
@@ -37,7 +37,7 @@ public class BlueprintContainer2Test ext
@Test
public void test() throws Exception {
- applyCommonConfiguration(context());
+ applyCommonConfiguration(context());
Bundle bundle = getSampleBundle();
bundle.start();
@@ -46,7 +46,7 @@ public class BlueprintContainer2Test ext
// do the test
Helper.testBlueprintContainer(context(), bundle);
}
-
+
@org.ops4j.pax.exam.Configuration
public Option[] configuration() {
return new Option[] {
