diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 028aed4..b21555c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,25 @@ -SOURCES/3.5.0.REL.tar.gz +/aqute-service.tar.gz +/bnd-0.0.363.jar +/2.4.1.REL.tar.gz +/biz.aQute.bnd-2.4.1.pom +/biz.aQute.bndlib-2.4.1.pom +/3.2.0.REL.tar.gz +/aQute.libg-3.2.0.pom +/biz.aQute.bnd-3.2.0.pom +/biz.aQute.bndlib-3.2.0.pom +/biz.aQute.bnd.annotation-3.2.0.pom +/3.3.0.REL.tar.gz +/aQute.libg-3.3.0.pom +/biz.aQute.bnd-3.3.0.pom +/biz.aQute.bndlib-3.3.0.pom +/biz.aQute.bnd.annotation-3.3.0.pom +/3.4.0.REL.tar.gz +/aQute.libg-3.4.0.pom +/biz.aQute.bnd-3.4.0.pom +/biz.aQute.bndlib-3.4.0.pom +/biz.aQute.bnd.annotation-3.4.0.pom /3.5.0.REL.tar.gz +/aQute.libg-3.5.0.pom +/biz.aQute.bnd-3.5.0.pom +/biz.aQute.bndlib-3.5.0.pom +/biz.aQute.bnd.annotation-3.5.0.pom diff --git a/0002-Port-to-OSGI-7.0.0.patch b/0002-Port-to-OSGI-7.0.0.patch deleted file mode 100644 index c807cd1..0000000 --- a/0002-Port-to-OSGI-7.0.0.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 64a36cbc8d7c8234dfa2af8670c2e1ea4a5c3909 Mon Sep 17 00:00:00 2001 -From: Marian Koncek -Date: Thu, 11 Jul 2019 14:29:26 +0200 -Subject: [PATCH] Port to OSGI 7.0.0 - ---- - .../src/aQute/bnd/junit/ConsoleLogger.java | 62 +++++++++++++++++++ - 1 file changed, 62 insertions(+) - -diff --git a/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java b/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java -index 9c2591f..569b20e 100644 ---- a/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java -+++ b/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java -@@ -15,9 +15,11 @@ import org.osgi.framework.ServiceFactory; - import org.osgi.framework.ServiceReference; - import org.osgi.framework.ServiceRegistration; - import org.osgi.service.log.LogEntry; -+import org.osgi.service.log.LogLevel; - import org.osgi.service.log.LogListener; - import org.osgi.service.log.LogReaderService; - import org.osgi.service.log.LogService; -+import org.osgi.service.log.Logger; - - @Deprecated // see biz.aQute.bnd.remote.junit - public class ConsoleLogger implements LogReaderService { -@@ -76,6 +78,36 @@ public class ConsoleLogger implements LogReaderService { - return time; - } - -+ @Override -+ public LogLevel getLogLevel() { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ @Override -+ public String getLoggerName() { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ @Override -+ public long getSequence() { -+ // TODO Auto-generated method stub -+ return 0; -+ } -+ -+ @Override -+ public String getThreadInfo() { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ @Override -+ public StackTraceElement getLocation() { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ - } - - public class Facade implements LogService { -@@ -112,6 +144,36 @@ public class ConsoleLogger implements LogReaderService { - - } - -+ @Override -+ public Logger getLogger(String name) { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ @Override -+ public Logger getLogger(Class clazz) { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ @Override -+ public L getLogger(String name, Class loggerType) { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ @Override -+ public L getLogger(Class clazz, Class loggerType) { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ @Override -+ public L getLogger(Bundle bundle, String name, Class loggerType) { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ - } - - public ConsoleLogger(BundleContext context) { --- -2.20.1 - diff --git a/aQute.libg-3.5.0.pom b/aQute.libg-3.5.0.pom deleted file mode 100644 index 165b6b8..0000000 --- a/aQute.libg-3.5.0.pom +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - biz.aQute.bnd - aQute.libg - 3.5.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 - http://bnd.bndtools.org/ - - Bndtools - http://bndtools.org/ - - - - Apache-2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - Apache License, Version 2.0 - - - - https://github.com/bndtools/bnd - scm:git:https://github.com/bndtools/bnd.git - scm:git:git@github.com:bndtools/bnd.git - 3.5.0.REL - - - - pkriens - Peter.Kriens@aQute.biz - Peter Kriens - Bndtools - https://github.com/bndtools - - architect - developer - - 1 - - - diff --git a/biz.aQute.bnd-3.5.0.pom b/biz.aQute.bnd-3.5.0.pom deleted file mode 100644 index ff0a88d..0000000 --- a/biz.aQute.bnd-3.5.0.pom +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - biz.aQute.bnd - biz.aQute.bnd - 3.5.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 - http://bnd.bndtools.org/ - - Bndtools - http://bndtools.org/ - - - - Apache-2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - Apache License, Version 2.0 - - - - https://github.com/bndtools/bnd - scm:git:https://github.com/bndtools/bnd.git - scm:git:git@github.com:bndtools/bnd.git - 3.5.0.REL - - - - pkriens - Peter.Kriens@aQute.biz - Peter Kriens - Bndtools - https://github.com/bndtools - - architect - developer - - 1 - - - diff --git a/biz.aQute.bnd.annotation-3.5.0.pom b/biz.aQute.bnd.annotation-3.5.0.pom deleted file mode 100644 index ee70a29..0000000 --- a/biz.aQute.bnd.annotation-3.5.0.pom +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - biz.aQute.bnd - biz.aQute.bnd.annotation - 3.5.0 - Contains only the annotations for bnd. - bnd Annotations Library - http://www.aQute.biz/Code/Bnd - - Bndtools - http://bndtools.org/ - - - - Apache-2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - Apache License, Version 2.0 - - - - https://github.com/bndtools/bnd - scm:git:https://github.com/bndtools/bnd.git - scm:git:git@github.com:bndtools/bnd.git - 3.5.0.REL - - - - pkriens - Peter.Kriens@aQute.biz - Peter Kriens - Bndtools - https://github.com/bndtools - - architect - developer - - 1 - - - diff --git a/biz.aQute.bndlib-3.5.0.pom b/biz.aQute.bndlib-3.5.0.pom deleted file mode 100644 index beb0087..0000000 --- a/biz.aQute.bndlib-3.5.0.pom +++ /dev/null @@ -1,38 +0,0 @@ - - - 4.0.0 - biz.aQute.bnd - biz.aQute.bndlib - 3.5.0 - A Swiss Army Knife for OSGi - bndlib - http://bnd.bndtools.org/ - - Bndtools - http://bndtools.org/ - - - - Apache-2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - Apache License, Version 2.0 - - - - https://github.com/bndtools/bnd - scm:git:https://github.com/bndtools/bnd.git - scm:git:git@github.com:bndtools/bnd.git - 3.5.0.REL - - - - peter.kriens@aQute.biz - peter.kriens@aQute.biz - - - njbartlett@gmail.com - njbartlett@gmail.com - - - diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 9214b2f..0000000 --- a/gating.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- !Policy -product_versions: - - rhel-9 -decision_contexts: - - osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} - # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test - - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap} diff --git a/generate-tarball.sh b/generate-tarball.sh deleted file mode 100755 index 13e2cb8..0000000 --- a/generate-tarball.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -set -e - -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" - -rm -rf tarball-tmp -mkdir tarball-tmp -pushd tarball-tmp -tar -xf "../${name}-${version}.orig.tar.gz" -mv "bnd-${version}.REL" "${name}-${version}" - -# CLEAN TARBALL -rm -rf "${name}-${version}/docs" -find -name '*.jar' -delete -find -name '*.class' -delete -find -name '*.ar' -delete -find -name '*.tar' -delete -find -name '*.gz' -delete -find -name '*.bz2' -delete -find -name '*.xz' -delete -find -name '*.zip' -delete -find -name '*.exe' -delete -find -name '*.dll' -delete - -tar -czf "../${name}-${version}.tar.gz" * -popd -rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/plans/regression.fmf b/plans/regression.fmf deleted file mode 100644 index f381743..0000000 --- a/plans/regression.fmf +++ /dev/null @@ -1,8 +0,0 @@ -summary: Regression test -execute: - script: - # Regression tests for for rhbz#2033709 - - jar tf /usr/share/java/aqute-bnd/biz.aQute.bnd.jar | grep -c \\.class$ - - jar tf /usr/share/java/aqute-bnd/aQute.libg.jar | grep -c \\.class$ - - jar tf /usr/share/java/aqute-bnd/biz.aQute.bnd.annotation.jar | grep -c \\.class$ - - jar tf /usr/share/java/aqute-bnd/biz.aQute.bndlib.jar | grep -c \\.class$ diff --git a/plans/smoke.fmf b/plans/smoke.fmf deleted file mode 100644 index 750fd30..0000000 --- a/plans/smoke.fmf +++ /dev/null @@ -1,4 +0,0 @@ -summary: Basic smoke test -execute: - script: - - bnd print /usr/share/java/osgi-core/osgi.core.jar diff --git a/repack-tarball.sh b/repack-tarball.sh old mode 100755 new mode 100644 diff --git a/sources b/sources index cb35a57..8772cbe 100644 --- a/sources +++ b/sources @@ -1 +1,5 @@ SHA512 (3.5.0.REL.tar.gz) = c0e1fb6370881ab5012bbfbeae8093c23b25083a8a82599a9ae1179d8efc051c3b4a5cf99473072b7cf1e84440e08f19a5731b6f3c8bb805f849aa4823c16062 +SHA512 (aQute.libg-3.5.0.pom) = 81a7f1350296c2bdd48755c38804520c80df2ed968186a35842284d55b4ac951092646c780a5bc91fca161f43515e3061b9003aa6674dd199297159b9a59eb60 +SHA512 (biz.aQute.bnd-3.5.0.pom) = 60ff58f4d366dccb26cee5ac3d0749a564e0eab41b4e493df1727c7a79d7159f0913d3d1dcd406963580b7063d8b76cd92088d9eee46a01a0f9dd33643a5c345 +SHA512 (biz.aQute.bndlib-3.5.0.pom) = 3987110f4fc1bedb13f3ad777cb33dc9db75ad81135fcbc49763dfb243c5053ea864d76d16f271547666c01f6dfbb104a9d4ee52496e62e6fb80dcfc02d23f75 +SHA512 (biz.aQute.bnd.annotation-3.5.0.pom) = c968e0586f55accb37d4caf4d8a6d509fd6f88982dcc464cfb0fd41f863eb0b7945aadafb97c79ba2d6d1fda59ef12e5bac4556e302599924130d69fb99ac31f