[stapler] Build against proper json-lib library
Michal Srb
msrb at fedoraproject.org
Wed Feb 19 13:43:44 UTC 2014
commit c588b0fb101b458ab55b2d2014a44e52f68130ea
Author: Michal Srb <msrb at redhat.com>
Date: Wed Feb 19 14:44:18 2014 +0100
Build against proper json-lib library
stapler.spec | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/stapler.spec b/stapler.spec
index bb412ee..525560f 100644
--- a/stapler.spec
+++ b/stapler.spec
@@ -1,6 +1,6 @@
Name: stapler
Version: 1.223
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Stapler Java web framework
# Project is licensed mostly under 2-clause BSD license
@@ -37,7 +37,7 @@ BuildRequires: mvn(commons-io:commons-io)
BuildRequires: mvn(dom4j:dom4j)
BuildRequires: mvn(javax.servlet:jsp-api)
BuildRequires: mvn(javax.servlet:servlet-api)
-BuildRequires: mvn(net.sf.json-lib:json-lib)
+BuildRequires: mvn(org.kohsuke.stapler:json-lib)
BuildRequires: mvn(net.sf.ezmorph:ezmorph)
BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
@@ -107,10 +107,6 @@ cp %{SOURCE1} LICENSE
# Missing org.zeroturnaround:jr-sdk
%pom_disable_module jrebel
-# Fix json-lib groupId
-%pom_xpath_replace "pom:dependency[pom:groupId[text()='org.kohsuke.stapler']]/pom:groupId" \
- "<groupId>net.sf.json-lib</groupId>" core
-
# Use groovy with shaded asm3
%pom_remove_dep :groovy-all core
%pom_add_dep org.codehaus.groovy:groovy18-all:1.8 core
@@ -176,6 +172,9 @@ cp %{SOURCE1} LICENSE
%changelog
+* Wed Feb 19 2014 Michal Srb <msrb at redhat.com> - 1.223-6
+- Build against proper json-lib library
+
* Fri Jan 10 2014 Michal Srb <msrb at redhat.com> - 1.223-5
- Remove unneeded patch
More information about the scm-commits
mailing list