commit 7714204da76bafdb6cd5b9eda23ec506fa4017e3 Author: James Antill Date: Mon Aug 8 12:30:41 2022 -0400 Import rpm: a90c55426086b6a5286fce35239fbd5d602dd1ab diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f2cecb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/3.5.0.REL.tar.gz diff --git a/0001-Disable-removed-commands.patch b/0001-Disable-removed-commands.patch new file mode 100644 index 0000000..1a6ed57 --- /dev/null +++ b/0001-Disable-removed-commands.patch @@ -0,0 +1,75 @@ +From c250eb3ebbb9afb650edc080708c5e4c3cccbb78 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +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 | 45 ------------------------------- + 1 file changed, 45 deletions(-) + +diff --git a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java +index 1cc3216..c669e4a 100644 +--- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java ++++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java +@@ -105,7 +105,6 @@ import aQute.bnd.osgi.Processor; + import aQute.bnd.osgi.Resource; + import aQute.bnd.osgi.Verifier; + import aQute.bnd.osgi.eclipse.EclipseClasspath; +-import aQute.bnd.repository.maven.provider.NexusCommand; + import aQute.bnd.service.Actionable; + import aQute.bnd.service.RepositoryPlugin; + import aQute.bnd.service.action.Action; +@@ -4064,50 +4063,6 @@ public class bnd extends Processor { + } + + /** +- * 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 + */ + +-- +2.13.5 + diff --git a/0002-Fix-ant-compatibility.patch b/0002-Fix-ant-compatibility.patch new file mode 100644 index 0000000..12d2b1e --- /dev/null +++ b/0002-Fix-ant-compatibility.patch @@ -0,0 +1,25 @@ +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 aac8b8a..26dfe59 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.13.5 + diff --git a/0002-Port-to-OSGI-7.0.0.patch b/0002-Port-to-OSGI-7.0.0.patch new file mode 100644 index 0000000..c807cd1 --- /dev/null +++ b/0002-Port-to-OSGI-7.0.0.patch @@ -0,0 +1,102 @@ +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 new file mode 100644 index 0000000..165b6b8 --- /dev/null +++ b/aQute.libg-3.5.0.pom @@ -0,0 +1,42 @@ + + + 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/aqute-bnd.spec b/aqute-bnd.spec new file mode 100644 index 0000000..659b24a --- /dev/null +++ b/aqute-bnd.spec @@ -0,0 +1,334 @@ +%bcond_without ant_tasks +%bcond_without maven_plugin + +Name: aqute-bnd +Version: 3.5.0 +Release: 4%{?dist} +Summary: BND Tool +# Part of jpm is under BSD, but jpm is not included in binary RPM +License: ASL 2.0 +URL: http://bnd.bndtools.org/ +BuildArch: noarch + +Source0: %{version}.REL.tar.gz +# removes bundled jars from upstream tarball +# run as: +# ./repack-tarball.sh +Source1: repack-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 + +Patch0: 0001-Disable-removed-commands.patch +Patch1: 0002-Fix-ant-compatibility.patch + +BuildRequires: maven-local +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) +%if %{with ant_tasks} +BuildRequires: mvn(org.apache.ant:ant) +%endif +%if %{with maven_plugin} +BuildRequires: mvn(junit:junit) +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.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) +BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +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 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 -n bnd-%{version}.REL + +rm gradlew* + +%patch0 -p1 +%patch1 -p1 + +# the commands pull in more dependencies than we want (felix-resolver, jetty) +rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.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 ant_tasks} +rm -rf biz.aQute.bnd/src/aQute/bnd/ant +%endif + +%if %{without 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 +%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} +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.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 + +# bnd +pushd biz.aQute.bnd +cp -p %{SOURCE4} pom.xml +%pom_add_parent biz.aQute.bnd:parent:%{version} + +%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} +%if %{with ant_tasks} +%pom_add_dep org.apache.ant:ant +%endif +%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 org.slf4j:slf4j-simple::runtime +popd + +# maven-plugins +pushd maven +rm bnd-shared-maven-lib/src/main/java/aQute/bnd/maven/lib/resolve/DependencyResolver.java +%pom_remove_dep -r :biz.aQute.resolve +%pom_remove_dep -r :biz.aQute.repository +# 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-resolver-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:bnd-shared-maven-lib maven +%mvn_package biz.aQute.bnd:bnd-maven-plugin maven +%mvn_package biz.aQute.bnd:bnd-baseline-maven-plugin maven +%mvn_package biz.aQute.bnd:parent __noinstall +%mvn_package biz.aQute.bnd:bnd-plugin-parent __noinstall + +%build +%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 + +%install +%mvn_install + +%if %{with ant_tasks} +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} +%endif + +%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 +%if %{with ant_tasks} +%config(noreplace) %{_sysconfdir}/ant.d/* +%endif + +%files -n aqute-bndlib -f .mfiles-bndlib +%license LICENSE + +%if %{with maven_plugin} +%files -n bnd-maven-plugin -f .mfiles-maven +%endif + +%files javadoc -f .mfiles-javadoc +%license LICENSE + +%changelog +* Mon Jul 30 2018 Severin Gehwolf - 3.5.0-4 +- Add requirement on javapackages-tools for bnd script. + +* Thu Jul 12 2018 Fedora Release Engineering - 3.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 3.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Oct 13 2017 Michael Simacek - 3.5.0-1 +- Update to upstream version 3.5.0 + +* Mon Oct 02 2017 Troy Dawson - 3.4.0-3 +- Cleanup spec file conditionals + +* Sat Sep 23 2017 Mikolaj Izdebski - 3.4.0-2 +- Remove unneeded javadoc plugin + +* Tue Sep 12 2017 Michael Simacek - 3.4.0-1 +- Update to upstream version 3.4.0 + +* Wed Jul 26 2017 Fedora Release Engineering - 3.3.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.3.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Oct 10 2016 Mikolaj Izdebski - 3.3.0-5 +- Don't use legacy Ant artifact coordinates + +* Mon Oct 10 2016 Mikolaj Izdebski - 3.3.0-4 +- Allow conditional builds without Ant tasks + +* Mon Oct 10 2016 Mikolaj Izdebski - 3.3.0-3 +- Allow conditional builds without Maven plugin + +* Thu Oct 06 2016 Michael Simacek - 3.3.0-2 +- Fix ant.d classpath + +* Thu Sep 29 2016 Michael Simacek - 3.3.0-1 +- Update to upstream version 3.3.0 +- Build against osgi-{core,compendium} + +* Tue Sep 27 2016 Mikolaj Izdebski - 3.2.0-5 +- Add felix-scr-annotations to classpath + +* Mon Sep 26 2016 Michael Simacek - 3.2.0-4 +- Use felix-annotations + +* Wed Sep 14 2016 Mikolaj Izdebski - 3.2.0-3 +- Build and install Maven plugins +- Resolves: rhbz#1375904 + +* Wed Jun 1 2016 Mikolaj Izdebski - 3.2.0-2 +- Install ant.d config files + +* Tue May 24 2016 Michael Simacek - 3.2.0-1 +- Update to upstream version 3.2.0 + +* Wed Feb 03 2016 Fedora Release Engineering - 2.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jul 17 2015 Michael Simacek - 2.4.1-2 +- Fix Tool header generation + +* Wed Jul 08 2015 Michael Simacek - 2.4.1-1 +- Update to upstream version 2.4.1 + +* Wed Jun 17 2015 Fedora Release Engineering - 0.0.363-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu May 14 2015 Mikolaj Izdebski - 0.0.363-15 +- Disable javadoc doclint + +* Sat Jun 07 2014 Fedora Release Engineering - 0.0.363-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 29 2014 Mikolaj Izdebski - 0.0.363-13 +- Use .mfiles generated during build + +* Fri May 09 2014 Jaromir Capik - 0.0.363-12 +- Fixing ambiguous base64 class + +* Fri May 09 2014 Gil Cattaneo 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 - 0.0.363-10 +- Use Requires: java-headless rebuild (#1067528) + +* Sat Aug 03 2013 Fedora Release Engineering - 0.0.363-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 0.0.363-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 0.0.363-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Apr 25 2012 Stanislav Ochotnicky - 0.0.363-6 +- Get rid of unusable eclipse plugins to simplify dependencies + +* Fri Mar 02 2012 Jaromir Capik - 0.0.363-5 +- Fixing build failures on f16 and later + +* Thu Jan 12 2012 Fedora Release Engineering - 0.0.363-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Sep 22 2011 Jaromir Capik - 0.0.363-3 +- Resurrection of bundled non-class files + +* Thu Sep 22 2011 Jaromir Capik - 0.0.363-2 +- Bundled classes removed +- jpackage-utils dependency added to the javadoc subpackage + +* Wed Sep 21 2011 Jaromir Capik - 0.0.363-1 +- Initial version (cloned from aqute-bndlib 0.0.363) diff --git a/biz.aQute.bnd-3.5.0.pom b/biz.aQute.bnd-3.5.0.pom new file mode 100644 index 0000000..ff0a88d --- /dev/null +++ b/biz.aQute.bnd-3.5.0.pom @@ -0,0 +1,42 @@ + + + 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 new file mode 100644 index 0000000..ee70a29 --- /dev/null +++ b/biz.aQute.bnd.annotation-3.5.0.pom @@ -0,0 +1,42 @@ + + + 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 new file mode 100644 index 0000000..beb0087 --- /dev/null +++ b/biz.aQute.bndlib-3.5.0.pom @@ -0,0 +1,38 @@ + + + 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 new file mode 100644 index 0000000..9214b2f --- /dev/null +++ b/gating.yaml @@ -0,0 +1,9 @@ +--- !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 new file mode 100755 index 0000000..13e2cb8 --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,31 @@ +#!/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/parent.pom b/parent.pom new file mode 100644 index 0000000..e8bc7b0 --- /dev/null +++ b/parent.pom @@ -0,0 +1,198 @@ + + + 4.0.0 + + biz.aQute.bnd + parent + @VERSION@ + + pom + + Parent project for bnd tool suite + Project information for bnd. + http://www.aQute.biz/Code/Bnd + + + aQute SARL + http://www.aQute.biz + + + + + Apache Software License 2.0 + http://www.opensource.org/licenses/apache2.0.php + repo + + + + + + bnd + Peter Kriens + aQute SARL + + Primary Developer + + + + bjhargrave + BJ Hargrave + + + mcculls + Stuart McCulloch + + + njbartlett + Neil Bartlett + Paremus + + + fhuberts + Ferry Huberts + Pelagic + + + psoreide + PK Søreide + Comactivity AB + + + + + + Carter Smithhart + + + + Chabanois Cédric + Entropysoft + + + + Paul Bakker + Luminis Technologies + + + + David Jencks + + + + Rafał Krzewski + Caltha - Krzewski, Mach, Potempski Sp. J. + + + + Xavier Fournet + + + + Casey Crabb + + + + David Bosschaert + + + + Harald Wellmann + + + + Jan Willem Janssen + + + + Marcel Offermans + + + + Marian Grigoras + + + + Markus Wolf + + + + Nicolas Lalevée + + + + Pierre Labiausse + + + + Raymond Auge + + + + Tim Ward + + + + Bram de Kruijff + + + + Tang Yong + + + + Gregory Amerson + + + + Guillaume Nodet + + + + Marc de Jonge + + + + Roman Shevchenko + + + + + https://github.com/bndtools/bnd + scm:git:git://github.com/bndtools/bnd.git + scm:git:ssh://github.com/bndtools/bnd.git + + + + aQute.libg + biz.aQute.bndlib + biz.aQute.bnd + biz.aQute.bnd.annotation + maven + + + + src + + + src/ + + **/*.java + **/packageinfo + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.5.1 + + 1.7 + 1.7 + + + + + + diff --git a/plans/regression.fmf b/plans/regression.fmf new file mode 100644 index 0000000..f381743 --- /dev/null +++ b/plans/regression.fmf @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000..750fd30 --- /dev/null +++ b/plans/smoke.fmf @@ -0,0 +1,4 @@ +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 new file mode 100755 index 0000000..a770dd0 --- /dev/null +++ b/repack-tarball.sh @@ -0,0 +1,6 @@ +#!/bin/bash +VERSION=`sed -rn 's/^Version:\s*([0-9.]+)/\1/p' aqute-bnd.spec` +wget https://github.com/bndtools/bnd/archive/$VERSION.REL.tar.gz +gunzip $VERSION.REL.tar.gz +tar tf $VERSION.REL.tar | grep -E '\.(.ar|exe|tar\.(gz|bz2|xz)|zip)$' | xargs tar --delete --file $VERSION.REL.tar +gzip $VERSION.REL.tar diff --git a/sources b/sources new file mode 100644 index 0000000..ca1e812 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA1 (3.5.0.REL.tar.gz) = 3022433101e6246b2ddce69ddd7c3153b41462cf