From 10265c50cc1ea0ab578e43a3fc9c83e362d816f9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 Apr 2020 13:26:09 +0200 Subject: [PATCH] Disable bnd-maven-plugin --- aqute-bnd.spec | 44 ++++---------------------------------------- parent.pom | 1 - 2 files changed, 4 insertions(+), 41 deletions(-) diff --git a/aqute-bnd.spec b/aqute-bnd.spec index 2c0fec0..d6463f9 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -1,6 +1,6 @@ Name: aqute-bnd Version: 5.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: BND Tool # Part of jpm is under BSD, but jpm is not included in binary RPM License: ASL 2.0 @@ -24,21 +24,11 @@ Patch1: 0002-Fix-ant-compatibility.patch Patch2: 0003-Port-to-OSGI-7.0.0.patch BuildRequires: maven-local -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.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 @@ -63,12 +53,6 @@ Summary: BND library %description -n aqute-bndlib %{summary}. -%package -n bnd-maven-plugin -Summary: BND Maven plugin - -%description -n bnd-maven-plugin -%{summary}. - %package javadoc Summary: Javadoc for %{name} @@ -133,33 +117,12 @@ cp -p %{SOURCE4} pom.xml %pom_remove_dep :jline popd -# 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 -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: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 @@ -182,12 +145,13 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium %files -n aqute-bndlib -f .mfiles-bndlib %license LICENSE -%files -n bnd-maven-plugin -f .mfiles-maven - %files javadoc -f .mfiles-javadoc %license LICENSE %changelog +* Fri Apr 24 2020 Mikolaj Izdebski - 5.0.0-2 +- Disable bnd-maven-plugin + * Wed Jan 29 2020 Marian Koncek - 5.0.0-1 - Update to upstream version 5.0.0 diff --git a/parent.pom b/parent.pom index e637e27..fbff4e5 100644 --- a/parent.pom +++ b/parent.pom @@ -168,7 +168,6 @@ biz.aQute.bndlib biz.aQute.bnd biz.aQute.bnd.annotation - maven