Initial import from Fedora

Resolves: rhbz#2083112
This commit is contained in:
Mikolaj Izdebski 2022-08-10 07:35:08 +02:00
parent e6e6ad9118
commit 1f41d9015e
12 changed files with 989 additions and 0 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

46
.gitignore vendored
View File

@ -0,0 +1,46 @@
/results_*
/*.src.rpm
/*.noarch.rpm
/2.4.1.REL.tar.gz
/3.2.0.REL.tar.gz
/3.3.0.REL.tar.gz
/3.4.0.REL.tar.gz
/3.5.0.REL.tar.gz
/4.3.0.REL.tar.gz
/4.3.1.REL.tar.gz
/*.pom
/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
/4.2.0.REL.tar.gz
/aQute.libg-4.2.0.pom
/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
/5.0.0.REL.tar.gz
/aQute.libg-5.0.0.pom
/biz.aQute.bnd-5.0.0.pom
/biz.aQute.bnd.annotation-5.0.0.pom
/biz.aQute.bndlib-5.0.0.pom
/aqute-bnd-5.1.1.tar.gz
/aQute.libg-5.1.1.pom
/biz.aQute.bnd-5.1.1.pom
/biz.aQute.bnd.annotation-5.1.1.pom
/biz.aQute.bndlib-5.1.1.pom
/aqute-bnd-5.1.2.tar.gz
/aQute.libg-5.1.2.pom
/biz.aQute.bnd-5.1.2.pom
/biz.aQute.bnd.annotation-5.1.2.pom
/biz.aQute.bndlib-5.1.2.pom
/aqute-bnd-5.2.0.tar.gz
/aQute.libg-5.2.0.pom
/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

View File

@ -0,0 +1,108 @@
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;
@@ -3921,54 +3920,6 @@ public class bnd extends Processor {
getInfo(profiles);
}
- /**
- * Resolve command
- *
- * @throws Exception
- */
-
- public void _resolve(ResolveCommand.ResolveOptions options) throws Exception {
- ResolveCommand rc = new ResolveCommand(this);
- String help = options._command()
- .subCmd(options, rc);
- if (help != null)
- out.println(help);
- getInfo(rc);
- rc.close();
- }
-
- /**
- * Remote command
- *
- * @throws Exception
- */
-
- public void _remote(RemoteCommand.RemoteOptions options) throws Exception {
- RemoteCommand rc = new RemoteCommand(this, options);
- String help = options._command()
- .subCmd(options, rc);
- if (help != null)
- out.println(help);
- getInfo(rc);
- rc.close();
- }
-
- /**
- * Nexus commands
- *
- * @throws Exception
- */
-
- public void _nexus(NexusCommand.NexusOptions options) throws Exception {
- NexusCommand rc = new NexusCommand(this, options);
- String help = options._command()
- .subCmd(options, rc);
- if (help != null)
- out.println(help);
- getInfo(rc);
- rc.close();
- }
-
/**
* Export a bndrun file
*/
@@ -4424,15 +4375,6 @@ public class bnd extends Processor {
}
}
- @Description("Start an interactive shell")
- public void _shell(Shell.ShellOptions options) throws Exception {
- try (Shell shell = new Shell(this, options)) {
- shell.loop();
- } finally {
- out.println("done");
- }
- }
-
public Workspace getWorkspace() {
return workspace;
}
@@ -4479,24 +4421,6 @@ public class bnd extends Processor {
}
- @Description("Generate and export reports of a workspace, a project or of a jar.")
- public void _exportreport(ExportReportCommand.ReporterOptions options) throws Exception {
- ExportReportCommand mc = new ExportReportCommand(this);
- mc.run(options);
- getInfo(mc);
- }
-
- @Description("Maintain Maven Bnd Repository GAV files")
- public void _mbr(MbrCommand.MrOptions options) throws Exception {
- MbrCommand c = new MbrCommand(this, options);
- CommandLine cl = new CommandLine(this);
- String s = cl.subCmd(options, c);
- if (s != null) {
- out.println(s);
- }
- getInfo(c);
- }
-
@Description("Shows the differences between two XML resource repositories")
public void _xmlrepodiff(XmlRepoDiffOptions options) throws Exception {
try (XmlRepoDiffCommand cmd = new XmlRepoDiffCommand(this)) {

View File

@ -0,0 +1,102 @@
From 64a36cbc8d7c8234dfa2af8670c2e1ea4a5c3909 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
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 extends Logger> L getLogger(String name, Class<L> loggerType) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public <L extends Logger> L getLogger(Class<?> clazz, Class<L> loggerType) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public <L extends Logger> L getLogger(Bundle bundle, String name, Class<L> loggerType) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
public ConsoleLogger(BundleContext context) {
--
2.20.1

466
aqute-bnd.spec Normal file
View File

@ -0,0 +1,466 @@
%bcond_with bootstrap
%if %{without bootstrap} && !0%{?rhel}
%bcond_without bnd_maven_plugin
%else
%bcond_with bnd_maven_plugin
%endif
Name: aqute-bnd
Version: 6.2.0
Release: 2%{?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
URL: https://bnd.bndtools.org/
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
Source0: %{name}-%{version}.tar.gz
# removes bundled jars from upstream tarball
# run as:
# ./generate-tarball.sh
Source1: generate-tarball.sh
Source2: parent.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.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
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: maven-local
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)
BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.slf4j:slf4j-simple)
%endif
%if %{with bnd_maven_plugin}
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
BuildRequires: mvn(org.apache.maven.shared:maven-mapping)
BuildRequires: mvn(org.apache.maven:maven-artifact)
BuildRequires: mvn(org.apache.maven:maven-compat)
BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.eclipse.aether:aether-api)
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
%endif
# Explicit javapackages-tools requires since bnd script uses
# /usr/share/java-utils/java-functions
Requires: javapackages-tools
%description
The bnd tool helps you create and diagnose OSGi bundles.
The key functions are:
- Show the manifest and JAR contents of a bundle
- Wrap a JAR so that it becomes a bundle
- Create a Bundle from a specification and a class path
- Verify the validity of the manifest entries
The tool is capable of acting as:
- Command line tool
- File format
- Directives
- Use of macros
%package -n aqute-bndlib
Summary: BND library
%description -n aqute-bndlib
%{summary}.
%if %{with bnd_maven_plugin}
%package -n bnd-maven-plugin
Summary: BND Maven plugin
%description -n bnd-maven-plugin
%{summary}.
%endif
%package javadoc
Summary: Javadoc for %{name}
%description javadoc
API documentation for %{name}.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
# the commands pull in more dependencies than we want (felix-resolver, jetty)
rm biz.aQute.bnd/src/aQute/bnd/main/{ExportReportCommand,MbrCommand,RemoteCommand,ReporterLogger,ResolveCommand,Shell}.java
sed 's/@VERSION@/%{version}/' %SOURCE2 > pom.xml
sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd.info
%if %{without bnd_maven_plugin}
%pom_disable_module maven
%endif
# libg
pushd aQute.libg
cp -p %{SOURCE3} pom.xml
%pom_add_parent biz.aQute.bnd:parent:%{version}
%pom_add_dep org.osgi:osgi.cmpn
popd
# bnd.annotation
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
pushd biz.aQute.bndlib
cp -p %{SOURCE5} pom.xml
%pom_add_parent biz.aQute.bnd:parent:%{version}
%pom_add_dep org.osgi:osgi.cmpn
%pom_add_dep biz.aQute.bnd:aQute.libg:%{version}
%pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version}
popd
# bnd.ant
pushd biz.aQute.bnd.ant
cp -p %{SOURCE7} pom.xml
%pom_add_parent biz.aQute.bnd:parent:%{version}
popd
# bnd
cp -r biz.aQute.bnd.exporters/src/aQute/bnd/exporter biz.aQute.bnd/src/aQute/bnd/
pushd biz.aQute.bnd
cp -p %{SOURCE4} pom.xml
%pom_add_parent biz.aQute.bnd:parent:%{version}
%pom_remove_dep :biz.aQute.resolve
%pom_remove_dep :biz.aQute.repository
%pom_remove_dep :biz.aQute.bnd.exporters
%pom_remove_dep :biz.aQute.bnd.reporter
%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
%pom_remove_dep -r org.osgi:org.osgi.namespace.service
%pom_remove_dep -r org.osgi:org.osgi.resource
%pom_remove_dep -r org.osgi:org.osgi.service.log
%pom_remove_dep -r org.osgi:org.osgi.service.repository
%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
%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-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
%pom_remove_plugin -r :flatten-maven-plugin
popd
%mvn_alias biz.aQute.bnd:biz.aQute.bnd :bnd biz.aQute:bnd
%mvn_alias biz.aQute.bnd:biz.aQute.bndlib :bndlib biz.aQute:bndlib
%mvn_package biz.aQute.bnd:biz.aQute.bndlib bndlib
%mvn_package biz.aQute.bnd:biz.aQute.bnd.annotation bndlib
%mvn_package biz.aQute.bnd:aQute.libg bndlib
%mvn_package biz.aQute.bnd:parent __noinstall
%mvn_package biz.aQute.bnd:bnd-plugin-parent __noinstall
%if %{with bnd_maven_plugin}
%mvn_package biz.aQute.bnd:bnd-maven-plugin maven
%mvn_package biz.aQute.bnd:bnd-baseline-maven-plugin maven
%endif
%build
%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
%install
%mvn_install
install -d -m 755 %{buildroot}%{_sysconfdir}/ant.d
echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium" >%{buildroot}%{_sysconfdir}/ant.d/%{name}
%jpackage_script aQute.bnd.main.bnd "" "" aqute-bnd:slf4j/slf4j-api:slf4j/slf4j-simple:osgi-annotation:osgi-core:osgi-compendium bnd 1
%files -f .mfiles
%license LICENSE
%{_bindir}/bnd
%config(noreplace) %{_sysconfdir}/ant.d/*
%files -n aqute-bndlib -f .mfiles-bndlib
%license LICENSE
%if %{with bnd_maven_plugin}
%files -n bnd-maven-plugin -f .mfiles-maven
%endif
%files javadoc -f .mfiles-javadoc
%license LICENSE
%changelog
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue May 03 2022 Marian Koncek <mkoncek@redhat.com> - 6.2.0-1
- Update to upstream version 6.2.0
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 5.2.0-9
- Rebuilt for java-17-openjdk as system jdk
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Nov 22 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 5.2.0-7
- Enable biz.aQute.bnd.ant
* Fri Sep 24 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.2.0-6
- Rename maven_plugin build conditional to bnd_maven_plugin
* Tue Aug 10 2021 Sérgio Basto <sergio@serjux.com> - 5.2.0-5
- reenable bnd-maven-plugin
* Mon Aug 02 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 5.2.0-4
- Add parent to biz.aQute.bnd/pom.xml (fixes [WARNING] JAR will be
empty - no content was marked for inclusion!)
- Remove scope from dependencies in pom.xml files (fixes missing
dependencies, dependencies marked with scope provided are ignored by
the rpm dependency generator)
- Drop some more commands: shell, exportreport, mbr (uses parts that
are not packaged)
- Resolves: rhbz#1985566
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.2.0-2
- Bootstrap build
- Non-bootstrap build
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jan 20 2021 Marian Koncek <mkoncek@redhat.com> - 5.2.0-1
- Update to upstream version 5.2.0
* Mon Dec 14 2020 Jerry James <loganjerry@gmail.com> - 4.3.1-3
- Update jansi path for jansi 1.x and jline path for jline 2.x
* Wed Nov 25 2020 Mat Booth <mat.booth@redhat.com> - 4.3.1-2
- Add OSGi metadata
* Tue Sep 29 2020 Marian Koncek <mkoncek@redhat.com> - 5.1.2-1
- Update to upstream version 5.1.2
* Tue Jul 28 2020 Mat Booth <mat.booth@redhat.com> - 4.3.1-1
- Update to latest 4.x release
* Mon Jul 27 2020 Mat Booth <mat.booth@redhat.com> - 4.3.0-1
- Update to upstream version 4.3.0
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 21 2020 Mat Booth <mat.booth@redhat.com> - 3.5.0-10
- Fix NIO linkage error when running on Java 8 due to incorrect cross-compilation
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.5.0-9
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Tue Jun 23 2020 Marian Koncek <mkoncek@redhat.com> - 5.1.1-1
- Update to upstream version 5.1.1
* Fri Apr 24 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.0.0-2
- Disable bnd-maven-plugin
* Wed Jan 29 2020 Marian Koncek <mkoncek@redhat.com> - 5.0.0-1
- Update to upstream version 5.0.0
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3.0-2
- Mass rebuild for javapackages-tools 201902
* Wed Oct 09 2019 Marian Koncek <mkoncek@redhat.com> - 4.3.0-1
- Update to upstream version 4.3.0
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jul 04 2019 Marian Koncek <mkoncek@redhat.com> - 4.2.0-1
- Update to upstream version 4.2.0
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5.0-6
- Mass rebuild for javapackages-tools 201901
* Fri Apr 12 2019 Marian Koncek <mkoncek@redhat.com> - 3.5.0-6
- Port to OSGI 7.0.0
* Fri Apr 12 2019 Marian Koncek <mkoncek@redhat.com> - 3.5.0-5
- Port to OSGI 7.0.0
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Jul 30 2018 Severin Gehwolf <sgehwolf@redhat.com> - 3.5.0-4
- Add requirement on javapackages-tools for bnd script.
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Fri Oct 13 2017 Michael Simacek <msimacek@redhat.com> - 3.5.0-1
- Update to upstream version 3.5.0
* Mon Oct 02 2017 Troy Dawson <tdawson@redhat.com> - 3.4.0-3
- Cleanup spec file conditionals
* Sat Sep 23 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.0-2
- Remove unneeded javadoc plugin
* Tue Sep 12 2017 Michael Simacek <msimacek@redhat.com> - 3.4.0-1
- Update to upstream version 3.4.0
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Mon Oct 10 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-5
- Don't use legacy Ant artifact coordinates
* Mon Oct 10 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-4
- Allow conditional builds without Ant tasks
* Mon Oct 10 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-3
- Allow conditional builds without Maven plugin
* Thu Oct 06 2016 Michael Simacek <msimacek@redhat.com> - 3.3.0-2
- Fix ant.d classpath
* Thu Sep 29 2016 Michael Simacek <msimacek@redhat.com> - 3.3.0-1
- Update to upstream version 3.3.0
- Build against osgi-{core,compendium}
* Tue Sep 27 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-5
- Add felix-scr-annotations to classpath
* Mon Sep 26 2016 Michael Simacek <msimacek@redhat.com> - 3.2.0-4
- Use felix-annotations
* Wed Sep 14 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-3
- Build and install Maven plugins
- Resolves: rhbz#1375904
* Wed Jun 1 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-2
- Install ant.d config files
* Tue May 24 2016 Michael Simacek <msimacek@redhat.com> - 3.2.0-1
- Update to upstream version 3.2.0
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jul 17 2015 Michael Simacek <msimacek@redhat.com> - 2.4.1-2
- Fix Tool header generation
* Wed Jul 08 2015 Michael Simacek <msimacek@redhat.com> - 2.4.1-1
- Update to upstream version 2.4.1
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.363-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Thu May 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.0.363-15
- Disable javadoc doclint
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.363-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Thu May 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.0.363-13
- Use .mfiles generated during build
* Fri May 09 2014 Jaromir Capik <jcapik@redhat.com> - 0.0.363-12
- Fixing ambiguous base64 class
* Fri May 09 2014 Gil Cattaneo <puntogil@libero.it> 0.0.363-11
- fix rhbz#991985
- add source compatibility with ant 1.9
- remove and rebuild from source aQute.runtime.jar
- update to current packaging guidelines
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.0.363-10
- Use Requires: java-headless rebuild (#1067528)
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.363-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.363-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.363-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Wed Apr 25 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.0.363-6
- Get rid of unusable eclipse plugins to simplify dependencies
* Fri Mar 02 2012 Jaromir Capik <jcapik@redhat.com> - 0.0.363-5
- Fixing build failures on f16 and later
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.363-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Thu Sep 22 2011 Jaromir Capik <jcapik@redhat.com> - 0.0.363-3
- Resurrection of bundled non-class files
* Thu Sep 22 2011 Jaromir Capik <jcapik@redhat.com> - 0.0.363-2
- Bundled classes removed
- jpackage-utils dependency added to the javadoc subpackage
* Wed Sep 21 2011 Jaromir Capik <jcapik@redhat.com> - 0.0.363-1
- Initial version (cloned from aqute-bndlib 0.0.363)

1
ci.fmf Normal file
View File

@ -0,0 +1 @@
resultsdb-testcase: separate

9
gating.yaml Normal file
View File

@ -0,0 +1,9 @@
--- !Policy
product_versions:
- fedora-*
decision_contexts:
- bodhi_update_push_testing
- bodhi_update_push_stable
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional}
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}

32
generate-tarball.sh Executable file
View File

@ -0,0 +1,32 @@
#!/bin/bash
set -e
name=aqute-bnd
version="$(sed -n 's/Version:\s*//p' *.spec)"
# RETRIEVE
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}" "${name}-${version}"
# CLEAN TARBALL
rm -rf "${name}-${version}/docs"
rm -rf '.github'
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"

