Set scope of optional compile dependencies to 'provided'

This commit is contained in:
Mikolaj Izdebski 2013-02-27 13:12:30 +01:00
parent 8371cd0d00
commit 5392accb59

View File

@ -1,6 +1,6 @@
Name: netty Name: netty
Version: 3.6.3 Version: 3.6.3
Release: 2%{?dist} Release: 3%{?dist}
Summary: An asynchronous event-driven network application framework and tools for Java Summary: An asynchronous event-driven network application framework and tools for Java
Group: Development/Libraries Group: Development/Libraries
@ -66,8 +66,9 @@ rm -rf jar doc license
%pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :animal-sniffer-maven-plugin
%pom_xpath_remove "pom:execution[pom:id[text()='remove-examples']]" %pom_xpath_remove "pom:execution[pom:id[text()='remove-examples']]"
%pom_xpath_remove "pom:plugin[pom:artifactId[text()='maven-javadoc-plugin']]/pom:configuration" %pom_xpath_remove "pom:plugin[pom:artifactId[text()='maven-javadoc-plugin']]/pom:configuration"
# Felix framework is optional, thus set scope to provided # Set scope of optional compile dependencies to 'provided'
%pom_xpath_set "pom:dependency[pom:groupId[text()='org.apache.felix']]/pom:scope" provided %pom_xpath_set "pom:dependency[pom:scope[text()='compile']
and pom:optional[text()='true']]/pom:scope" provided
sed s/jboss-logging-spi/jboss-logging/ -i pom.xml sed s/jboss-logging-spi/jboss-logging/ -i pom.xml
@ -94,6 +95,9 @@ sed -i s/org.jboss.netty.util.internal.jzlib/com.jcraft.jzlib/ \
%doc LICENSE.txt NOTICE.txt %doc LICENSE.txt NOTICE.txt
%changelog %changelog
* Wed Feb 27 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.3-3
- Set scope of optional compile dependencies to 'provided'
* Wed Feb 27 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.3-2 * Wed Feb 27 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.3-2
- Drop dependency on OSGi - Drop dependency on OSGi
- Resolves: rhbz#916139 - Resolves: rhbz#916139