Merge pull request #191 from sparsick/176-bnd-update

#176: update to bnd 5.2.0
reficio · Feb 18, 2021 · ab0ed5a · ab0ed5a
2 parents e12bef7 + f94abf6
commit ab0ed5a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
         <maven.annotations.version>3.5</maven.annotations.version>
         <maven.plugin.plugin.version>3.3</maven.plugin.plugin.version>
         <!-- actually a dependency here. -->
-        <dependency.maven.bundle.plugin.version>3.2.0</dependency.maven.bundle.plugin.version>
+        <dependency.maven.bundle.plugin.version>4.2.1</dependency.maven.bundle.plugin.version>
         <tycho.version>1.0.0</tycho.version>
 
         <sonatype.aether.version>1.13.1</sonatype.aether.version>
@@ -81,8 +81,8 @@
         <dependencies>
             <dependency>
                 <groupId>biz.aQute.bnd</groupId>
-                <artifactId>biz.aQute.bnd</artifactId>
-                <version>4.0.0</version>
+                <artifactId>biz.aQute.bndlib</artifactId>
+                <version>5.2.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -176,7 +176,7 @@
         </dependency>
         <dependency>
             <groupId>biz.aQute.bnd</groupId>
-            <artifactId>biz.aQute.bnd</artifactId>
+            <artifactId>biz.aQute.bndlib</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -194,8 +194,8 @@
             <version>${dependency.maven.bundle.plugin.version}</version>
             <exclusions>
                 <exclusion>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.core</artifactId>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>

diff --git a/src/main/java/org/reficio/p2/utils/JarUtils.java b/src/main/java/org/reficio/p2/utils/JarUtils.java
@@ -23,7 +23,6 @@
 import aQute.bnd.osgi.FileResource;
 import aQute.bnd.osgi.Jar;
 import aQute.bnd.osgi.Resource;
-import edu.emory.mathcs.backport.java.util.Arrays;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.maven.plugin.logging.Log;
@@ -33,6 +32,7 @@
 import org.w3c.dom.NodeList;
 
 import java.io.*;
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.jar.Attributes;