[groovy18] Shaded asm3 artifacts have no classifier

Michal Srb msrb at fedoraproject.org
Fri Dec 6 12:57:23 UTC 2013


commit 4d0346a7b8458b96179bcc5efc7bee10052cf909
Author: Michal Srb <msrb at redhat.com>
Date:   Fri Dec 6 13:31:23 2013 +0100

    Shaded asm3 artifacts have no classifier

 groovy18.spec |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/groovy18.spec b/groovy18.spec
index 60011c8..fb2db02 100644
--- a/groovy18.spec
+++ b/groovy18.spec
@@ -4,7 +4,7 @@
 %global majorversion 1.8
 Name:           groovy18
 Version:        1.8.9
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Dynamic language for the Java Platform
 Group:          Development/Languages
 # Some of the files are licensed under BSD and CPL terms, but the CPL has been superceded
@@ -110,7 +110,16 @@ done
 find . -name "*.java" -exec sed -i 's|org.objectweb.asm|org.objectweb.distroshaded.asm|g' {} +
 find . -name "*.groovy" -exec sed -i 's|org.objectweb.asm|org.objectweb.distroshaded.asm|g' {} +
 
-%pom_xpath_inject "pom:dependency[pom:groupId[text()='asm']]" "<classifier>distroshaded</classifier>"
+%pom_remove_dep :asm
+%pom_remove_dep :asm-commons
+%pom_remove_dep :asm-util
+%pom_remove_dep :asm-analysis
+%pom_remove_dep :asm-tree
+%pom_add_dep asm:asm-distroshaded
+%pom_add_dep asm:asm-commons-distroshaded
+%pom_add_dep asm:asm-util-distroshaded
+%pom_add_dep asm:asm-analysis-distroshaded
+%pom_add_dep asm:asm-tree-distroshaded
 
 %build
 mkdir -p target/lib/{compile,tools}
@@ -182,6 +191,9 @@ install -p -m644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
 %doc LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt
 
 %changelog
+* Fri Dec 06 2013 Michal Srb <msrb at redhat.com> - 1.8.9-9
+- Shaded asm3 artifacts have no classifier
+
 * Fri Dec 06 2013 Michal Srb <msrb at redhat.com> - 1.8.9-8
 - Fix what I have broken (transition to shaded asm3)
 


More information about the scm-commits mailing list