rpms/aqute-bnd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 4.3.0

Browse Source
This commit is contained in:
Marian Koncek 2019-10-23 08:35:23 +02:00
parent d9820b39e6
commit 207821d52e
4 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -28,3 +28,8 @@
/biz.aQute.bnd-4.2.0.pom
/biz.aQute.bndlib-4.2.0.pom
/biz.aQute.bnd.annotation-4.2.0.pom
/4.3.0.REL.tar.gz
/aQute.libg-4.3.0.pom
/biz.aQute.bnd-4.3.0.pom
/biz.aQute.bndlib-4.3.0.pom
/biz.aQute.bnd.annotation-4.3.0.pom

21
0001-Disable-removed-commands.patch
View File

@ -4,14 +4,14 @@ Date: Tue, 4 Oct 2016 18:02:26 +0200
Subject: [PATCH 1/2] Disable removed commands
---
biz.aQute.bnd/src/aQute/bnd/main/bnd.java | 49 -----------------------
1 file changed, 49 deletions(-)
biz.aQute.bnd/src/aQute/bnd/main/bnd.java | 48 -----------------------
1 file changed, 48 deletions(-)
diff --git a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
index 0e6f055..166687b 100644
index 3f21168..d6c9ccd 100644
--- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
+++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
@@ -108,7 +108,6 @@ import aQute.bnd.osgi.Processor;
@@ -110,7 +110,6 @@ import aQute.bnd.osgi.Processor;
import aQute.bnd.osgi.Resource;
import aQute.bnd.osgi.Verifier;
import aQute.bnd.osgi.eclipse.EclipseClasspath;
@ -19,13 +19,13 @@ index 0e6f055..166687b 100644
import aQute.bnd.service.Actionable;
import aQute.bnd.service.RepositoryPlugin;
import aQute.bnd.service.action.Action;
@@ -4225,54 +4224,6 @@ public class bnd extends Processor {
@@ -4213,53 +4212,6 @@ public class bnd extends Processor {
getInfo(profiles);
}
- /**
- * Resolve command
- *
- *
- * @throws Exception
- */
-
@ -41,7 +41,7 @@ index 0e6f055..166687b 100644
-
- /**
- * Remote command
- *
- *
- * @throws Exception
- */
-
@ -57,7 +57,7 @@ index 0e6f055..166687b 100644
-
- /**
- * Nexus commands
- *
- *
- * @throws Exception
- */
-
@ -70,10 +70,9 @@ index 0e6f055..166687b 100644
- getInfo(rc);
- rc.close();
- }
-
/**
* Export a bndrun file
*/
--
2.20.1
2.21.0

15
aqute-bnd.spec
View File

@ -1,5 +1,5 @@
Name: aqute-bnd
Version: 4.2.0
Version: 4.3.0
Release: 1%{?dist}
Summary: BND Tool
# Part of jpm is under BSD, but jpm is not included in binary RPM
@ -99,14 +99,16 @@ cp -p %{SOURCE3} pom.xml
%pom_add_parent biz.aQute.bnd:parent:%{version}
%pom_remove_dep :org.osgi.util.function
%pom_remove_dep :org.osgi.util.promise
%pom_add_dep org.osgi:osgi.core
%pom_add_dep org.osgi:osgi.cmpn
%pom_add_dep org.slf4j:slf4j-api
popd
# bndlib.annotations
pushd biz.aQute.bnd.annotation
cp -p %{SOURCE6} pom.xml
%pom_add_parent biz.aQute.bnd:parent:%{version}
%pom_add_dep org.osgi:osgi.core
%pom_add_dep org.osgi:osgi.cmpn
popd
# bndlib
@ -115,10 +117,8 @@ cp -p %{SOURCE5} pom.xml
%pom_add_parent biz.aQute.bnd:parent:%{version}
%pom_remove_dep :org.osgi.util.function
%pom_remove_dep :org.osgi.util.promise
%pom_add_dep org.osgi:osgi.annotation
%pom_add_dep org.osgi:osgi.core
%pom_add_dep org.osgi:osgi.cmpn
%pom_add_dep org.slf4j:slf4j-api
%pom_add_dep biz.aQute.bnd:aQute.libg:%{version}
%pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version}
popd
@ -132,7 +132,6 @@ cp -p %{SOURCE4} pom.xml
%pom_remove_dep :biz.aQute.bnd.exporters
%pom_remove_dep :biz.aQute.bnd.reporter
%pom_remove_dep :biz.aQute.remote.api
%pom_remove_dep :biz.aQute.launchpad
%pom_remove_dep :snakeyaml
popd
@ -144,9 +143,10 @@ pushd maven
%pom_disable_module bnd-indexer-maven-plugin
# Requires unbuilt parts of bnd
%pom_disable_module bnd-export-maven-plugin
%pom_disable_module bnd-reporter-maven-plugin
%pom_disable_module bnd-resolver-maven-plugin
%pom_disable_module bnd-testing-maven-plugin
%pom_disable_module bnd-run-maven-plugin
%pom_disable_module bnd-testing-maven-plugin
# Integration tests require Internet access
%pom_remove_plugin -r :maven-invoker-plugin
%pom_remove_plugin -r :maven-javadoc-plugin
@ -190,6 +190,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
%license LICENSE
%changelog
* Wed Oct 09 2019 Marian Koncek <mkoncek@redhat.com> - 4.3.0-1
- Update to upstream version 4.3.0
* Thu Jul 04 2019 Marian Koncek <mkoncek@redhat.com> - 4.2.0-1
- Update to upstream version 4.2.0

