[groovy18] Fix what I have broken (transition to shaded asm3)

[Michal Srb]

commit 8690892f68018abdbc6b98bb18f07c2cabf22a9e
Author: Michal Srb <msrb at redhat.com>
Date:   Fri Dec 6 08:45:47 2013 +0100

    Fix what I have broken (transition to shaded asm3)

 groovy18-script |    8 ++++----
 groovy18.spec   |    7 ++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/groovy18-script b/groovy18-script
index 644fb1c..319c979 100644
--- a/groovy18-script
+++ b/groovy18-script
@@ -59,10 +59,10 @@ BASE_JARS="$BASE_JARS ant"
 BASE_JARS="$BASE_JARS ant/ant-junit"
 BASE_JARS="$BASE_JARS ant-launcher"
 BASE_JARS="$BASE_JARS antlr"
-BASE_JARS="$BASE_JARS objectweb-asm3/asm"
-BASE_JARS="$BASE_JARS objectweb-asm3/asm-analysis"
-BASE_JARS="$BASE_JARS objectweb-asm3/asm-tree"
-BASE_JARS="$BASE_JARS objectweb-asm3/asm-util"
+BASE_JARS="$BASE_JARS objectweb-asm3/asm-distroshaded"
+BASE_JARS="$BASE_JARS objectweb-asm3/asm-analysis-distroshaded"
+BASE_JARS="$BASE_JARS objectweb-asm3/asm-tree-distroshaded"
+BASE_JARS="$BASE_JARS objectweb-asm3/asm-util-distroshaded"
 BASE_JARS="$BASE_JARS bsf"
 BASE_JARS="$BASE_JARS commons-cli"
 BASE_JARS="$BASE_JARS commons-logging"
diff --git a/groovy18.spec b/groovy18.spec
index 8cdf545..60011c8 100644
--- a/groovy18.spec
+++ b/groovy18.spec
@@ -4,7 +4,7 @@
 %global majorversion 1.8
 Name:           groovy18
 Version:        1.8.9
-Release:        7%{?dist}
+Release:        8%{?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,6 +110,8 @@ 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>"
+
 %build
 mkdir -p target/lib/{compile,tools}
 
@@ -180,6 +182,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-8
+- Fix what I have broken (transition to shaded asm3)
+
 * Thu Dec 05 2013 Michal Srb <msrb at redhat.com> - 1.8.9-7
 - Build against shaded asm3