| |
@@ -1,10 +1,10 @@
|
| |
|
| |
Name: aqute-bnd
|
| |
- Version: 3.5.0
|
| |
- Release: 11%{?dist}
|
| |
+ Version: 4.3.1
|
| |
+ Release: 1%{?dist}
|
| |
Summary: BND Tool
|
| |
# Part of jpm is under BSD, but jpm is not included in binary RPM
|
| |
- License: ASL 2.0
|
| |
+ License: ASL 2.0 or EPL-2.0
|
| |
URL: http://bnd.bndtools.org/
|
| |
BuildArch: noarch
|
| |
|
| |
@@ -14,24 +14,32 @@
|
| |
# ./repack-tarball.sh
|
| |
Source1: repack-tarball.sh
|
| |
|
| |
+ # A custom aggregator pom to run the build
|
| |
Source2: parent.pom
|
| |
+ # Poms from maven central since upstream uses gradle to build
|
| |
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.exporters/%{version}/biz.aQute.bnd.exporters-%{version}.pom
|
| |
+ Source8: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.reporter/%{version}/biz.aQute.bnd.reporter-%{version}.pom
|
| |
|
| |
+ # Remove support for remote and resolve commands since they bring more deps than we want
|
| |
Patch0: 0001-Disable-removed-commands.patch
|
| |
+
|
| |
+ # Fix build failure against ant
|
| |
Patch1: 0002-Fix-ant-compatibility.patch
|
| |
- Patch2: 0001-Port-to-OSGI-7.0.0.patch
|
| |
+
|
| |
+ # Fix unimplemented new APIs introduced in OSGi R7
|
| |
+ Patch2: 0003-Port-to-OSGI-7.0.0.patch
|
| |
+
|
| |
+ # Twig is dead upstream, so patch out the option to use it for reports
|
| |
+ Patch3: 0004-Patch-out-twig-plugin-for-report-generation.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)
|
| |
+ BuildRequires: mvn(com.github.javaparser:javaparser-core) >= 3.14.16
|
| |
+ BuildRequires: mvn(jline:jline)
|
| |
BuildRequires: mvn(org.apache.ant:ant)
|
| |
- 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)
|
| |
@@ -39,8 +47,15 @@
|
| |
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.apache.maven.shared:maven-mapping)
|
| |
BuildRequires: mvn(org.eclipse.aether:aether-api)
|
| |
+ 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)
|
| |
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
|
| |
+
|
| |
# Explicit javapackages-tools requires since bnd script uses
|
| |
# /usr/share/java-utils/java-functions
|
| |
Requires: javapackages-tools
|
| |
@@ -84,69 +99,91 @@
|
| |
%patch0 -p1
|
| |
%patch1 -p1
|
| |
%patch2 -p1
|
| |
-
|
| |
- # the commands pull in more dependencies than we want (felix-resolver, jetty)
|
| |
- rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java
|
| |
+ %patch3 -p1
|
| |
|
| |
sed 's/@VERSION@/%{version}/' %SOURCE2 > pom.xml
|
| |
sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd.info
|
| |
|
| |
-
|
| |
-
|
| |
# libg
|
| |
pushd aQute.libg
|
| |
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.cmpn
|
| |
- %pom_add_dep org.slf4j:slf4j-api
|
| |
+ %pom_add_dep org.osgi:osgi.core
|
| |
popd
|
| |
|
| |
- # bndlib.annotations
|
| |
- pushd biz.aQute.bnd.annotation
|
| |
- cp -p %{SOURCE6} pom.xml
|
| |
+ # bnd
|
| |
+ pushd biz.aQute.bnd
|
| |
+ cp -p %{SOURCE4} pom.xml
|
| |
+ sed -i -r 's/provided/compile/' pom.xml
|
| |
%pom_add_parent biz.aQute.bnd:parent:%{version}
|
| |
+ # add missing dep for ant tasks
|
| |
+ %pom_add_dep org.apache.ant:ant
|
| |
+ # remove support for remote and resolve commands
|
| |
+ rm src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java
|
| |
+ %pom_remove_dep :biz.aQute.resolve
|
| |
+ %pom_remove_dep :biz.aQute.repository
|
| |
+ %pom_remove_dep :biz.aQute.remote.api
|
| |
+ %pom_remove_dep :snakeyaml
|
| |
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_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
|
| |
%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
|
| |
+ # 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
|
| |
|
| |
- %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
|
| |
+ # bnd.exporters
|
| |
+ pushd biz.aQute.bnd.exporters
|
| |
+ cp -p %{SOURCE7} pom.xml
|
| |
+ %pom_add_parent biz.aQute.bnd:parent:%{version}
|
| |
%pom_add_dep org.osgi:osgi.core
|
| |
%pom_add_dep org.osgi:osgi.cmpn
|
| |
- %pom_add_dep org.slf4j:slf4j-api
|
| |
+ popd
|
| |
|
| |
- %pom_add_dep org.slf4j:slf4j-simple::runtime
|
| |
+ # bnd.reporter
|
| |
+ pushd biz.aQute.bnd.reporter
|
| |
+ cp -p %{SOURCE8} pom.xml
|
| |
+ %pom_add_parent biz.aQute.bnd:parent:%{version}
|
| |
+ %pom_add_dep org.osgi:osgi.core
|
| |
+ %pom_add_dep org.osgi:osgi.cmpn
|
| |
+ # remove twig dep and friends (twig is dead upstream)
|
| |
+ rm src/biz/aQute/bnd/reporter/plugins/transformer/JtwigTransformerPlugin.java
|
| |
+ %pom_remove_dep org.jtwig:
|
| |
+ %pom_remove_dep com.googlecode.concurrentlinkedhashmap:
|
| |
+ %pom_remove_dep com.google.guava:
|
| |
+ # uneeded dependency
|
| |
+ %pom_remove_dep :commons-lang3
|
| |
popd
|
| |
|
| |
# maven-plugins
|
| |
+ mkdir -p maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib
|
| |
+ cp -r biz.aQute.bnd.maven/src/aQute/bnd/maven/lib/configuration maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib/
|
| |
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
|
| |
+ %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
|
| |
@@ -164,7 +201,7 @@
|
| |
<jdk>[9,)</jdk>
|
| |
</activation>
|
| |
<properties>
|
| |
- <maven.compiler.release>7</maven.compiler.release>
|
| |
+ <maven.compiler.release>8</maven.compiler.release>
|
| |
</properties>
|
| |
</profile>
|
| |
</profiles>"
|
| |
@@ -190,7 +227,7 @@
|
| |
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
|
| |
+ %jpackage_script aQute.bnd.main.bnd "" "" aqute-bnd:slf4j/slf4j-api:slf4j/slf4j-simple:jline/jline:jansi/jansi:osgi-annotation:osgi-core:osgi-compendium bnd 1
|
| |
|
| |
%files -f .mfiles
|
| |
%license LICENSE
|
| |
@@ -206,6 +243,12 @@
|
| |
%license LICENSE
|
| |
|
| |
%changelog
|
| |
+ * 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
|
| |
|
| |
I tried rebuilding jdom2 against this version of aqute and it seemed to work. Probably should be tested against some other packages that ship OSGi metadata too, to ensure (a) it generally works and (b) the metadata generated is the same as before.