Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xbean for openSUSE:Factory checked
in at 2023-10-25 18:05:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xbean (Old)
and /work/SRC/openSUSE:Factory/.xbean.new.24901 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xbean"
Wed Oct 25 18:05:28 2023 rev:8 rq:1120324 version:4.20
Changes:
--------
--- /work/SRC/openSUSE:Factory/xbean/xbean.changes 2022-03-07
17:47:22.695112268 +0100
+++ /work/SRC/openSUSE:Factory/.xbean.new.24901/xbean.changes 2023-10-25
18:06:11.581244000 +0200
@@ -1,0 +2,5 @@
+Wed Oct 25 14:55:09 UTC 2023 - Fridrich Strba <fst...@suse.com>
+
+- Build with source/target 8 to fix build with jdk 21
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xbean.spec ++++++
--- /var/tmp/diff_new_pack.jzHdks/_old 2023-10-25 18:06:12.069260413 +0200
+++ /var/tmp/diff_new_pack.jzHdks/_new 2023-10-25 18:06:12.069260413 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xbean
#
-# 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
@@ -29,13 +29,11 @@
Patch3: 0003-Remove-dependency-on-log4j-and-commons-logging.patch
BuildRequires: ant
BuildRequires: fdupes
-BuildRequires: java-devel >= 1.7
-BuildRequires: javapackages-local
+BuildRequires: java-devel >= 1.8
+BuildRequires: javapackages-local >= 6
BuildRequires: objectweb-asm >= 9
BuildRequires: slf4j
BuildRequires: unzip
-Requires: objectweb-asm >= 9
-Requires: slf4j
BuildArch: noarch
%description
@@ -60,14 +58,6 @@
cp
xbean-asm-util/src/main/java/org/apache/xbean/asm9/original/commons/AsmConstants.java
xbean-reflect/src/main/java/org/apache/xbean/recipe/
-# Parent POM is not packaged
-%pom_remove_parent
-
-for i in xbean-asm-util xbean-finder xbean-reflect; do
- %pom_remove_parent ${i}
- %pom_xpath_inject pom:project
"<groupId>org.apache.xbean</groupId><version>%{version}</version>" ${i}
-done
-
%pom_disable_module xbean-classloader
%pom_disable_module xbean-classpath
%pom_disable_module xbean-bundleutils
@@ -93,8 +83,6 @@
%pom_remove_dep org.osgi:org.osgi.core xbean-finder
rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle*
-%pom_change_dep -r -f ::::: :::::
-
%build
mkdir -p lib
build-jar-repository -s lib objectweb-asm slf4j
@@ -110,7 +98,7 @@
# poms
install -dm 755 %{buildroot}%{_mavenpomdir}/%{name}
for i in xbean-asm-util xbean-finder xbean-reflect; do
- install -m 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
+ %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
%add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar
done
++++++ xbean-build.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/common.xml new/common.xml
--- old/common.xml 2022-03-07 10:20:50.822968473 +0100
+++ new/common.xml 2023-10-25 16:53:01.090841058 +0200
@@ -8,7 +8,8 @@
<property name="bundle.version" value="${project.version}.0"/>
- <property name="compiler.source" value="1.7"/>
+ <property name="compiler.release" value="8"/>
+ <property name="compiler.source" value="1.${compiler.release}"/>
<property name="compiler.target" value="${compiler.source}"/>
</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xbean-asm-util/build.xml new/xbean-asm-util/build.xml
--- old/xbean-asm-util/build.xml 2022-03-07 10:42:18.670644581 +0100
+++ new/xbean-asm-util/build.xml 2023-10-25 16:53:42.931127494 +0200
@@ -49,6 +49,7 @@
encoding="utf-8"
optimize="false"
deprecation="false"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xbean-finder/build.xml new/xbean-finder/build.xml
--- old/xbean-finder/build.xml 2022-03-07 10:42:31.534721656 +0100
+++ new/xbean-finder/build.xml 2023-10-25 16:53:37.011087101 +0200
@@ -50,6 +50,7 @@
encoding="utf-8"
optimize="false"
deprecation="false"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xbean-reflect/build.xml new/xbean-reflect/build.xml
--- old/xbean-reflect/build.xml 2022-03-07 10:42:37.774759043 +0100
+++ new/xbean-reflect/build.xml 2023-10-25 16:53:26.604349450 +0200
@@ -49,6 +49,7 @@
encoding="utf-8"
optimize="false"
deprecation="false"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
