(sling-org-apache-sling-testing-clients) branch master updated: SLING-12576 - Update to TinyBundles 4.0.0 (#50)

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-clients.git


The following commit(s) were added to refs/heads/master by this push:
     new 2b83fbd  SLING-12576 - Update to TinyBundles 4.0.0 (#50)
2b83fbd is described below

commit 2b83fbde16b0eff45dbd569f69c1fc9da27d064e
Author: Robert Munteanu <romb...@apache.org>
AuthorDate: Mon Dec 16 22:32:24 2024 +0100

    SLING-12576 - Update to TinyBundles 4.0.0 (#50)
    
    Update to TinyBundles 4.0.0 and pull in the ops4-base-store and bndlib 
artifacts. The latest
    version has them set to provided scope by default.
---
 pom.xml                                                    | 14 +++++++++++++-
 .../apache/sling/testing/clients/query/QueryClient.java    | 12 ++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 28fba0d..8464989 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,19 @@
         <dependency>
             <groupId>org.ops4j.pax.tinybundles</groupId>
             <artifactId>tinybundles</artifactId>
-            <version>3.0.0</version>
+            <version>4.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.base</groupId>
+            <artifactId>ops4j-base-store</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>biz.aQute.bnd</groupId>
+            <artifactId>biz.aQute.bndlib</artifactId>
+            <version>6.4.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git 
a/src/main/java/org/apache/sling/testing/clients/query/QueryClient.java 
b/src/main/java/org/apache/sling/testing/clients/query/QueryClient.java
index 229e029..e990deb 100644
--- a/src/main/java/org/apache/sling/testing/clients/query/QueryClient.java
+++ b/src/main/java/org/apache/sling/testing/clients/query/QueryClient.java
@@ -29,7 +29,7 @@ import 
org.apache.sling.testing.clients.osgi.OsgiConsoleClient;
 import org.apache.sling.testing.clients.query.servlet.QueryServlet;
 import org.apache.sling.testing.clients.util.JsonUtils;
 import org.apache.sling.testing.clients.util.URLParameterBuilder;
-import org.ops4j.pax.tinybundles.core.TinyBundles;
+import org.ops4j.pax.tinybundles.TinyBundles;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -190,11 +190,11 @@ public class QueryClient extends SlingClient {
      */
     public QueryClient installServlet() throws ClientException, 
InterruptedException {
         InputStream bundleStream = TinyBundles.bundle()
-                .set("Bundle-SymbolicName", BUNDLE_BSN)
-                .set("Bundle-Version", BUNDLE_VERSION)
-                .set("Bundle-Name", BUNDLE_NAME)
-                .add(QueryServlet.class)
-                .build(TinyBundles.withBnd());
+                .setHeader("Bundle-SymbolicName", BUNDLE_BSN)
+                .setHeader("Bundle-Version", BUNDLE_VERSION)
+                .setHeader("Bundle-Name", BUNDLE_NAME)
+                .addClass(QueryServlet.class)
+                .build(TinyBundles.bndBuilder());
 
         try {
             File bundleFile = File.createTempFile(BUNDLE_BSN + "-" + 
BUNDLE_VERSION, ".jar");