[json-lib] Migrate to groovy18

[Michal Srb]

commit a5b99e7da0e77e080eefed49db3a3cfce37f3dc4
Author: Michal Srb <msrb at redhat.com>
Date:   Mon Jun 23 16:10:42 2014 +0200

    Migrate to groovy18

 json-lib.spec |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/json-lib.spec b/json-lib.spec
index 6f7bb55..798812b 100644
--- a/json-lib.spec
+++ b/json-lib.spec
@@ -1,6 +1,6 @@
 Name:           json-lib
 Version:        2.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        JSON library for Java
 License:        ASL 2.0
 URL:            http://json-lib.sourceforge.net/
@@ -28,7 +28,8 @@ BuildRequires:  mvn(commons-lang:commons-lang)
 BuildRequires:  mvn(commons-logging:commons-logging)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(net.sf.ezmorph:ezmorph)
-BuildRequires:  mvn(org.codehaus.groovy:groovy) >= 1.7.2-2
+BuildRequires:  mvn(org.codehaus.groovy:groovy18:1.8)
+BuildRequires:  mvn(org.codehaus.groovy:groovy18-all:1.8)
 BuildRequires:  mvn(oro:oro)
 BuildRequires:  mvn(xom:xom)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-site-plugin)
@@ -103,11 +104,15 @@ rm -r src/main/jdk15/net/sf/json/JSON*.java
 # should be removed from distribution
 %pom_remove_dep :commons-httpclient
 
+%pom_change_dep org.codehaus.groovy:groovy org.codehaus.groovy:groovy18:1.8
+
 cp %{SOURCE101} jenkins-%{name}-%{version}/pom.xml
 
 pushd jenkins-%{name}-%{version}
 %patch100 -p1
 
+%pom_change_dep org.codehaus.groovy:groovy-all org.codehaus.groovy:groovy18-all:1.8
+
 %pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.groovy']/pom:artifactId" groovy
 
 %mvn_file org.kohsuke.stapler:json-lib jenkins-%{name}
@@ -140,6 +145,9 @@ popd
 %doc LICENSE.txt
 
 %changelog
+* Mon Jun 23 2014 Michal Srb <msrb at redhat.com> - 2.4-7
+- Migrate to groovy18
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild