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/3.5.0.REL.tar.gz b/3.5.0.REL.tar.gz new file mode 100644 index 0000000..ec7d7bd Binary files /dev/null and b/3.5.0.REL.tar.gz differ 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..a9b50af --- /dev/null +++ b/aqute-bnd.spec @@ -0,0 +1,120 @@ +Name: aqute-bnd +Version: 3.5.0 +Release: 6 +Summary: BND Tool +License: ASL 2.0 +URL: http://bnd.bndtools.org/ +Source0: %{version}.REL.tar.gz +Source1: parent.pom +Source2: https://repo1.maven.org/maven2/biz/aQute/bnd/aQute.libg/%{version}/aQute.libg-%{version}.pom +Source3: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd/%{version}/biz.aQute.bnd-%{version}.pom +Source4: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/%{version}/biz.aQute.bndlib-%{version}.pom +Source5: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/%{version}/biz.aQute.bnd.annotation-%{version}.pom +Patch0001: 0001-Disable-removed-commands.patch +Patch0002: 0002-Fix-ant-compatibility.patch +BuildRequires: maven-local mvn(org.osgi:osgi.annotation) mvn(org.osgi:osgi.cmpn) mvn(org.osgi:osgi.core) +BuildRequires: mvn(org.slf4j:slf4j-api) mvn(org.slf4j:slf4j-simple) mvn(org.apache.ant:ant) mvn(junit:junit) +BuildRequires: mvn(org.apache.maven:maven-artifact) mvn(org.apache.maven:maven-compat) mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: mvn(org.eclipse.aether:aether-api) mvn(org.sonatype.plexus:plexus-build-api) +Requires: javapackages-tools +Provides: aqute-bndlib = %{version}-%{release} bnd-maven-plugin = %{version}-%{release} +Obsoletes: aqute-bndlib < %{version}-%{release} bnd-maven-plugin < %{version}-%{release} +BuildArch: noarch + +%description +Bnd is the engine behind a number of popular software development tools that support OSGi. +It can be found in several maven plugins, ant, gradle, and of course Eclipse (bndtools). +It actively seeks other build tool vendors to use bnd to improve the quality of the generated +OSGi metadata. + +%package help +Provides: aqute-bnd-javadoc = %{version}-%{release} +Obsoletes: aqute-bnd-javadoc < %{version}-%{release} +Summary: Documentation for aqute-bnd + +%description help +Documentation for aqute-bnd api. + +%prep +%autosetup -n bnd-%{version}.REL -p1 +rm gradlew* +rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java +sed 's/@VERSION@/%{version}/' %SOURCE1 > pom.xml +sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd.info +cd aQute.libg +cp -p %{SOURCE2} pom.xml +%pom_add_parent biz.aQute.bnd:parent:%{version} +%pom_add_dep org.osgi:osgi.cmpn +%pom_add_dep org.slf4j:slf4j-api +cd - +cd biz.aQute.bnd.annotation +cp -p %{SOURCE5} pom.xml +%pom_add_parent biz.aQute.bnd:parent:%{version} +cd - +cd biz.aQute.bndlib +cp -p %{SOURCE4} 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} +cd - +cd biz.aQute.bnd +cp -p %{SOURCE3} 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} +%pom_add_dep org.apache.ant:ant +%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 +cd - +cd 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 +%pom_disable_module bnd-indexer-maven-plugin +%pom_disable_module bnd-export-maven-plugin +%pom_disable_module bnd-resolver-maven-plugin +%pom_disable_module bnd-testing-maven-plugin +%pom_remove_plugin -r :maven-invoker-plugin +%pom_remove_plugin -r :maven-javadoc-plugin +%pom_remove_plugin -r :flatten-maven-plugin +cd - +%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 +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/aqute-bnd +%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 +%files -f .mfiles-bndlib +%files -f .mfiles-maven +%doc LICENSE +%{_bindir}/bnd +%config(noreplace) %{_sysconfdir}/ant.d/* + +%files help -f .mfiles-javadoc + +%changelog +* Fri Feb 14 likexin - 3.5.0-6 +- Package init 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/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 + + + + + +