200
parent.pom Normal file
View File

@ -0,0 +1,200 @@
<?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>parent</artifactId>
<version>@VERSION@</version>
<packaging>pom</packaging>
<name>Parent project for bnd tool suite</name>
<description>Project information for bnd.</description>
<url>http://www.aQute.biz/Code/Bnd</url>
<organization>
<name>aQute SARL</name>
<url>http://www.aQute.biz</url>
</organization>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<url>http://www.opensource.org/licenses/apache2.0.php</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>bnd</id>
<name>Peter Kriens</name>
<organization>aQute SARL</organization>
<roles>
<role>Primary Developer</role>
</roles>
</developer>
<developer>
<id>bjhargrave</id>
<name>BJ Hargrave</name>
</developer>
<developer>
<id>mcculls</id>
<name>Stuart McCulloch</name>
</developer>
<developer>
<id>njbartlett</id>
<name>Neil Bartlett</name>
<organization>Paremus</organization>
</developer>
<developer>
<id>fhuberts</id>
<name>Ferry Huberts</name>
<organization>Pelagic</organization>
</developer>
<developer>
<id>psoreide</id>
<name>PK S&#248;reide</name>
<organization>Comactivity AB</organization>
</developer>
</developers>
<contributors>
<contributor>
<!--<id>derheld42</id>-->
<name>Carter Smithhart</name>
</contributor>
<contributor>
<!--<id>cchabanois</id>-->
<name>Chabanois Cédric</name>
<organization>Entropysoft</organization>
</contributor>
<contributor>
<!--<id>paulbakker</id>-->
<name>Paul Bakker</name>
<organization>Luminis Technologies</organization>
</contributor>
<contributor>
<!--<id>djencks</id>-->
<name>David Jencks</name>
</contributor>
<contributor>
<!--<id>rkrzewski</id>-->
<name>Rafa&#322; Krzewski</name>
<organization>Caltha - Krzewski, Mach, Potempski Sp. J.</organization>
</contributor>
<contributor>
<!--<id>xfournet</id>-->
<name>Xavier Fournet</name>
</contributor>
<contributor>
<!--<id>crabbkw</id>-->
<name>Casey Crabb</name>
</contributor>
<contributor>
<!--<id>david.bosschaert</id>-->
<name>David Bosschaert</name>
</contributor>
<contributor>
<!--<id>harald.wellmann</id>-->
<name>Harald Wellmann</name>
</contributor>
<contributor>
<!--<id>janwillem.janssen</id>-->
<name>Jan Willem Janssen</name>
</contributor>
<contributor>
<!--<id>marcel.offermans</id>-->
<name>Marcel Offermans</name>
</contributor>
<contributor>
<!--<id>marian.grigoras</id>-->
<name>Marian Grigoras</name>
</contributor>
<contributor>
<!--<id>markuswolf</id>-->
<name>Markus Wolf</name>
</contributor>
<contributor>
<!--<id>nicolas.lalevee</id>-->
<name>Nicolas Lalevée</name>
</contributor>
<contributor>
<!--<id>pierre.labiausse</id>-->
<name>Pierre Labiausse</name>
</contributor>
<contributor>
<!--<id>raymond.auge</id>-->
<name>Raymond Auge</name>
</contributor>
<contributor>
<!--<id>timothyjward</id>-->
<name>Tim Ward</name>
</contributor>
<contributor>
<!--<id>bramk</id>-->
<name>Bram de Kruijff</name>
</contributor>
<contributor>
<!--<id>tangyong</id>-->
<name>Tang Yong</name>
</contributor>
<contributor>
<!--<id>gamerson</id>-->
<name>Gregory Amerson</name>
</contributor>
<contributor>
<!--<id>gnodet</id>-->
<name>Guillaume Nodet</name>
</contributor>
<contributor>
<!--<id>marcdejonge</id>-->
<name>Marc de Jonge</name>
</contributor>
<contributor>
<!--<id>trespasserw</id>-->
<name>Roman Shevchenko</name>
</contributor>
</contributors>
<scm>
<url>https://github.com/bndtools/bnd</url>
<connection>scm:git:git://github.com/bndtools/bnd.git</connection>
<developerConnection>scm:git:ssh://github.com/bndtools/bnd.git</developerConnection>
</scm>
<modules>
<module>aQute.libg</module>
<module>biz.aQute.bndlib</module>
<module>biz.aQute.bnd</module>
<module>biz.aQute.bnd.annotation</module>
<module>biz.aQute.bnd.ant</module>
<module>biz.aQute.bnd.util</module>
<module>maven</module>
</modules>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
<directory>src/</directory>
<excludes>
<exclude>**/*.java</exclude>
<exclude>**/packageinfo</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

7
plans/javapackages.fmf Normal file
View File

@ -0,0 +1,7 @@
summary:
Run javapackages-specific tests
discover:
how: fmf
url: https://pagure.io/javapackages-validator-tests
execute:
how: tmt

10
plans/smoke.fmf Normal file
View File

@ -0,0 +1,10 @@
summary: Basic smoke test
prepare:
how: install
package: unzip
execute:
script: |
bnd wrap -b foo -v 1.2.3 /usr/share/java/ant/ant-bootstrap.jar
unzip ant-bootstrap.jar META-INF/MANIFEST.MF
grep ^Bundle-SymbolicName:.foo META-INF/MANIFEST.MF
grep ^Bundle-Version:.1.2.3 META-INF/MANIFEST.MF

7
sources Normal file
View File

@ -0,0 +1,7 @@
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