Hello community, here is the log from the commit of package json-lib for openSUSE:Factory checked in at 2019-12-16 15:20:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/json-lib (Old) and /work/SRC/openSUSE:Factory/.json-lib.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "json-lib" Mon Dec 16 15:20:51 2019 rev:3 rq:757284 version:2.4 Changes: -------- --- /work/SRC/openSUSE:Factory/json-lib/json-lib.changes 2019-11-26 17:01:14.488070585 +0100 +++ /work/SRC/openSUSE:Factory/.json-lib.new.4691/json-lib.changes 2019-12-16 15:20:51.867126773 +0100 @@ -1,0 +2,6 @@ +Mon Dec 16 09:24:00 UTC 2019 - Fridrich Strba <[email protected]> + +- Adapt to removal of some compatibility names from groovy18 + package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ json-lib.spec ++++++ --- /var/tmp/diff_new_pack.eUrmOg/_old 2019-12-16 15:20:52.511126505 +0100 +++ /var/tmp/diff_new_pack.eUrmOg/_new 2019-12-16 15:20:52.511126505 +0100 @@ -44,8 +44,8 @@ BuildRequires: mvn(net.sf.ezmorph:ezmorph) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache:apache:pom:) -BuildRequires: mvn(org.codehaus.groovy:groovy18-all:1.8) -BuildRequires: mvn(org.codehaus.groovy:groovy18:1.8) +BuildRequires: mvn(org.codehaus.groovy:groovy-all:1.8) +BuildRequires: mvn(org.codehaus.groovy:groovy:1.8) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.slf4j:slf4j-nop) BuildRequires: mvn(oro:oro) @@ -80,8 +80,6 @@ # src/main/jdk15/net/sf/json/util/EnumMorpher.java %patch0 -p1 -%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.groovy']/pom:artifactId" groovy - %pom_remove_plugin :maven-compiler-plugin %pom_remove_plugin :gmaven-plugin @@ -100,7 +98,7 @@ # should be removed from distribution %pom_remove_dep :commons-httpclient -%pom_change_dep org.codehaus.groovy:groovy org.codehaus.groovy:groovy18:1.8 +%pom_change_dep org.codehaus.groovy:: org.codehaus.groovy::1.8 # Remove the -SNAPSHOT postfix %pom_xpath_set pom:project/pom:version "2.4-jenkins-3" jenkins-%{name}-%{version}/pom.xml @@ -108,7 +106,7 @@ pushd jenkins-%{name}-%{version} %patch100 -p1 -%pom_change_dep org.codehaus.groovy:groovy-all org.codehaus.groovy:groovy18-all:1.8 +%pom_change_dep org.codehaus.groovy:groovy-all org.codehaus.groovy:groovy-all:1.8 %{mvn_file} org.kohsuke.stapler:json-lib jenkins-%{name} %{mvn_package} org.kohsuke.stapler:json-lib jenkins-json-lib
