Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xbean for openSUSE:Factory checked in at 2022-03-07 17:47:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xbean (Old) and /work/SRC/openSUSE:Factory/.xbean.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xbean" Mon Mar 7 17:47:18 2022 rev:7 rq:959849 version:4.20 Changes: -------- --- /work/SRC/openSUSE:Factory/xbean/xbean.changes 2022-02-23 19:07:00.315289152 +0100 +++ /work/SRC/openSUSE:Factory/.xbean.new.1958/xbean.changes 2022-03-07 17:47:22.695112268 +0100 @@ -1,0 +2,48 @@ +Mon Mar 7 09:46:33 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Upgrade to version 4.20 + * Bugs + + XBEAN-298: FileArchive can lead to NPE + + XBEAN-326: NullpointerException in BundleAssignableClassFinder + + XBEAN-327: ASM9 bundle + + XBEAN-328: Upgrade to asm 9.0 + + XBEAN-329: trunk does not build due to unused import + + XBEAN-330: Wrong OSGi manifests in xbean-asm9-shaded + + XBEAN-331: Upgrade to asm 9.1 + * Improvements + + XBEAN-301: Add Automatic-Module-Name to xbean manifest + + XBEAN-303: asm shade NOTICE file shouldnt exist + + XBEAN-306: MultiJar release support enhancements + + XBEAN-309: Support Constructors and Static Factory Methods + in xbean-reflect + + XBEAN-310: Provide a PropertyEditorRegistry + + XBEAN-312: Ensure multi-jar are not scanned twice + + XBEAN-318: xbean-finder should log the class name on errors + + XBEAN-319: Enable xbean-finder to not store classes without + annotations + + XBEAN-320: Enable xbean-finder to not track some annotations + + XBEAN-322: Upgrade to ASM 7.2 + * New Features + + XBEAN-305: Asm 6.1.1 upgrade + + XBEAN-313: Create asm7 bundle + * Tasks + + XBEAN-296: upgrade to asm 6 + + XBEAN-302: Upgrade to asm 6.1 + + XBEAN-308: ASM 6.2 upgrade + + XBEAN-311: ASM 6.2.1 + + XBEAN-314: ASM 7.0 upgrade + + XBEAN-316: Upgrade ASM to 7.1 + + XBEAN-321: Upgrade to asm 7.2-beta + + XBEAN-323: Upgrade ASM to 7.3.1 + + XBEAN-325: Upgrade to asm 8 +- Removed patch: + * 0003-Port-to-QDox-2.0.patch + + not needed in modules that we build +- Changed patch: + * 0001-Unshade-ASM.patch -> 0002-Unbundle-ASM.patch + + Different ASM version and code structure +- Added patch: + * 0003-Remove-dependency-on-log4j-and-commons-logging.patch + + Remove unnecessary dependency on log4j and commons-logging + +------------------------------------------------------------------- Old: ---- 0001-Unshade-ASM.patch 0003-Port-to-QDox-2.0.patch xbean-4.5-source-release.zip New: ---- 0002-Unbundle-ASM.patch 0003-Remove-dependency-on-log4j-and-commons-logging.patch xbean-4.20-source-release.zip xbean-build.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xbean.spec ++++++ --- /var/tmp/diff_new_pack.OWRkvV/_old 2022-03-07 17:47:23.607112005 +0100 +++ /var/tmp/diff_new_pack.OWRkvV/_new 2022-03-07 17:47:23.611112003 +0100 @@ -17,28 +17,24 @@ Name: xbean -Version: 4.5 +Version: 4.20 Release: 0 Summary: Java plugin based web server License: Apache-2.0 Group: Development/Libraries/Java URL: https://geronimo.apache.org/xbean/ -Source0: http://repo2.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip -# Fix dependency on xbean-asm4-shaded to original objectweb-asm -Patch0: 0001-Unshade-ASM.patch -Patch2: 0003-Port-to-QDox-2.0.patch -BuildRequires: apache-commons-logging +Source0: https://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip +Source1: %{name}-build.tar.xz +Patch2: 0002-Unbundle-ASM.patch +Patch3: 0003-Remove-dependency-on-log4j-and-commons-logging.patch +BuildRequires: ant BuildRequires: fdupes -BuildRequires: java-devel >= 1.8 +BuildRequires: java-devel >= 1.7 BuildRequires: javapackages-local -BuildRequires: objectweb-asm >= 5 -BuildRequires: reload4j +BuildRequires: objectweb-asm >= 9 BuildRequires: slf4j BuildRequires: unzip -# The code uses sun.misc.URLClassloader -BuildConflicts: java-devel >= 9 -BuildConflicts: java-headless >= 9 -Requires: objectweb-asm >= 5 +Requires: objectweb-asm >= 9 Requires: slf4j BuildArch: noarch @@ -58,81 +54,71 @@ This package provides API documentation for xbean. %prep -%setup -q -# build failing on this due to doxia-sitetools problems -rm src/site/site.xml - -%patch0 -p1 +%setup -q -a1 %patch2 -p1 +%patch3 -p1 -%pom_remove_parent -%pom_remove_dep mx4j:mx4j +cp xbean-asm-util/src/main/java/org/apache/xbean/asm9/original/commons/AsmConstants.java xbean-reflect/src/main/java/org/apache/xbean/recipe/ -%pom_remove_dep -r :xbean-asm5-shaded -%pom_remove_dep -r :xbean-finder-shaded -%pom_disable_module xbean-asm5-shaded -%pom_disable_module xbean-finder-shaded +# Parent POM is not packaged +%pom_remove_parent -%pom_xpath_remove pom:scope xbean-asm-util -%pom_xpath_remove pom:optional xbean-asm-util +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 -# Prevent modules depending on springframework from building. -%pom_remove_dep org.springframework: %pom_disable_module xbean-classloader -%pom_disable_module xbean-spring -%pom_disable_module maven-xbean-plugin -rm -rf maven-xbean-plugin -# blueprint FTBFS, disable for now -%pom_disable_module xbean-blueprint - -%pom_remove_dep :xbean-bundleutils xbean-finder -rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle* +%pom_disable_module xbean-classpath %pom_disable_module xbean-bundleutils - +%pom_disable_module xbean-asm9-shaded +%pom_disable_module xbean-finder-shaded +%pom_disable_module xbean-naming +%pom_disable_module xbean-blueprint +%pom_disable_module xbean-spring %pom_disable_module xbean-telnet +%pom_disable_module maven-xbean-plugin -# maven-xbean-plugin invocation makes no sense as there are no namespaces -%pom_remove_plugin :maven-xbean-plugin xbean-classloader +%pom_remove_dep :commons-logging-api xbean-reflect +%pom_remove_dep :log4j xbean-reflect +%pom_remove_dep :xbean-asm9-shaded xbean-reflect +find -name CommonsLoggingConverter.java -delete +find -name Log4jConverter.java -delete -# As auditing tool RAT is useful for upstream only. +# Plugins useful for upstream only %pom_remove_plugin :apache-rat-plugin +%pom_remove_plugin :maven-source-plugin -# disable copy of internal aries-blueprint -sed -i "s|<Private-Package>|<!--Private-Package>|" xbean-blueprint/pom.xml -sed -i "s|</Private-Package>|</Private-Package-->|" xbean-blueprint/pom.xml +%pom_remove_dep :xbean-bundleutils xbean-finder +%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 -for i in xbean-asm-util xbean-classpath xbean-finder xbean-naming xbean-reflect; do - pushd $i - mkdir -p build/classes - javac -d build/classes -encoding utf-8 -source 6 -target 6 \ - -cp $(build-classpath reload4j commons-logging-api slf4j/api objectweb-asm/asm objectweb-asm/asm-commons):../xbean-asm-util/xbean-asm-util.jar \ - $(find src/main/java -name *.java) - jar cf $i.jar -C build/classes . - popd -done -mkdir -p build/apidoc -javadoc -d build/apidoc -source 6 -encoding utf-8 \ - -classpath $(build-classpath reload4j commons-logging-api slf4j/api objectweb-asm/asm objectweb-asm/asm-commons) \ - $(for i in xbean-asm-util xbean-classpath xbean-finder xbean-naming xbean-reflect; do find $i/src/main/java -name *.java; done | xargs) +mkdir -p lib +build-jar-repository -s lib objectweb-asm slf4j +%{ant} package javadoc %install -# jars && poms +# jars install -dm 755 %{buildroot}%{_javadir}/%{name} +for i in xbean-asm-util xbean-finder xbean-reflect; do + install -m 0644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar +done + +# poms install -dm 755 %{buildroot}%{_mavenpomdir}/%{name} -for i in xbean-asm-util xbean-classpath xbean-finder xbean-naming xbean-reflect; do - install -m 0644 $i/$i.jar %{buildroot}%{_javadir}/%{name} - %pom_remove_parent ${i} - %pom_xpath_inject pom:project "<groupId>org.apache.xbean</groupId><version>%{version}</version>" ${i} - install -m 0644 $i/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$i.pom - %add_maven_depmap %{name}/$i.pom %{name}/$i.jar +for i in xbean-asm-util xbean-finder xbean-reflect; do + install -m 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom + %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar done # javadoc install -dm 755 %{buildroot}/%{_javadocdir}/%{name} -cp -aL build/apidoc/* %{buildroot}/%{_javadocdir}/%{name} +for i in xbean-asm-util xbean-finder xbean-reflect; do + cp -r ${i}/target/site/apidocs %{buildroot}/%{_javadocdir}/%{name}/${i} +done %fdupes -s %{buildroot}/%{_javadocdir}/%{name} %files -f .mfiles ++++++ 0002-Unbundle-ASM.patch ++++++ >From 4f7a61dcd47ed0dee2d78e31e2dd50b88ab42f25 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski <mizde...@redhat.com> Date: Thu, 12 Dec 2019 08:51:57 +0100 Subject: [PATCH 2/3] Unbundle ASM --- .../xbean/recipe/XbeanAsmParameterNameLoader.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java b/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java index 20b646c..9e96775 100644 --- a/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java +++ b/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java @@ -17,11 +17,11 @@ */ package org.apache.xbean.recipe; -import org.apache.xbean.asm9.ClassReader; -import org.apache.xbean.asm9.ClassVisitor; -import org.apache.xbean.asm9.Label; -import org.apache.xbean.asm9.MethodVisitor; -import org.apache.xbean.asm9.Type; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Type; import java.io.IOException; import java.io.InputStream; @@ -36,7 +36,7 @@ import java.util.List; import java.util.Map; import java.util.WeakHashMap; -import static org.apache.xbean.asm9.shade.commons.AsmConstants.ASM_VERSION; +import static org.apache.xbean.asm9.original.commons.AsmConstants.ASM_VERSION; /** * Implementation of ParameterNameLoader that uses ASM to read the parameter names from the local variable table in the -- 2.29.2 ++++++ 0003-Remove-dependency-on-log4j-and-commons-logging.patch ++++++ >From 28e37850d8343f44f82e3138c772dd65d1d0ff2f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski <mizde...@redhat.com> Date: Thu, 12 Dec 2019 08:52:26 +0100 Subject: [PATCH 3/3] Remove dependency on log4j and commons-logging --- .../xbean/propertyeditor/PropertyEditorRegistry.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditorRegistry.java b/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditorRegistry.java index e7e17edd..be302861 100644 --- a/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditorRegistry.java +++ b/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditorRegistry.java @@ -84,18 +84,6 @@ public class PropertyEditorRegistry implements Closeable { register(new VectorEditor()); register(new WeakHashMapEditor()); - try { - register(new Log4jConverter()); - } catch (final Throwable e) { - // no-op - } - - try { - register(new CommonsLoggingConverter()); - } catch (final Throwable e) { - // no-op - } - return this; } -- 2.21.0
