This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 06cd505a0ffda667429681e0f1ee34b56ee82b83
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Dec 21 14:34:40 2020 +0100
CAMEL-13443: camel-test-blueprint - upgrade tinybundles that better close
resources to not leak file handles.
---
components/camel-blueprint-main/pom.xml | 4 ++--
.../java/org/apache/camel/blueprint/CamelBlueprintHelper.java | 8 ++++----
.../src/test/java/org/apache/camel/blueprint/MainTest.java | 6 +++---
components/camel-test-blueprint/pom.xml | 4 ++--
pom.xml | 6 +++---
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/components/camel-blueprint-main/pom.xml
b/components/camel-blueprint-main/pom.xml
index b44076e..fc79a62 100644
--- a/components/camel-blueprint-main/pom.xml
+++ b/components/camel-blueprint-main/pom.xml
@@ -123,8 +123,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.swissbox</groupId>
- <artifactId>pax-swissbox-tinybundles</artifactId>
+ <groupId>org.ops4j.pax.tinybundles</groupId>
+ <artifactId>tinybundles</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
diff --git
a/components/camel-blueprint-main/src/main/java/org/apache/camel/blueprint/CamelBlueprintHelper.java
b/components/camel-blueprint-main/src/main/java/org/apache/camel/blueprint/CamelBlueprintHelper.java
index eebba97..bd85347 100644
---
a/components/camel-blueprint-main/src/main/java/org/apache/camel/blueprint/CamelBlueprintHelper.java
+++
b/components/camel-blueprint-main/src/main/java/org/apache/camel/blueprint/CamelBlueprintHelper.java
@@ -57,8 +57,8 @@ import org.apache.felix.connect.launch.BundleDescriptor;
import org.apache.felix.connect.launch.ClasspathScanner;
import org.apache.felix.connect.launch.PojoServiceRegistry;
import org.apache.felix.connect.launch.PojoServiceRegistryFactory;
-import org.ops4j.pax.swissbox.tinybundles.core.TinyBundle;
-import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
+import org.ops4j.pax.tinybundles.core.TinyBundle;
+import org.ops4j.pax.tinybundles.core.TinyBundles;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -365,7 +365,7 @@ public final class CamelBlueprintHelper {
}
protected static TinyBundle createConfigAdminInitBundle(String[]...
configAdminPidFiles) throws IOException {
- TinyBundle bundle = TinyBundles.newBundle();
+ TinyBundle bundle = TinyBundles.bundle();
StringWriter configAdminInit = null;
for (String[] configAdminPidFile : configAdminPidFiles) {
if (configAdminPidFile == null) {
@@ -395,7 +395,7 @@ public final class CamelBlueprintHelper {
}
protected static TinyBundle createTestBundle(String name, String version,
String descriptors) throws IOException {
- TinyBundle bundle = TinyBundles.newBundle();
+ TinyBundle bundle = TinyBundles.bundle();
for (URL url : getBlueprintDescriptors(descriptors)) {
LOG.info("Using Blueprint XML file: " + url.getFile());
bundle.add("OSGI-INF/blueprint/blueprint-" +
url.getFile().replace("/", "-"), url);
diff --git
a/components/camel-blueprint-main/src/test/java/org/apache/camel/blueprint/MainTest.java
b/components/camel-blueprint-main/src/test/java/org/apache/camel/blueprint/MainTest.java
index 60d4a53..fd045a3 100644
---
a/components/camel-blueprint-main/src/test/java/org/apache/camel/blueprint/MainTest.java
+++
b/components/camel-blueprint-main/src/test/java/org/apache/camel/blueprint/MainTest.java
@@ -24,8 +24,8 @@ import java.net.URLClassLoader;
import org.apache.aries.util.io.IOUtils;
import org.apache.camel.ProducerTemplate;
import org.junit.Test;
-import org.ops4j.pax.swissbox.tinybundles.core.TinyBundle;
-import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
+import org.ops4j.pax.tinybundles.core.TinyBundle;
+import org.ops4j.pax.tinybundles.core.TinyBundles;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -58,7 +58,7 @@ public class MainTest {
@Test
public void testMainWithoutIncludingTestBundle() throws Exception {
- TinyBundle bundle = TinyBundles.newBundle();
+ TinyBundle bundle = TinyBundles.bundle();
bundle.add("OSGI-INF/blueprint/camel.xml",
getClass().getResourceAsStream("main-loadfile.xml"));
bundle.set("Manifest-Version", "2")
.set("Bundle-ManifestVersion", "2")
diff --git a/components/camel-test-blueprint/pom.xml
b/components/camel-test-blueprint/pom.xml
index 2ff2350..66f6fb6 100644
--- a/components/camel-test-blueprint/pom.xml
+++ b/components/camel-test-blueprint/pom.xml
@@ -124,8 +124,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.swissbox</groupId>
- <artifactId>pax-swissbox-tinybundles</artifactId>
+ <groupId>org.ops4j.pax.tinybundles</groupId>
+ <artifactId>tinybundles</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 819d4f4..0f11c83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -237,7 +237,7 @@
<paranamer-bundle-version>2.8_1</paranamer-bundle-version>
<pax-cdi-version>1.0.0</pax-cdi-version>
<pax-exam-version>4.13.4</pax-exam-version>
- <pax-tiny-bundle-version>1.3.2</pax-tiny-bundle-version>
+ <pax-tiny-bundle-version>3.0.0</pax-tiny-bundle-version>
<pax-logging-version>1.11.2</pax-logging-version>
<perfmark-version>0.17.0</perfmark-version>
<protobuf-guava-version>28.2-jre</protobuf-guava-version>
@@ -418,8 +418,8 @@
<version>${pax-exam-version}</version>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.swissbox</groupId>
- <artifactId>pax-swissbox-tinybundles</artifactId>
+ <groupId>org.ops4j.pax.tinybundles</groupId>
+ <artifactId>tinybundles</artifactId>
<version>${pax-tiny-bundle-version}</version>
</dependency>
<dependency>
