Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package apache-commons-collections for
openSUSE:Factory checked in at 2023-10-26 17:13:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-commons-collections (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-collections.new.24901 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-commons-collections"
Thu Oct 26 17:13:41 2023 rev:16 rq:1120349 version:3.2.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/apache-commons-collections/apache-commons-collections.changes
2022-05-05 23:08:22.417705616 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-collections.new.24901/apache-commons-collections.changes
2023-10-26 17:14:34.052596232 +0200
@@ -1,0 +2,9 @@
+Wed Oct 25 16:30:13 UTC 2023 - Fridrich Strba <fst...@suse.com>
+
+- Modified patch:
+ * commons-collections-3.2-build_xml.patch
+ + In ant Javac task, use "release" with compilers that support
+ it. Use source/target for others. Fixes some return value
+ incompatibilities with jdk 21
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-collections.spec ++++++
--- /var/tmp/diff_new_pack.pT5IA3/_old 2023-10-26 17:14:35.208638690 +0200
+++ /var/tmp/diff_new_pack.pT5IA3/_new 2023-10-26 17:14:35.212638837 +0200
@@ -1,7 +1,7 @@
#
# spec file for package apache-commons-collections
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -38,7 +38,7 @@
BuildRequires: ant-junit
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
-BuildRequires: javapackages-local
+BuildRequires: javapackages-local >= 6
BuildRequires: junit
Provides: %{short_name} = %{version}-%{release}
Obsoletes: %{short_name} < %{version}-%{release}
@@ -96,14 +96,11 @@
%patch4 -p1
%patch5 -p1
-%pom_remove_parent .
-
%build
echo "junit.jar=$(build-classpath junit)" >>build.properties
ant \
- -Dant.build.javac.source=8 -Dant.build.javac.target=8 \
- -Dant.build.javadoc.source=8 -Dtf.build.docs=build/docs/apidocs/ \
- -Djava.io.tmpdir=. jar javadoc tf.validate tf.jar dist.bin dist.src
tf.javadoc
+ -Dtf.build.docs=build/docs/apidocs/ -Djava.io.tmpdir=. \
+ jar javadoc tf.validate tf.jar dist.bin dist.src tf.javadoc
%install
# jars
@@ -115,7 +112,7 @@
# poms
install -d -m 0755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
%add_maven_depmap %{short_name}.pom %{short_name}.jar -a
"org.apache.commons:%{short_name}"
%add_maven_depmap %{short_name}:%{short_name}-testframework:%{version}
%{short_name}-testframework.jar -f "testframework" -a
"org.apache.commons:%{short_name}-testframework"
++++++ commons-collections-3.2-build_xml.patch ++++++
--- /var/tmp/diff_new_pack.pT5IA3/_old 2023-10-26 17:14:35.240639865 +0200
+++ /var/tmp/diff_new_pack.pT5IA3/_new 2023-10-26 17:14:35.244640012 +0200
@@ -1,6 +1,26 @@
---- build.xml.orig 2008-11-29 21:16:01.000000000 +0200
-+++ build.xml 2008-11-29 21:17:28.000000000 +0200
-@@ -286,7 +286,7 @@
+--- build.xml 2023-10-25 18:15:51.721217809 +0200
++++ build.xml 2023-10-25 18:26:44.848980199 +0200
+@@ -124,6 +124,9 @@
+ <mkdir dir="${build.classes}"/>
+ <javac srcdir="${source.java}"
+ destdir="${build.classes}"
++ release="8"
++ source="8"
++ target="8"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}">
+@@ -267,6 +270,9 @@
+ <mkdir dir="${build.tests}"/>
+ <javac srcdir="${source.test}"
+ destdir="${build.tests}"
++ release="8"
++ source="8"
++ target="8"
+ debug="true"
+ deprecation="false"
+ optimize="false">
+@@ -286,7 +292,7 @@
<!-- Runs all tests -->
<target name="-test-all" depends="compile.tests" unless="testcase">
<mkdir dir="${build.test.reports}"/>
@@ -9,7 +29,7 @@
<formatter type="brief" />
<classpath>
<pathelement location="${build.classes}"/>
-@@ -331,7 +331,7 @@
+@@ -331,7 +337,7 @@
<target name="testjar" depends="compile.tests,jar"
description="Run all unit test cases">
<echo message="Running collections tests against built jar ..."/>
@@ -18,4 +38,30 @@
<classpath>
<pathelement location="${build.jar.name}"/>
<pathelement location="${build.tests}"/>
+@@ -355,6 +361,7 @@
+ <delete dir="${build.docs}"/>
+ <mkdir dir="${build.docs}"/>
+ <javadoc sourcepath="${source.java}"
++ source="8"
+ destdir="${build.docs}"
+ packagenames="${component.package}.*"
+ access="${javadoc.access}"
+@@ -412,6 +419,9 @@
+ <javac srcdir="${source.test}"
+ destdir="${tf.build.tf}"
+ debug="true"
++ release="8"
++ source="8"
++ target="8"
+ deprecation="false"
+ optimize="false">
+ <patternset refid="tf.patternset.validate" />
+@@ -453,6 +463,7 @@
+ <delete dir="${tf.build.docs}"/>
+ <mkdir dir="${tf.build.docs}"/>
+ <javadoc destdir="${tf.build.docs}"
++ source="8"
+ access="protected"
+ author="false"
+ version="false"
