OBS-URL: https://build.opensuse.org/package/show/Java:packages/aqute-bnd?expand=0&rev=22

0002-Fix-ant-compatibility.patch

@@ -1,25 +0,0 @@
-From bb26bdfa9f742a6ae5d39e0312aeadb8e9b48940 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Tue, 12 Sep 2017 18:11:27 +0300
-Subject: [PATCH 2/2] Fix ant compatibility
-
----
- biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java b/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
-index dd438a5..6b714be 100644
---- a/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
-+++ b/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
-@@ -220,7 +220,7 @@ public class BndTask extends BaseTask {
- 				if (inherit) {
- 					Properties projectProperties = new UTF8Properties();
- 					@SuppressWarnings("unchecked")
--					Hashtable<Object, Object> antProps = getProject().getProperties();
-+					Hashtable<String,Object> antProps = getProject().getProperties();
- 					projectProperties.putAll(antProps);
- 					projectProperties.putAll(builder.getProperties());
- 					builder.setProperties(projectProperties);
--- 
-2.20.1
-

5.1.1.REL.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:859b702bd16a1424fd399693398ba49f6e0966333f5ff809b6bd02c0cabf1748
-size 125176106

5.2.0.REL.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91c39263b2b367d4f7f8ff1621c274bb56460d0689dc2f94c8a1f66fe777b5ac
+size 127744515

aQute.libg-5.2.0.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>biz.aQute.bnd</groupId>
   <artifactId>aQute.libg</artifactId>
-  <version>5.1.1</version>
+  <version>5.2.0</version>
   <description>A library to be statically linked. Contains many small utilities. This bundle should not be installed in a framework, it is compile only.</description>
   <name>aQute.libg</name>
   <url>https://bnd.bndtools.org/</url>
@@ -23,7 +23,7 @@
     <url>https://github.com/bndtools/bnd</url>
     <connection>scm:git:https://github.com/bndtools/bnd.git</connection>
     <developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
-    <tag>5.1.1.REL</tag>
+    <tag>5.2.0.REL</tag>
   </scm>
   <developers>
     <developer>
@@ -50,6 +50,18 @@
       </roles>
       <timezone>America/New_York</timezone>
     </developer>
+    <developer>
+      <id>rotty3000</id>
+      <name>Ray Augé</name>
+      <email>raymond.auge@liferay.com</email>
+      <url>https://rotty3000.github.io</url>
+      <organization>Liferay Inc.</organization>
+      <organizationUrl>https://www.liferay.com</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>America/New_York</timezone>
+    </developer>
   </developers>
   <dependencies>
     <dependency>

aqute-bnd.spec

@@ -17,7 +17,7 @@
 
 
 Name:           aqute-bnd
-Version:        5.1.1
+Version:        5.2.0
 Release:        0
 Summary:        BND Tool
 # Part of jpm is under BSD, but jpm is not included in binary RPM
@@ -26,13 +26,13 @@ Group:          Development/Libraries/Java
 URL:            https://bnd.bndtools.org/
 Source0:        https://github.com/bndtools/bnd/archive/%{version}.REL.tar.gz
 Source1:        bnd-%{version}.REL-build_xml.tar.xz
+Source2:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.ant/%{version}/biz.aQute.bnd.ant-%{version}.pom
 Source3:        https://repo1.maven.org/maven2/biz/aQute/bnd/aQute.libg/%{version}/aQute.libg-%{version}.pom
 Source4:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd/%{version}/biz.aQute.bnd-%{version}.pom
 Source5:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/%{version}/biz.aQute.bndlib-%{version}.pom
 Source6:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/%{version}/biz.aQute.bnd.annotation-%{version}.pom
 Source7:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.exporters/%{version}/biz.aQute.bnd.exporters-%{version}.pom
 Patch0:         0001-Disable-removed-commands.patch
-Patch1:         0002-Fix-ant-compatibility.patch
 Patch2:         0003-Port-to-OSGI-7.0.0.patch
 Patch3:         aqute-bnd-java8compat.patch
 Patch4:         0004-maven-plugin-dependencies.patch
@@ -95,7 +95,6 @@ build-jar-repository -s lib \
   slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium ant jline
 
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -148,7 +147,7 @@ cp -p %{SOURCE4} pom.xml
 %pom_add_dep biz.aQute.bnd:biz.aQute.bndlib:%{version}
 %pom_add_dep biz.aQute.bnd:aQute.libg:%{version}
 %pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version}
-%pom_add_dep org.apache.ant:ant
+%pom_add_dep biz.aQute.bnd:biz.aQute.bnd.ant:%{version}
 %pom_add_dep org.osgi:osgi.annotation
 %pom_add_dep org.osgi:osgi.core
 %pom_add_dep org.osgi:osgi.cmpn
@@ -156,6 +155,13 @@ cp -p %{SOURCE4} pom.xml
 %pom_add_dep org.slf4j:slf4j-simple::runtime
 popd
 
+# bndlib.ant
+pushd biz.aQute.bnd.ant
+cp -p %{SOURCE2} pom.xml
+%pom_remove_dep :::provided::
+%pom_add_dep org.osgi:osgi.annotation
+popd
+
 # maven-plugins
 pushd maven
 #rm bnd-shared-maven-lib/src/main/java/aQute/bnd/maven/lib/resolve/DependencyResolver.java
@@ -185,6 +191,7 @@ install -pm 0644 biz.aQute.bnd.annotation/target/biz.aQute.bnd.annotation-%{vers
 install -pm 0644 aQute.libg/target/aQute.libg-%{version}.jar %{buildroot}%{_javadir}/%{name}/aQute.libg.jar
 install -pm 0644 biz.aQute.bndlib/target/biz.aQute.bndlib-%{version}.jar %{buildroot}%{_javadir}/%{name}/biz.aQute.bndlib.jar
 install -pm 0644 biz.aQute.bnd/target/biz.aQute.bnd-%{version}.jar %{buildroot}%{_javadir}/%{name}/biz.aQute.bnd.jar
+install -pm 0644 biz.aQute.bnd.ant/target/biz.aQute.bnd.ant-%{version}.jar %{buildroot}%{_javadir}/%{name}/biz.aQute.bnd.ant.jar
 # poms
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
 install -pm 0644 biz.aQute.bnd.exporters/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/biz.aQute.bnd.exporters.pom
@@ -197,6 +204,8 @@ install -pm 0644 biz.aQute.bndlib/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/bi
 %add_maven_depmap %{name}/biz.aQute.bndlib.pom %{name}/biz.aQute.bndlib.jar -f bndlib -a biz.aQute.bnd:bndlib,biz.aQute:bndlib
 install -pm 0644 biz.aQute.bnd/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/biz.aQute.bnd.pom
 %add_maven_depmap %{name}/biz.aQute.bnd.pom %{name}/biz.aQute.bnd.jar -a biz.aQute.bnd:bnd,biz.aQute:bnd
+install -pm 0644 biz.aQute.bnd.ant/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/biz.aQute.bnd.ant.pom
+%add_maven_depmap %{name}/biz.aQute.bnd.ant.pom %{name}/biz.aQute.bnd.ant.jar
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 mv biz.aQute.bnd.exporters/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/biz.aQute.bnd.exporters
@@ -204,6 +213,7 @@ mv biz.aQute.bnd.annotation/target/site/apidocs %{buildroot}%{_javadocdir}/%{nam
 mv aQute.libg/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/aQute.libg
 mv biz.aQute.bndlib/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/biz.aQute.bndlib
 mv biz.aQute.bnd/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/biz.aQute.bnd
+mv biz.aQute.bnd.ant/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/biz.aQute.bnd.ant
 %fdupes -s %{buildroot}%{_javadocdir}
 
 install -d -m 755 %{buildroot}%{_sysconfdir}/ant.d

biz.aQute.bnd-5.2.0.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>biz.aQute.bnd</groupId>
   <artifactId>biz.aQute.bnd</artifactId>
-  <version>5.1.1</version>
+  <version>5.2.0</version>
   <description>This command line utility is the Swiss army knife of OSGi. It provides you with a breadth of tools to understand and manage OSGi based systems. This project basically uses bndlib.</description>
   <name>biz.aQute.bnd</name>
   <url>https://bnd.bndtools.org/</url>
@@ -23,7 +23,7 @@
     <url>https://github.com/bndtools/bnd</url>
     <connection>scm:git:https://github.com/bndtools/bnd.git</connection>
     <developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
-    <tag>5.1.1.REL</tag>
+    <tag>5.2.0.REL</tag>
   </scm>
   <developers>
     <developer>
@@ -50,6 +50,18 @@
       </roles>
       <timezone>America/New_York</timezone>
     </developer>
+    <developer>
+      <id>rotty3000</id>
+      <name>Ray Augé</name>
+      <email>raymond.auge@liferay.com</email>
+      <url>https://rotty3000.github.io</url>
+      <organization>Liferay Inc.</organization>
+      <organizationUrl>https://www.liferay.com</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>America/New_York</timezone>
+    </developer>
   </developers>
   <dependencies>
     <dependency>
@@ -73,43 +85,43 @@
     <dependency>
       <groupId>biz.aQute.bnd</groupId>
       <artifactId>biz.aQute.bndlib</artifactId>
-      <version>5.1.1</version>
+      <version>5.2.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>biz.aQute.bnd</groupId>
+      <artifactId>biz.aQute.bnd.ant</artifactId>
+      <version>5.2.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>biz.aQute.bnd</groupId>
       <artifactId>biz.aQute.resolve</artifactId>
-      <version>5.1.1</version>
+      <version>5.2.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>biz.aQute.bnd</groupId>
       <artifactId>biz.aQute.repository</artifactId>
-      <version>5.1.1</version>
+      <version>5.2.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>biz.aQute.bnd</groupId>
       <artifactId>biz.aQute.bnd.exporters</artifactId>
-      <version>5.1.1</version>
+      <version>5.2.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>biz.aQute.bnd</groupId>
       <artifactId>biz.aQute.bnd.reporter</artifactId>
-      <version>5.1.1</version>
+      <version>5.2.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ant</groupId>
-      <artifactId>ant</artifactId>
-      <version>1.7.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>biz.aQute.bnd</groupId>
       <artifactId>biz.aQute.remote.api</artifactId>
-      <version>5.1.1</version>
+      <version>5.2.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

biz.aQute.bnd.annotation-5.2.0.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>biz.aQute.bnd</groupId>
   <artifactId>biz.aQute.bnd.annotation</artifactId>
-  <version>5.1.1</version>
+  <version>5.2.0</version>
   <description>bnd Annotations Library</description>
   <name>biz.aQute.bnd.annotation</name>
   <url>https://bnd.bndtools.org/</url>
@@ -23,7 +23,7 @@
     <url>https://github.com/bndtools/bnd</url>
     <connection>scm:git:https://github.com/bndtools/bnd.git</connection>
     <developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
-    <tag>5.1.1.REL</tag>
+    <tag>5.2.0.REL</tag>
   </scm>
   <developers>
     <developer>
@@ -50,6 +50,18 @@
       </roles>
       <timezone>America/New_York</timezone>
     </developer>
+    <developer>
+      <id>rotty3000</id>
+      <name>Ray Augé</name>
+      <email>raymond.auge@liferay.com</email>
+      <url>https://rotty3000.github.io</url>
+      <organization>Liferay Inc.</organization>
+      <organizationUrl>https://www.liferay.com</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>America/New_York</timezone>
+    </developer>
   </developers>
   <dependencies>
     <dependency>

biz.aQute.bnd.ant-5.2.0.pom

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>biz.aQute.bnd</groupId>
+  <artifactId>biz.aQute.bnd.ant</artifactId>
+  <version>5.2.0</version>
+  <description>Bnd Ant Tasks</description>
+  <name>biz.aQute.bnd.ant</name>
+  <url>https://bnd.bndtools.org/</url>
+  <organization>
+    <name>Bndtools</name>
+    <url>https://bndtools.org/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>(Apache-2.0 OR EPL-2.0)</name>
+      <url>https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0</url>
+      <distribution>repo</distribution>
+      <comments>This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0, or the Eclipse Public License 2.0.</comments>
+    </license>
+  </licenses>
+  <scm>
+    <url>https://github.com/bndtools/bnd</url>
+    <connection>scm:git:https://github.com/bndtools/bnd.git</connection>
+    <developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
+    <tag>5.2.0.REL</tag>
+  </scm>
+  <developers>
+    <developer>
+      <id>pkriens</id>
+      <email>Peter.Kriens@aQute.biz</email>
+      <name>Peter Kriens</name>
+      <organization>Bndtools</organization>
+      <organizationUrl>https://github.com/bndtools</organizationUrl>
+      <roles>
+        <role>architect</role>
+        <role>developer</role>
+      </roles>
+      <timezone>1</timezone>
+    </developer>
+    <developer>
+      <id>bjhargrave</id>
+      <name>BJ Hargrave</name>
+      <email>bj@bjhargrave.com</email>
+      <url>https://github.com/bjhargrave</url>
+      <organization>IBM</organization>
+      <organizationUrl>https://developer.ibm.com</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>America/New_York</timezone>
+    </developer>
+    <developer>
+      <id>rotty3000</id>
+      <name>Ray Augé</name>
+      <email>raymond.auge@liferay.com</email>
+      <url>https://rotty3000.github.io</url>
+      <organization>Liferay Inc.</organization>
+      <organizationUrl>https://www.liferay.com</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>America/New_York</timezone>
+    </developer>
+  </developers>
+  <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>osgi.annotation</artifactId>
+      <version>7.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>biz.aQute.bnd</groupId>
+      <artifactId>biz.aQute.bndlib</artifactId>
+      <version>5.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.25</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.10.8</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>

biz.aQute.bnd.exporters-5.2.0.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>biz.aQute.bnd</groupId>
   <artifactId>biz.aQute.bnd.exporters</artifactId>
-  <version>5.1.1</version>
+  <version>5.2.0</version>
   <description>biz.aQute.bnd.exporters</description>
   <name>biz.aQute.bnd.exporters</name>
   <url>https://bnd.bndtools.org/</url>
@@ -23,7 +23,7 @@
     <url>https://github.com/bndtools/bnd</url>
     <connection>scm:git:https://github.com/bndtools/bnd.git</connection>
     <developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
-    <tag>5.1.1.REL</tag>
+    <tag>5.2.0.REL</tag>
   </scm>
   <developers>
     <developer>
@@ -50,6 +50,18 @@
       </roles>
       <timezone>America/New_York</timezone>
     </developer>
+    <developer>
+      <id>rotty3000</id>
+      <name>Ray Augé</name>
+      <email>raymond.auge@liferay.com</email>
+      <url>https://rotty3000.github.io</url>
+      <organization>Liferay Inc.</organization>
+      <organizationUrl>https://www.liferay.com</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>America/New_York</timezone>
+    </developer>
   </developers>
   <dependencies>
     <dependency>
@@ -67,7 +79,7 @@
     <dependency>
       <groupId>biz.aQute.bnd</groupId>
       <artifactId>biz.aQute.bndlib</artifactId>
-      <version>5.1.1</version>
+      <version>5.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

biz.aQute.bndlib-5.2.0.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>biz.aQute.bnd</groupId>
   <artifactId>biz.aQute.bndlib</artifactId>
-  <version>5.1.1</version>
+  <version>5.2.0</version>
   <description>bndlib: A Swiss Army Knife for OSGi</description>
   <name>biz.aQute.bndlib</name>
   <url>https://bnd.bndtools.org/</url>
@@ -23,7 +23,7 @@
     <url>https://github.com/bndtools/bnd</url>
     <connection>scm:git:https://github.com/bndtools/bnd.git</connection>
     <developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
-    <tag>5.1.1.REL</tag>
+    <tag>5.2.0.REL</tag>
   </scm>
   <developers>
     <developer>
@@ -50,6 +50,18 @@
       </roles>
       <timezone>America/New_York</timezone>
     </developer>
+    <developer>
+      <id>rotty3000</id>
+      <name>Ray Augé</name>
+      <email>raymond.auge@liferay.com</email>
+      <url>https://rotty3000.github.io</url>
+      <organization>Liferay Inc.</organization>
+      <organizationUrl>https://www.liferay.com</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>America/New_York</timezone>
+    </developer>
   </developers>
   <dependencies>
     <dependency>

bnd-5.1.1.REL-build_xml.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:463d299c107233f71344b51f52a8eb1329a763dfd0ca834ea14872b77006a69f
-size 2028

bnd-5.2.0.REL-build_xml.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a0a00d5def0906575b207d0961ba7df9332a6ab3b9dc24dc73219a81e27dac0
+size 2332

bnd-maven-plugin.spec

@@ -17,7 +17,7 @@
 
 
 Name:           bnd-maven-plugin
-Version:        5.1.1
+Version:        5.2.0
 Release:        0
 Summary:        BND Maven plugin
 # Part of jpm is under BSD, but jpm is not included in binary RPM
@@ -26,7 +26,6 @@ Group:          Development/Libraries/Java
 URL:            https://bnd.bndtools.org/
 Source0:        https://github.com/bndtools/bnd/archive/%{version}.REL.tar.gz
 Patch0:         0001-Disable-removed-commands.patch
-Patch1:         0002-Fix-ant-compatibility.patch
 Patch2:         0003-Port-to-OSGI-7.0.0.patch
 Patch3:         aqute-bnd-java8compat.patch
 Patch4:         0004-maven-plugin-dependencies.patch
@@ -60,7 +59,6 @@ API documentation for %{name}.
 %setup -q -n bnd-%{version}.REL
 
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1