diff --git a/json-lib-2.4-jenkins-3.pom b/json-lib-2.4-jenkins-3.pom index 3c9abdf..c1b3590 100644 --- a/json-lib-2.4-jenkins-3.pom +++ b/json-lib-2.4-jenkins-3.pom @@ -228,7 +228,7 @@ org.codehaus.groovy groovy-all - 1.8.0 + 2.4.8 compile true diff --git a/json-lib.spec b/json-lib.spec index 21e4c97..ba202f4 100644 --- a/json-lib.spec +++ b/json-lib.spec @@ -1,6 +1,6 @@ Name: json-lib Version: 2.4 -Release: 17 +Release: 18 Summary: JSON library for Java License: ASL 2.0 URL: http://json-lib.sourceforge.net/ @@ -16,7 +16,7 @@ BuildRequires: mvn(commons-collections:commons-collections) mvn(junit:junit) mv BuildRequires: mvn(commons-logging:commons-logging) mvn(net.sf.ezmorph:ezmorph) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) mvn(oro:oro) mvn(xom:xom) BuildRequires: mvn(org.apache.maven.plugins:maven-site-plugin) mvn(xmlunit:xmlunit) -BuildRequires: mvn(org.codehaus.groovy:groovy18:1.8) mvn(org.codehaus.groovy:groovy18-all:1.8) +BuildRequires: mvn(org.codehaus.groovy:groovy) mvn(org.codehaus.groovy:groovy-all) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) mvn(antlr:antlr) mvn(asm:asm-all) BuildRequires: mvn(commons-cli:commons-cli) mvn(org.slf4j:slf4j-nop) @@ -60,13 +60,11 @@ rm -r src/main/jdk15/net/sf/json/JSON*.java ' %pom_remove_dep :commons-httpclient -%pom_change_dep org.codehaus.groovy:groovy org.codehaus.groovy:groovy18:1.8 install %{SOURCE2} jenkins-json-lib-%{version}/pom.xml cd jenkins-json-lib-%{version} -%pom_change_dep org.codehaus.groovy:groovy-all org.codehaus.groovy:groovy18-all:1.8 %mvn_file org.kohsuke.stapler:json-lib jenkins-%{name} %mvn_package org.kohsuke.stapler:json-lib jenkins-json-lib @@ -97,6 +95,9 @@ cd - %license LICENSE.txt %changelog +* Tue Feb 2 2021 wutao - 2.4-18 +- change depdencies to groovy + * Mon Sep 14 2020 wangyue - 2.4-17 - Fix build errors