(sling-org-apache-sling-auth-form) branch master updated: SLING-12891 bump pax.exam to 4.14.0 (#12)

[enorman]

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

enorman pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-auth-form.git


The following commit(s) were added to refs/heads/master by this push:
     new 1f9b772  SLING-12891 bump pax.exam to 4.14.0 (#12)
1f9b772 is described below

commit 1f9b772cdd8abce95658641286c2a9beb8e1109e
Author: Eric Norman <enor...@apache.org>
AuthorDate: Sat Aug 16 13:51:38 2025 -0700

    SLING-12891 bump pax.exam to 4.14.0 (#12)
---
 pom.xml                                                  |  6 +++---
 .../apache/sling/auth/form/it/AuthFormTestSupport.java   | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index fd10537..1b3a56b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
     <properties>
         <site.jira.version.id>12314785</site.jira.version.id>
         <site.javadoc.exclude>**.impl.**</site.javadoc.exclude>
-        <org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version>
+        <org.ops4j.pax.exam.version>4.14.0</org.ops4j.pax.exam.version>
         <!-- To debug the pax process, override this with -D -->
         <pax.vm.options>-Xmx512M</pax.vm.options>
         
<project.build.outputTimestamp>2024-07-01T12:25:41Z</project.build.outputTimestamp>
@@ -195,7 +195,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.paxexam</artifactId>
-            <version>4.0.0</version>
+            <version>4.1.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -237,7 +237,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>7.0.0</version>
+            <version>7.0.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git 
a/src/test/java/org/apache/sling/auth/form/it/AuthFormTestSupport.java 
b/src/test/java/org/apache/sling/auth/form/it/AuthFormTestSupport.java
index 1e9d9b3..f90d9ba 100644
--- a/src/test/java/org/apache/sling/auth/form/it/AuthFormTestSupport.java
+++ b/src/test/java/org/apache/sling/auth/form/it/AuthFormTestSupport.java
@@ -39,8 +39,8 @@ import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.options.ModifiableCompositeOption;
 import org.ops4j.pax.exam.options.extra.VMOption;
-import org.ops4j.pax.tinybundles.core.TinyBundle;
-import org.ops4j.pax.tinybundles.core.TinyBundles;
+import org.ops4j.pax.tinybundles.TinyBundle;
+import org.ops4j.pax.tinybundles.TinyBundles;
 import org.osgi.framework.Constants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,7 +59,7 @@ import static org.ops4j.pax.exam.CoreOptions.streamBundle;
 import static org.ops4j.pax.exam.CoreOptions.vmOption;
 import static org.ops4j.pax.exam.CoreOptions.when;
 import static 
org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
-import static org.ops4j.pax.tinybundles.core.TinyBundles.withBnd;
+import static org.ops4j.pax.tinybundles.TinyBundles.bndBuilder;
 
 public abstract class AuthFormTestSupport extends TestSupport {
     private static final String BUNDLE_SYMBOLICNAME = "TEST-CONTENT-BUNDLE";
@@ -262,7 +262,7 @@ public abstract class AuthFormTestSupport extends 
TestSupport {
         try (final InputStream is = 
getClass().getResourceAsStream(resourcePath)) {
             assertNotNull("Expecting resource to be found:" + resourcePath, 
is);
             logger.info("Adding resource to bundle, path={}, resource={}", 
pathInBundle, resourcePath);
-            bundle.add(pathInBundle, is);
+            bundle.addResource(pathInBundle, is);
         }
     }
 
@@ -276,15 +276,15 @@ public abstract class AuthFormTestSupport extends 
TestSupport {
     protected Option buildBundleResourcesBundle(final String header, final 
Collection<String> content)
             throws IOException {
         final TinyBundle bundle = TinyBundles.bundle();
-        bundle.set(Constants.BUNDLE_SYMBOLICNAME, BUNDLE_SYMBOLICNAME);
-        bundle.set(SLING_BUNDLE_RESOURCES_HEADER, header);
-        bundle.set(
+        bundle.setHeader(Constants.BUNDLE_SYMBOLICNAME, BUNDLE_SYMBOLICNAME);
+        bundle.setHeader(SLING_BUNDLE_RESOURCES_HEADER, header);
+        bundle.setHeader(
                 "Require-Capability",
                 
"osgi.extender;filter:=\"(&(osgi.extender=org.apache.sling.bundleresource)(version<=1.1.0)(!(version>=2.0.0)))\"");
 
         for (final String entry : content) {
             addContent(bundle, entry);
         }
-        return streamBundle(bundle.build(withBnd())).start();
+        return streamBundle(bundle.build(bndBuilder())).start();
     }
 }