Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hawtjni-runtime for openSUSE:Factory checked in at 2022-03-29 21:06:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hawtjni-runtime (Old) and /work/SRC/openSUSE:Factory/.hawtjni-runtime.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hawtjni-runtime" Tue Mar 29 21:06:54 2022 rev:9 rq:965687 version:1.18 Changes: -------- --- /work/SRC/openSUSE:Factory/hawtjni-runtime/hawtjni-maven-plugin.changes 2022-03-24 22:58:55.268303862 +0100 +++ /work/SRC/openSUSE:Factory/.hawtjni-runtime.new.1900/hawtjni-maven-plugin.changes 2022-03-29 21:06:56.193113436 +0200 @@ -1,0 +2,8 @@ +Mon Mar 28 18:09:22 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Upgrade to version 1.18 +- Added patch: + * use-commons-lang3.patch + + use commons-lang3 instead of the old commons-lang + +------------------------------------------------------------------- hawtjni-runtime.changes: same change Old: ---- hawtjni-project-1.17.tar.gz New: ---- hawtjni-project-1.18.tar.gz use-commons-lang3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawtjni-maven-plugin.spec ++++++ --- /var/tmp/diff_new_pack.XkITtr/_old 2022-03-29 21:06:58.581115508 +0200 +++ /var/tmp/diff_new_pack.XkITtr/_new 2022-03-29 21:06:58.585115511 +0200 @@ -17,12 +17,13 @@ Name: hawtjni-maven-plugin -Version: 1.17 +Version: 1.18 Release: 0 Summary: Use HawtJNI from a maven plugin License: Apache-2.0 AND EPL-1.0 AND BSD-3-Clause URL: https://github.com/fusesource/hawtjni Source0: https://github.com/fusesource/hawtjni/archive/hawtjni-project-%{version}.tar.gz +Patch0: use-commons-lang3.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) @@ -57,6 +58,7 @@ %prep %setup -q -n hawtjni-hawtjni-project-%{version} +%patch0 -p1 # We build only the maven plugin in this one %pom_disable_module hawtjni-example ++++++ hawtjni-runtime.spec ++++++ --- /var/tmp/diff_new_pack.XkITtr/_old 2022-03-29 21:06:58.613115535 +0200 +++ /var/tmp/diff_new_pack.XkITtr/_new 2022-03-29 21:06:58.617115540 +0200 @@ -17,14 +17,15 @@ Name: hawtjni-runtime -Version: 1.17 +Version: 1.18 Release: 0 Summary: HawtJNI Runtime License: Apache-2.0 AND EPL-1.0 AND BSD-3-Clause URL: https://github.com/fusesource/hawtjni Source0: https://github.com/fusesource/hawtjni/archive/hawtjni-project-%{version}.tar.gz +Patch0: use-commons-lang3.patch BuildRequires: apache-commons-cli -BuildRequires: apache-commons-lang +BuildRequires: apache-commons-lang3 BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local @@ -46,7 +47,7 @@ Summary: Code generator that produces the JNI code Requires: %{name} = %{version} Requires: apache-commons-cli -Requires: apache-commons-lang +Requires: apache-commons-lang3 Requires: javapackages-tools Requires: objectweb-asm >= 5 Requires: xbean @@ -60,6 +61,7 @@ %prep %setup -q -n hawtjni-hawtjni-project-%{version} +%patch0 -p1 %pom_disable_module hawtjni-example %pom_disable_module hawtjni-maven-plugin @@ -67,7 +69,7 @@ %pom_remove_plugin -r :maven-eclipse-plugin # this dependency seems to be missing -%pom_add_dep commons-lang:commons-lang hawtjni-generator +%pom_add_dep org.apache.commons:commons-lang3 hawtjni-generator for mod in runtime generator; do %pom_remove_parent hawtjni-${mod} @@ -84,13 +86,13 @@ mkdir -p hawtjni-generator/build/classes javac -d hawtjni-generator/build/classes \ -source 8 -target 8 \ - -cp $(build-classpath commons-cli commons-lang objectweb-asm/asm-all xbean/xbean-finder xbean/xbean-asm-util):hawtjni-runtime.jar \ + -cp $(build-classpath commons-cli commons-lang3 objectweb-asm/asm-all xbean/xbean-finder xbean/xbean-asm-util):hawtjni-runtime.jar \ $(find hawtjni-generator/src/main/java/ -name *.java | xargs) jar cf hawtjni-generator.jar -C hawtjni-generator/build/classes . jar uf hawtjni-generator.jar -C hawtjni-generator/src/main/resources . mkdir -p hawtjni-runtime/build/apidoc javadoc -d hawtjni-runtime/build/apidoc -source 8 \ - -classpath $(build-classpath commons-cli commons-lang objectweb-asm/asm-all xbean/xbean-finder xbean/xbean-asm-util) \ + -classpath $(build-classpath commons-cli commons-lang3 objectweb-asm/asm-all xbean/xbean-finder xbean/xbean-asm-util) \ $(find hawtjni-runtime/src/main/java/ -name *.java && \ find hawtjni-generator/src/main/java/ -name *.java| xargs) @@ -113,7 +115,7 @@ cp -pr hawtjni-runtime/build/apidoc/* %{buildroot}%{_javadocdir}/hawtjni/ %fdupes -s %{buildroot}%{_javadocdir}/hawtjni/ -%{jpackage_script org.fusesource.hawtjni.generator.HawtJNI "" "" commons-cli:commons-lang:objectweb-asm/asm-all:xbean/xbean-finder:xbean/xbean-asm-util:hawtjni/hawtjni-runtime:hawtjni/hawtjni-generator hawtjni-generator true} +%{jpackage_script org.fusesource.hawtjni.generator.HawtJNI "" "" commons-cli:commons-lang3:objectweb-asm/asm-all:xbean/xbean-finder:xbean/xbean-asm-util:hawtjni/hawtjni-runtime:hawtjni/hawtjni-generator hawtjni-generator true} %files -f .mfiles %license license.txt ++++++ hawtjni-project-1.17.tar.gz -> hawtjni-project-1.18.tar.gz ++++++ ++++ 1850 lines of diff (skipped) ++++++ use-commons-lang3.patch ++++++ --- a/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/model/ReflectField.java +++ b/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/model/ReflectField.java @@ -13,7 +13,7 @@ import java.lang.reflect.Field; import java.util.Arrays; import java.util.HashSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.fusesource.hawtjni.runtime.FieldFlag; import org.fusesource.hawtjni.runtime.JniField; import org.fusesource.hawtjni.runtime.T32;