This commit is contained in:
parent
1d79e889ca
commit
31ab83523b
@ -107,6 +107,7 @@ sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd
|
||||
# libg
|
||||
pushd aQute.libg
|
||||
cp -p %{SOURCE3} pom.xml
|
||||
%pom_change_dep :::provided:: :::compile::
|
||||
%pom_add_dep org.osgi:osgi.cmpn
|
||||
%pom_add_dep org.slf4j:slf4j-api
|
||||
%pom_remove_dep -r org.osgi:org.osgi.util.function
|
||||
@ -125,14 +126,19 @@ popd
|
||||
# bndlib
|
||||
pushd biz.aQute.bndlib
|
||||
cp -p %{SOURCE5} pom.xml
|
||||
%pom_change_dep :::provided:: :::compile::
|
||||
%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}
|
||||
%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.service.log
|
||||
%pom_remove_dep -r org.osgi:org.osgi.service.repository
|
||||
%pom_remove_dep -r org.osgi:org.osgi.util.function
|
||||
%pom_remove_dep -r org.osgi:org.osgi.util.promise
|
||||
popd
|
||||
@ -140,6 +146,7 @@ popd
|
||||
# bnd.exporters
|
||||
pushd biz.aQute.bnd.exporters
|
||||
cp -p %{SOURCE7} pom.xml
|
||||
%pom_change_dep :::provided:: :::compile::
|
||||
%pom_add_dep biz.aQute.bnd:biz.aQute.bndlib:%{version}
|
||||
%pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version}
|
||||
popd
|
||||
@ -147,6 +154,7 @@ popd
|
||||
# bnd
|
||||
pushd biz.aQute.bnd
|
||||
cp -p %{SOURCE4} pom.xml
|
||||
%pom_change_dep :::provided:: :::compile::
|
||||
%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}
|
||||
@ -155,8 +163,9 @@ cp -p %{SOURCE4} pom.xml
|
||||
%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
|
||||
%pom_remove_dep -r org.osgi:org.osgi.service.log
|
||||
%pom_remove_dep -r org.osgi:org.osgi.service.repository
|
||||
popd
|
||||
|
||||
# maven-plugins
|
||||
|
@ -93,7 +93,7 @@ popd
|
||||
|
||||
%build
|
||||
pushd maven
|
||||
%{mvn_build} -- -Dproject.build.sourceEncoding=UTF-8 -Dsource=8
|
||||
%{mvn_build} -f -- -Dproject.build.sourceEncoding=UTF-8 -Dsource=8
|
||||
popd
|
||||
|
||||
%install
|
||||
|
Loading…
Reference in New Issue
Block a user