packages/json-lib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!4 change dep

Browse Source 
From: @jackie_wu123
Reviewed-by: @licihua
Signed-off-by: @licihua
This commit is contained in:
openeuler-ci-bot 2021-02-02 19:01:25 +08:00 committed by Gitee
commit e439dd9866
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
json-lib-2.4-jenkins-3.pom
View File

@ -228,7 +228,7 @@
<dependency> <dependency>
<groupId>org.codehaus.groovy</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId> <artifactId>groovy-all</artifactId>
<version>1.8.0</version> <version>2.4.8</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

9
json-lib.spec
View File

@ -1,6 +1,6 @@
Name: json-lib Name: json-lib
Version: 2.4 Version: 2.4
Release: 17 Release: 18
Summary: JSON library for Java Summary: JSON library for Java
License: ASL 2.0 License: ASL 2.0
URL: http://json-lib.sourceforge.net/ 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(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-antrun-plugin) mvn(oro:oro) mvn(xom:xom)
BuildRequires: mvn(org.apache.maven.plugins:maven-site-plugin) mvn(xmlunit:xmlunit) 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(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) 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
</configuration>' </configuration>'
%pom_remove_dep :commons-httpclient %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 install %{SOURCE2} jenkins-json-lib-%{version}/pom.xml
cd jenkins-json-lib-%{version} 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_file org.kohsuke.stapler:json-lib jenkins-%{name}
%mvn_package org.kohsuke.stapler:json-lib jenkins-json-lib %mvn_package org.kohsuke.stapler:json-lib jenkins-json-lib
@ -97,6 +95,9 @@ cd -
%license LICENSE.txt %license LICENSE.txt
%changelog %changelog
* Tue Feb 2 2021 wutao <wutao61@huawei.com> - 2.4-18
- change depdencies to groovy
* Mon Sep 14 2020 wangyue <wangyue92@huawei.com> - 2.4-17 * Mon Sep 14 2020 wangyue <wangyue92@huawei.com> - 2.4-17
- Fix build errors - Fix build errors