diff --git a/0002-Fix-ant-compatibility.patch b/0002-Fix-ant-compatibility.patch deleted file mode 100644 index 48bd881..0000000 --- a/0002-Fix-ant-compatibility.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bb26bdfa9f742a6ae5d39e0312aeadb8e9b48940 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -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 antProps = getProject().getProperties(); -+ Hashtable antProps = getProject().getProperties(); - projectProperties.putAll(antProps); - projectProperties.putAll(builder.getProperties()); - builder.setProperties(projectProperties); --- -2.20.1 - diff --git a/5.1.1.REL.tar.gz b/5.1.1.REL.tar.gz deleted file mode 100644 index 6a5e179..0000000 --- a/5.1.1.REL.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:859b702bd16a1424fd399693398ba49f6e0966333f5ff809b6bd02c0cabf1748 -size 125176106 diff --git a/5.2.0.REL.tar.gz b/5.2.0.REL.tar.gz new file mode 100644 index 0000000..58c74da --- /dev/null +++ b/5.2.0.REL.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91c39263b2b367d4f7f8ff1621c274bb56460d0689dc2f94c8a1f66fe777b5ac +size 127744515 diff --git a/aQute.libg-5.1.1.pom b/aQute.libg-5.2.0.pom similarity index 87% rename from aQute.libg-5.1.1.pom rename to aQute.libg-5.2.0.pom index e157aea..436f46e 100644 --- a/aQute.libg-5.1.1.pom +++ b/aQute.libg-5.2.0.pom @@ -3,7 +3,7 @@ 4.0.0 biz.aQute.bnd aQute.libg - 5.1.1 + 5.2.0 A library to be statically linked. Contains many small utilities. This bundle should not be installed in a framework, it is compile only. aQute.libg https://bnd.bndtools.org/ @@ -23,7 +23,7 @@ https://github.com/bndtools/bnd scm:git:https://github.com/bndtools/bnd.git scm:git:git@github.com:bndtools/bnd.git - 5.1.1.REL + 5.2.0.REL @@ -50,6 +50,18 @@ America/New_York + + rotty3000 + Ray Augé + raymond.auge@liferay.com + https://rotty3000.github.io + Liferay Inc. + https://www.liferay.com + + developer + + America/New_York + diff --git a/aqute-bnd.changes b/aqute-bnd.changes index 0d52c29..efbd1de 100644 --- a/aqute-bnd.changes +++ b/aqute-bnd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Nov 10 08:13:30 UTC 2021 - Fridrich Strba + +- Update to aqute-bnd 5.1.1 + * ant plugin is in separate artifact +- Removed patch: + * 0002-Fix-ant-compatibility.patch + + fixed by upstream + ------------------------------------------------------------------- Tue Oct 19 07:20:57 UTC 2021 - Fridrich Strba diff --git a/aqute-bnd.spec b/aqute-bnd.spec index 264eaaf..4b59d84 100644 --- a/aqute-bnd.spec +++ b/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 diff --git a/biz.aQute.bnd-5.1.1.pom b/biz.aQute.bnd-5.2.0.pom similarity index 85% rename from biz.aQute.bnd-5.1.1.pom rename to biz.aQute.bnd-5.2.0.pom index 07d8171..7be22f3 100644 --- a/biz.aQute.bnd-5.1.1.pom +++ b/biz.aQute.bnd-5.2.0.pom @@ -3,7 +3,7 @@ 4.0.0 biz.aQute.bnd biz.aQute.bnd - 5.1.1 + 5.2.0 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. biz.aQute.bnd https://bnd.bndtools.org/ @@ -23,7 +23,7 @@ https://github.com/bndtools/bnd scm:git:https://github.com/bndtools/bnd.git scm:git:git@github.com:bndtools/bnd.git - 5.1.1.REL + 5.2.0.REL @@ -50,6 +50,18 @@ America/New_York + + rotty3000 + Ray Augé + raymond.auge@liferay.com + https://rotty3000.github.io + Liferay Inc. + https://www.liferay.com + + developer + + America/New_York + @@ -73,43 +85,43 @@ biz.aQute.bnd biz.aQute.bndlib - 5.1.1 + 5.2.0 + provided + + + biz.aQute.bnd + biz.aQute.bnd.ant + 5.2.0 provided biz.aQute.bnd biz.aQute.resolve - 5.1.1 + 5.2.0 provided biz.aQute.bnd biz.aQute.repository - 5.1.1 + 5.2.0 provided biz.aQute.bnd biz.aQute.bnd.exporters - 5.1.1 + 5.2.0 provided biz.aQute.bnd biz.aQute.bnd.reporter - 5.1.1 - provided - - - org.apache.ant - ant - 1.7.1 + 5.2.0 provided biz.aQute.bnd biz.aQute.remote.api - 5.1.1 + 5.2.0 provided diff --git a/biz.aQute.bnd.annotation-5.1.1.pom b/biz.aQute.bnd.annotation-5.2.0.pom similarity index 86% rename from biz.aQute.bnd.annotation-5.1.1.pom rename to biz.aQute.bnd.annotation-5.2.0.pom index d2176db..a70c67b 100644 --- a/biz.aQute.bnd.annotation-5.1.1.pom +++ b/biz.aQute.bnd.annotation-5.2.0.pom @@ -3,7 +3,7 @@ 4.0.0 biz.aQute.bnd biz.aQute.bnd.annotation - 5.1.1 + 5.2.0 bnd Annotations Library biz.aQute.bnd.annotation https://bnd.bndtools.org/ @@ -23,7 +23,7 @@ https://github.com/bndtools/bnd scm:git:https://github.com/bndtools/bnd.git scm:git:git@github.com:bndtools/bnd.git - 5.1.1.REL + 5.2.0.REL @@ -50,6 +50,18 @@ America/New_York + + rotty3000 + Ray Augé + raymond.auge@liferay.com + https://rotty3000.github.io + Liferay Inc. + https://www.liferay.com + + developer + + America/New_York + diff --git a/biz.aQute.bnd.ant-5.2.0.pom b/biz.aQute.bnd.ant-5.2.0.pom new file mode 100644 index 0000000..8430b76 --- /dev/null +++ b/biz.aQute.bnd.ant-5.2.0.pom @@ -0,0 +1,92 @@ + + + 4.0.0 + biz.aQute.bnd + biz.aQute.bnd.ant + 5.2.0 + Bnd Ant Tasks + biz.aQute.bnd.ant + https://bnd.bndtools.org/ + + Bndtools + https://bndtools.org/ + + + + (Apache-2.0 OR EPL-2.0) + https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0 + repo + 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. + + + + https://github.com/bndtools/bnd + scm:git:https://github.com/bndtools/bnd.git + scm:git:git@github.com:bndtools/bnd.git + 5.2.0.REL + + + + pkriens + Peter.Kriens@aQute.biz + Peter Kriens + Bndtools + https://github.com/bndtools + + architect + developer + + 1 + + + bjhargrave + BJ Hargrave + bj@bjhargrave.com + https://github.com/bjhargrave + IBM + https://developer.ibm.com + + developer + + America/New_York + + + rotty3000 + Ray Augé + raymond.auge@liferay.com + https://rotty3000.github.io + Liferay Inc. + https://www.liferay.com + + developer + + America/New_York + + + + + org.osgi + osgi.annotation + 7.0.0 + provided + + + biz.aQute.bnd + biz.aQute.bndlib + 5.2.0 + compile + + + org.slf4j + slf4j-api + 1.7.25 + compile + + + org.apache.ant + ant + 1.10.8 + compile + + + diff --git a/biz.aQute.bnd.exporters-5.1.1.pom b/biz.aQute.bnd.exporters-5.2.0.pom similarity index 85% rename from biz.aQute.bnd.exporters-5.1.1.pom rename to biz.aQute.bnd.exporters-5.2.0.pom index 47bbaf7..aa28fe9 100644 --- a/biz.aQute.bnd.exporters-5.1.1.pom +++ b/biz.aQute.bnd.exporters-5.2.0.pom @@ -3,7 +3,7 @@ 4.0.0 biz.aQute.bnd biz.aQute.bnd.exporters - 5.1.1 + 5.2.0 biz.aQute.bnd.exporters biz.aQute.bnd.exporters https://bnd.bndtools.org/ @@ -23,7 +23,7 @@ https://github.com/bndtools/bnd scm:git:https://github.com/bndtools/bnd.git scm:git:git@github.com:bndtools/bnd.git - 5.1.1.REL + 5.2.0.REL @@ -50,6 +50,18 @@ America/New_York + + rotty3000 + Ray Augé + raymond.auge@liferay.com + https://rotty3000.github.io + Liferay Inc. + https://www.liferay.com + + developer + + America/New_York + @@ -67,7 +79,7 @@ biz.aQute.bnd biz.aQute.bndlib - 5.1.1 + 5.2.0 compile diff --git a/biz.aQute.bndlib-5.1.1.pom b/biz.aQute.bndlib-5.2.0.pom similarity index 90% rename from biz.aQute.bndlib-5.1.1.pom rename to biz.aQute.bndlib-5.2.0.pom index 9f4a280..16eee72 100644 --- a/biz.aQute.bndlib-5.1.1.pom +++ b/biz.aQute.bndlib-5.2.0.pom @@ -3,7 +3,7 @@ 4.0.0 biz.aQute.bnd biz.aQute.bndlib - 5.1.1 + 5.2.0 bndlib: A Swiss Army Knife for OSGi biz.aQute.bndlib https://bnd.bndtools.org/ @@ -23,7 +23,7 @@ https://github.com/bndtools/bnd scm:git:https://github.com/bndtools/bnd.git scm:git:git@github.com:bndtools/bnd.git - 5.1.1.REL + 5.2.0.REL @@ -50,6 +50,18 @@ America/New_York + + rotty3000 + Ray Augé + raymond.auge@liferay.com + https://rotty3000.github.io + Liferay Inc. + https://www.liferay.com + + developer + + America/New_York + diff --git a/bnd-5.1.1.REL-build_xml.tar.xz b/bnd-5.1.1.REL-build_xml.tar.xz deleted file mode 100644 index 9693f7c..0000000 --- a/bnd-5.1.1.REL-build_xml.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:463d299c107233f71344b51f52a8eb1329a763dfd0ca834ea14872b77006a69f -size 2028 diff --git a/bnd-5.2.0.REL-build_xml.tar.xz b/bnd-5.2.0.REL-build_xml.tar.xz new file mode 100644 index 0000000..5d4af10 --- /dev/null +++ b/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 diff --git a/bnd-maven-plugin.changes b/bnd-maven-plugin.changes index 621f151..841cf48 100644 --- a/bnd-maven-plugin.changes +++ b/bnd-maven-plugin.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Nov 10 08:13:30 UTC 2021 - Fridrich Strba + +- Update to aqute-bnd 5.1.1 + * ant plugin is in separate artifact +- Removed patch: + * 0002-Fix-ant-compatibility.patch + + fixed by upstream + ------------------------------------------------------------------- Tue Oct 19 07:20:57 UTC 2021 - Fridrich Strba diff --git a/bnd-maven-plugin.spec b/bnd-maven-plugin.spec index 3b41705..374a0bc 100644 --- a/bnd-maven-plugin.spec +++ b/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