[slf4j] Remove wagon-ssh build extension
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Thu Mar 6 12:34:28 UTC 2014
commit dd0cdcfded62980c5a5f0e453fa2845910452350
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Thu Mar 6 13:34:06 2014 +0100
Remove wagon-ssh build extension
- Disable slf4j-android module
slf4j.spec | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/slf4j.spec b/slf4j.spec
index 84d7156..8374ebe 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -89,6 +89,7 @@ cp -p %{SOURCE1} APACHE-LICENSE
%pom_disable_module integration
%pom_disable_module osgi-over-slf4j
+%pom_disable_module slf4j-android
%pom_remove_plugin :maven-source-plugin
# Because of a non-ASCII comment in slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java
@@ -106,6 +107,9 @@ cp -p %{SOURCE1} APACHE-LICENSE
%{_bindir}/find -name "*.css" -o -name "*.js" -o -name "*.txt" | \
%{_bindir}/xargs -t %{__perl} -pi -e 's/\r$//g'
+# Remove wagon-ssh build extension
+%pom_xpath_remove pom:extensions
+
# The general pattern is that the API package exports API classes and does
# not require impl classes. slf4j was breaking that causing "A cycle was
# detected when generating the classpath slf4j.api, slf4j.nop, slf4j.api."
@@ -141,6 +145,10 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
%doc LICENSE.txt APACHE-LICENSE
%changelog
+* Thu Mar 6 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.7.6-2
+- Remove wagon-ssh build extension
+- Disable slf4j-android module
+
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.7.6-2
- Use Requires: java-headless rebuild (#1067528)
More information about the scm-commits
mailing list