From dd7b38649b6f5bb4d75db6abab78e7c4502e1272 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 3 May 2022 16:25:20 +0200 Subject: [PATCH] Update to upstream version 6.2.0 --- .gitignore | 1 + 0001-Disable-removed-commands.patch | 29 +++++++++++++++-------------- aqute-bnd.spec | 23 +++++++++++++++++++++-- generate-tarball.sh | 5 +++-- parent.pom | 1 + sources | 13 +++++++------ 6 files changed, 48 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 0674e27..3496aad 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /biz.aQute.bnd-5.2.0.pom /biz.aQute.bnd.annotation-5.2.0.pom /biz.aQute.bndlib-5.2.0.pom +/aqute-bnd-6.2.0.tar.gz diff --git a/0001-Disable-removed-commands.patch b/0001-Disable-removed-commands.patch index 6e4a338..984745b 100644 --- a/0001-Disable-removed-commands.patch +++ b/0001-Disable-removed-commands.patch @@ -1,18 +1,20 @@ -diff -ur aqute-bnd-5.2.0.orig/biz.aQute.bnd/src/aQute/bnd/main/bnd.java aqute-bnd-5.2.0/biz.aQute.bnd/src/aQute/bnd/main/bnd.java ---- aqute-bnd-5.2.0.orig/biz.aQute.bnd/src/aQute/bnd/main/bnd.java 2020-10-14 22:03:53.000000000 +0200 -+++ aqute-bnd-5.2.0/biz.aQute.bnd/src/aQute/bnd/main/bnd.java 2021-08-02 18:01:59.894715497 +0200 -@@ -106,7 +106,6 @@ +diff --git a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java +index a787c32..fc241a2 100644 +--- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java ++++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java +@@ -110,7 +110,6 @@ import aQute.bnd.osgi.Resource; import aQute.bnd.osgi.Verifier; import aQute.bnd.osgi.eclipse.EclipseClasspath; import aQute.bnd.print.JarPrinter; -import aQute.bnd.repository.maven.provider.NexusCommand; + import aQute.bnd.result.Result; import aQute.bnd.service.Actionable; import aQute.bnd.service.RepositoryPlugin; - import aQute.bnd.service.action.Action; -@@ -3922,54 +3921,6 @@ +@@ -3921,54 +3920,6 @@ public class bnd extends Processor { + getInfo(profiles); } - /** +- /** - * Resolve command - * - * @throws Exception @@ -60,11 +62,10 @@ diff -ur aqute-bnd-5.2.0.orig/biz.aQute.bnd/src/aQute/bnd/main/bnd.java aqute-bn - rc.close(); - } - -- /** + /** * Export a bndrun file */ - interface ExportOptions extends ProjectWorkspaceOptions { -@@ -4424,15 +4375,6 @@ +@@ -4424,15 +4375,6 @@ public class bnd extends Processor { } } @@ -80,7 +81,7 @@ diff -ur aqute-bnd-5.2.0.orig/biz.aQute.bnd/src/aQute/bnd/main/bnd.java aqute-bn public Workspace getWorkspace() { return workspace; } -@@ -4479,24 +4421,6 @@ +@@ -4479,24 +4421,6 @@ public class bnd extends Processor { } @@ -102,6 +103,6 @@ diff -ur aqute-bnd-5.2.0.orig/biz.aQute.bnd/src/aQute/bnd/main/bnd.java aqute-bn - getInfo(c); - } - - @Description("Generate source code") - interface GenerateOptions extends ProjectWorkspaceOptions { - + @Description("Shows the differences between two XML resource repositories") + public void _xmlrepodiff(XmlRepoDiffOptions options) throws Exception { + try (XmlRepoDiffCommand cmd = new XmlRepoDiffCommand(this)) { diff --git a/aqute-bnd.spec b/aqute-bnd.spec index afe65ca..a57fa8c 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -7,8 +7,8 @@ %endif Name: aqute-bnd -Version: 5.2.0 -Release: 9%{?dist} +Version: 6.2.0 +Release: 1%{?dist} Summary: BND Tool # Part of jpm is under BSD, but jpm is not included in binary RPM License: ASL 2.0 or EPL-2.0 @@ -27,6 +27,7 @@ Source4: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd/%{ver 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.ant/%{version}/biz.aQute.bnd.ant-%{version}.pom +Source8: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.util/%{version}/biz.aQute.bnd.util-%{version}.pom Patch1: 0001-Disable-removed-commands.patch Patch2: 0002-Port-to-OSGI-7.0.0.patch @@ -36,6 +37,8 @@ BuildRequires: maven-local BuildRequires: javapackages-bootstrap %else BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) +BuildRequires: mvn(org.junit:junit-bom:pom:) BuildRequires: mvn(org.osgi:osgi.annotation) BuildRequires: mvn(org.osgi:osgi.cmpn) BuildRequires: mvn(org.osgi:osgi.core) @@ -150,8 +153,19 @@ cp -p %{SOURCE4} pom.xml %pom_remove_dep :biz.aQute.remote.api %pom_remove_dep :snakeyaml %pom_remove_dep :jline +%pom_remove_dep org.osgi:org.osgi.service.coordinator +%pom_remove_dep org.osgi:org.osgi.service.resolver popd +# bnd.util +pushd biz.aQute.bnd.util +cp -p %{SOURCE8} pom.xml +%pom_add_parent biz.aQute.bnd:parent:%{version} +%pom_add_dep biz.aQute.bnd:aQute.libg:%{version} +popd + +%pom_remove_dep -r org.osgi:org.osgi.dto +%pom_remove_dep -r org.osgi:org.osgi.framework %pom_remove_dep -r org.osgi:org.osgi.namespace.contract %pom_remove_dep -r org.osgi:org.osgi.namespace.extender %pom_remove_dep -r org.osgi:org.osgi.namespace.implementation @@ -162,11 +176,13 @@ popd %pom_remove_dep -r org.osgi:org.osgi.service.serviceloader %pom_remove_dep -r org.osgi:org.osgi.util.function %pom_remove_dep -r org.osgi:org.osgi.util.promise +%pom_remove_dep -r org.osgi:org.osgi.util.tracker %pom_xpath_remove -r pom:project/pom:dependencies/pom:dependency/pom:scope # maven-plugins cp -r biz.aQute.bnd.maven/src/aQute/bnd/maven/lib/configuration maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib +cp -r biz.aQute.bnd.maven/src/aQute/bnd/maven/lib/executions maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib pushd maven %pom_remove_dep -r :biz.aQute.bnd.maven # Unavailable reactor dependency - org.osgi.impl.bundle.repoindex.cli @@ -224,6 +240,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium %license LICENSE %changelog +* Tue May 03 2022 Marian Koncek - 6.2.0-1 +- Update to upstream version 6.2.0 + * Sat Feb 05 2022 Jiri Vanek - 5.2.0-9 - Rebuilt for java-17-openjdk as system jdk diff --git a/generate-tarball.sh b/generate-tarball.sh index 13e2cb8..f82f710 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -5,16 +5,17 @@ name=aqute-bnd version="$(sed -n 's/Version:\s*//p' *.spec)" # RETRIEVE -wget "https://github.com/bndtools/bnd/archive/${version}.REL.tar.gz" -O "${name}-${version}.orig.tar.gz" +wget "https://github.com/bndtools/bnd/archive/${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" rm -rf tarball-tmp mkdir tarball-tmp pushd tarball-tmp tar -xf "../${name}-${version}.orig.tar.gz" -mv "bnd-${version}.REL" "${name}-${version}" +mv "bnd-${version}" "${name}-${version}" # CLEAN TARBALL rm -rf "${name}-${version}/docs" +rm -rf '.github' find -name '*.jar' -delete find -name '*.class' -delete find -name '*.ar' -delete diff --git a/parent.pom b/parent.pom index db6a464..6ff61a6 100644 --- a/parent.pom +++ b/parent.pom @@ -169,6 +169,7 @@ biz.aQute.bnd biz.aQute.bnd.annotation biz.aQute.bnd.ant + biz.aQute.bnd.util maven diff --git a/sources b/sources index 6d90adb..db42e51 100644 --- a/sources +++ b/sources @@ -1,6 +1,7 @@ -SHA512 (aqute-bnd-5.2.0.tar.gz) = 4001b991b80746140c26aa4862e43aed82685344343a07b41aca9e7466d1bc180eec4724c1eef8186c7fdf69dedd6817cc30a790807ce8344958e2ea0633d015 -SHA512 (aQute.libg-5.2.0.pom) = 700b698895c39f39422e66532fee626aace0656867361b7e41438a168f2725ae25c5f67e6fd1dfdcff228ec4e6a6530cc76dc1b1f40aa797ef90bb891f3e4f86 -SHA512 (biz.aQute.bnd-5.2.0.pom) = b8cebc4fa358debf2296e24b2cde2f401765a628022f0972517dbaecc78558aadcddbfc3cc1c8e1c0332008864d14e76863d46f51aacb1a6a530b2577ebdc587 -SHA512 (biz.aQute.bnd.annotation-5.2.0.pom) = ef10eea989b339e4166087b2baf2fb4b49693d9933498f8299356b5a40a5a155d6c725a298eb0c93cdfe9633acc147047d341f84b0a9a3e5b094827168d179a1 -SHA512 (biz.aQute.bndlib-5.2.0.pom) = 4055bc35223f7c90e933ce7e694bb436743b0d138a9d21cde3ba87579e7d8be2614edbddc21c0447dba911e6ddd8a607a86ec08eb09c120653846dcb9b667462 -SHA512 (biz.aQute.bnd.ant-5.2.0.pom) = 9cb605216507fee1db70c78235c1f9a254bc4350bfa4f1a2d00826b807b9e0cb9626a690325c1bfcc8b7032875e9820edca6b80ab41078f8fb3cb52bca139baf +SHA512 (aqute-bnd-6.2.0.tar.gz) = 4d475b98c51e538ea5dfc362012b98d3f0207cf954b5046bb2072455831a92ee98e7fd27f990ac9ff3eb0f7d9cd2e2227a830a9afc4cb19e409a96a5f56ad2af +SHA512 (aQute.libg-6.2.0.pom) = d7237813eba88e3497e19b3672f7371fcf0f80c80999b0339b173273e7e84a03438b83700b399deaf0422d3cb3ab447e0a2fef38a44224967ab9263f90faf782 +SHA512 (biz.aQute.bnd-6.2.0.pom) = e17460422144a86741401e8c1eb238590271f4f6141f03b73c904098336b36830c8003e2abea1fc025f04006ff82866581f66951e1a0d271835dc423fe655721 +SHA512 (biz.aQute.bnd.annotation-6.2.0.pom) = 8fa670018b656f020987b1f0187b13313dcda7f35310a1a7419d0a1737a3de37d74b50560ee138bf4412cad4cd1fd97557d61f5625df811c5621c6b631050e82 +SHA512 (biz.aQute.bnd.ant-6.2.0.pom) = 54926d8dfd4977ab105b4f0cc077a88ecda8aa46ab3f8b26198947600075bcff51719f1f03f2980a546140694a8bd5c9c9aa2eb203f1453d62c2f02cc3a32d98 +SHA512 (biz.aQute.bnd.util-6.2.0.pom) = 5fcdf1f863565187dc55ed821893a0cdb05fc061ff0eccecdd717ea28ee20804bf7640f48ac057a326d5924101bb0f149c9a3673deb396feca626f81b5656a80 +SHA512 (biz.aQute.bndlib-6.2.0.pom) = 06d2863c7bec5b420d1660122cf33b9ca5d6e25683e3e6bd25ea579155ece3c3d309b183588918dc8541169813d8a59155036c0a3d177dd19e35fb4fde4ffaa8