update bndlib

adamcin · Nov 23, 2023 · 248ba85 · 248ba85
1 parent a677324
commit 248ba85
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -135,7 +135,7 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>biz.aQute.bnd:bndlib</include>
+                                    <include>biz.aQute.bnd:biz.aQute.bndlib</include>
                                     <include>org.apache.sling:org.apache.sling.jcr.repoinit</include>
                                     <include>org.apache.sling:org.apache.sling.installer.core</include>
                                     <include>org.apache.felix:org.apache.felix.cm.json</include>
@@ -145,13 +145,17 @@
                             </artifactSet>
                             <filters>
                                 <filter>
-                                    <artifact>biz.aQute.bnd:bndlib</artifact>
+                                    <artifact>biz.aQute.bnd:biz.aQute.bndlib</artifact>
                                     <includes>
                                         <include>aQute/bnd/osgi/**</include>
                                         <include>aQute/bnd/header/**</include>
+                                        <include>aQute/bnd/maven/**</include>
+                                        <include>aQute/bnd/service/Registry*</include>
                                         <include>aQute/lib/base64/**</include>
                                         <include>aQute/lib/collections/**</include>
                                         <include>aQute/lib/converter/**</include>
+                                        <include>aQute/lib/io/**</include>
+                                        <include>aQute/lib/utf8properties/**</include>
                                         <include>aQute/libg/generics/**</include>
                                         <include>aQute/libg/qtokens/**</include>
                                         <include>aQute/service/reporter/**</include>
@@ -295,7 +299,7 @@
         <!-- embedded / shaded -->
         <dependency>
             <groupId>biz.aQute.bnd</groupId>
-            <artifactId>bndlib</artifactId>
+            <artifactId>biz.aQute.bndlib</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -74,7 +74,7 @@
             <plugin>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-component-metadata</artifactId>
-                <version>1.7</version>
+                <version>2.1.1</version>
                 <executions>
                     <execution>
                         <goals>
@@ -196,14 +196,14 @@
         <!-- Maven Plugin Dependencies -->
         <dependency>
             <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-            <version>${maven.version}</version>
-            <scope>provided</scope>
+            <artifactId>maven-archiver</artifactId>
+            <version>3.6.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
-            <artifactId>maven-archiver</artifactId>
-            <version>3.6.0</version>
+            <artifactId>maven-plugin-api</artifactId>
+            <version>${maven.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

diff --git a/maven/src/main/java/net/adamcin/oakpal/maven/mojo/OpearPlanMojo.java b/maven/src/main/java/net/adamcin/oakpal/maven/mojo/OpearPlanMojo.java
@@ -19,6 +19,7 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Exports a plan builder configuration for inclusion in an opear file, using the {@link OpearPackageMojo}.
@@ -63,7 +64,7 @@ public void execute() throws MojoFailureException {
     }
 
     @Override
-    public PlanBuilderParams getPlanBuilderParams() {
+    public @NotNull PlanBuilderParams getPlanBuilderParams() {
         return Optional.ofNullable(planParams).orElse(new PlanParams());
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -625,8 +625,8 @@
             </dependency>
             <dependency>
                 <groupId>biz.aQute.bnd</groupId>
-                <artifactId>bndlib</artifactId>
-                <version>2.1.0</version>
+                <artifactId>biz.aQute.bndlib</artifactId>
+                <version>6.4.1</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>

diff --git a/webster/pom.xml b/webster/pom.xml
@@ -207,7 +207,7 @@
         </dependency>
         <dependency>
             <groupId>biz.aQute.bnd</groupId>
-            <artifactId>bndlib</artifactId>
+            <artifactId>biz.aQute.bndlib</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>