10
sources
View File

@ -1,5 +1,5 @@
SHA512 (4.2.0.REL.tar.gz) = 3fc4cf6340708d7594348a06678b11782392f14e785b1097255d4af005ab9bd24d71d61bda9644aba3cfba2002cb220cb356e2b2e686deb0cbefecc5dcd03a40
SHA512 (aQute.libg-4.2.0.pom) = 97d141b37631987f537f9c01c86cb66514e715af335765e956e7a99633cd3f473ce75a9152b6bc21fb3e7bc33bde1ec3b77ce814f9df8d1f0f542e8fe37e723a
SHA512 (biz.aQute.bnd-4.2.0.pom) = cf65171a1562648f4b376d21db73b1685b7acaa56a8912245e982f202e05a9e0f9cb47dae5b1ac950c5441596bf52883f171fbf515a4cb040bdef44f74b795ed
SHA512 (biz.aQute.bndlib-4.2.0.pom) = 2dcf0e61232ca5d3450b11a701c1462a42e4292a0905134be9507c1cace123d47148d12a420c71c21a0942367cc6e3e1f06a701c061acab26151c8c0fdda0599
SHA512 (biz.aQute.bnd.annotation-4.2.0.pom) = 075a3d63d08e5c9076090e79c35ae9aaef2ccd121b5ace35f28d46f11242894c8059258c2d6764691d16ccfe17cf2b2038132cd670e758d501732d34a592df17
SHA512 (4.3.0.REL.tar.gz) = 0bae90a388fb52b9af88457b2a9b78530958be72567d66a0369c534df1aad7f2e7dae13e97a7153f847283b8fc31b1f76ef00c88944076a35e64b9e596925fec
SHA512 (aQute.libg-4.3.0.pom) = a60d7d41a3eae51827e30a683b078087dde2d7f1dca79a4acccee1e25df84f7498a3be01eea69bc06eba355f3df490452dd8edbac469c294b34327dd46802c9e
SHA512 (biz.aQute.bnd-4.3.0.pom) = e9b4f64359965c1b7799e545212f269fa5ced54d28160079e111529609b22e45eb9f0f0853e7270734cb2d468cbd4127601dcfe523d53ec2ba7c6af8f50f5346
SHA512 (biz.aQute.bndlib-4.3.0.pom) = d74384a5d3f590d10a29b47734365eae1cdcf566bbab5a193db9b31fd64133091a2fe836e035f2add6c21b12a537bd3618c03d3b3e5412ccf8ff7765097a2df7
SHA512 (biz.aQute.bnd.annotation-4.3.0.pom) = ef578cea5b1773e307f168ef27d91344f6f7d7ac874ff841e1831ff12ec741a568777931a29528a55812afed737af893740b8d812de4c72d8d9e07c027b56cd6