Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/xbean.git#9be8087e92dc6f055ce57cb2f33a70e0f8f0bfe9

xbean.spec

@@ -4,7 +4,7 @@
 Name:           xbean
 Summary:        Java plugin based web server
 Version:        4.15
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        ASL 2.0
 
 URL:            http://geronimo.apache.org/xbean/
@@ -95,6 +95,7 @@ sed -i 's/org\.apache\.xbean\.asm7/org.objectweb.asm/g' `find xbean-reflect -nam
 sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apache/xbean/finder/archive/MJarJarArchiveTest.java
 
 # Unused import which is not available in OpenJDK 11
+# Forwarded upstream: https://issues.apache.org/jira/browse/XBEAN-329
 sed -i '/import com.sun.org.apache.regexp.internal.RE/d' xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java
 
 %if %{without equinox}
@@ -131,6 +132,9 @@ sed -i '/import com.sun.org.apache.regexp.internal.RE/d' xbean-reflect/src/main/
 
 
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.15-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Wed Sep 09 2020 Fabio Valentini <decathorpe@gmail.com> - 4.15-6
 - Switch from log4j 1.2 compat package to log4j 1.2 API shim.