Compare commits
No commits in common. "c8-stream-201902" and "stream-javapackages-tools-202201-rhel-9.1.0" have entirely different histories.
c8-stream-
...
stream-jav
|
|
@ -1 +1,21 @@
|
|||
SOURCES/xbean-4.14-source-release.zip
|
||||
/results_*
|
||||
/*.src.rpm
|
||||
|
||||
/xbean-3.7.tar.xz
|
||||
/xbean-3.8.tar.xz
|
||||
/xbean-3.11.1.tar.xz
|
||||
/xbean-3.13-source-release.zip
|
||||
/xbean-3.16-source-release.zip
|
||||
/xbean-3.17-source-release.zip
|
||||
/xbean-4.1-source-release.zip
|
||||
/xbean-4.2-source-release.zip
|
||||
/xbean-4.3-source-release.zip
|
||||
/xbean-4.4-source-release.zip
|
||||
/xbean-4.5-source-release.zip
|
||||
/xbean-4.6-source-release.zip
|
||||
/xbean-4.8-source-release.zip
|
||||
/xbean-4.9-source-release.zip
|
||||
/xbean-4.14-source-release.zip
|
||||
/xbean-4.15-source-release.zip
|
||||
/xbean-4.17-source-release.zip
|
||||
/xbean-4.18-source-release.zip
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
497ebf707991d132a296f84e8bf25fb9daa2fa69 SOURCES/xbean-4.14-source-release.zip
|
||||
3dd044457b459b0114bf218c52ff6af4d7bf7001 xbean-4.18-source-release.zip
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
From c7b2913a7d552929a3182901466db69ba40e4340 Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Thu, 12 Dec 2019 08:51:36 +0100
|
||||
Subject: [PATCH 1/3] Remove unused import
|
||||
|
||||
---
|
||||
.../java/org/apache/xbean/propertyeditor/PropertyEditors.java | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java b/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java
|
||||
index dda3bf4d..5c6285f2 100644
|
||||
--- a/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java
|
||||
+++ b/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java
|
||||
@@ -19,8 +19,6 @@ package org.apache.xbean.propertyeditor;
|
||||
import java.beans.PropertyEditorManager;
|
||||
import java.lang.reflect.Type;
|
||||
|
||||
-import com.sun.org.apache.regexp.internal.RE;
|
||||
-
|
||||
/**
|
||||
* The property editor manager. This orchestrates Geronimo usage of
|
||||
* property editors, allowing additional search paths to be added and
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
From 4f7a61dcd47ed0dee2d78e31e2dd50b88ab42f25 Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@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
|
||||
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
From 28e37850d8343f44f82e3138c772dd65d1d0ff2f Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@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
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
SHA512 (xbean-4.18-source-release.zip) = 766746caa4f9ea87ceff1af1fe052481a9478cab4754b18cb7c760fb9dc466e5fd85533f2040583c3378cf36a4e17ba357d48060896af86a933916008cb2dda6
|
||||
|
|
@ -1,20 +1,31 @@
|
|||
%bcond_with bootstrap
|
||||
|
||||
Name: xbean
|
||||
Version: 4.14
|
||||
Release: 3%{?dist}
|
||||
Version: 4.18
|
||||
Release: 8%{?dist}
|
||||
Summary: Java plugin based web server
|
||||
License: ASL 2.0
|
||||
URL: http://geronimo.apache.org/xbean/
|
||||
URL: https://geronimo.apache.org/xbean/
|
||||
BuildArch: noarch
|
||||
ExclusiveArch: %{java_arches} noarch
|
||||
|
||||
Source0: http://repo2.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
Source0: https://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
|
||||
Patch1: 0001-Remove-unused-import.patch
|
||||
Patch2: 0002-Unbundle-ASM.patch
|
||||
Patch3: 0003-Remove-dependency-on-log4j-and-commons-logging.patch
|
||||
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: javapackages-bootstrap
|
||||
%else
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(commons-logging:commons-logging-api)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(log4j:log4j:1.2.12)
|
||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||
BuildRequires: mvn(org.osgi:org.osgi.core)
|
||||
BuildRequires: mvn(org.ow2.asm:asm)
|
||||
BuildRequires: mvn(org.ow2.asm:asm-commons)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
%endif
|
||||
|
||||
%description
|
||||
The goal of XBean project is to create a plugin based server
|
||||
|
|
@ -25,7 +36,6 @@ support for running with no IoC system, JMX without JMX code,
|
|||
lifecycle and class loader management, and a rock solid Spring
|
||||
integration.
|
||||
|
||||
|
||||
%package javadoc
|
||||
Summary: API documentation for %{name}
|
||||
|
||||
|
|
@ -34,47 +44,146 @@ This package provides %{summary}.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
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
|
||||
|
||||
%pom_disable_module xbean-classloader
|
||||
%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
|
||||
|
||||
%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
|
||||
|
||||
# Plugins useful for upstream only
|
||||
%pom_remove_plugin :apache-rat-plugin
|
||||
%pom_remove_plugin :maven-source-plugin
|
||||
|
||||
# Unshade ASM
|
||||
%pom_remove_dep :xbean-asm7-shaded xbean-reflect
|
||||
sed -i 's/org\.apache\.xbean\.asm7/org.objectweb.asm/g' xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
|
||||
%pom_remove_dep :xbean-bundleutils xbean-finder
|
||||
rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle*
|
||||
|
||||
# Unused import which is not available in OpenJDK 11
|
||||
sed -i '/import com.sun.org.apache.regexp.internal.RE/d' xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java
|
||||
# Disable one test that fails on JDK 11
|
||||
sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apache/xbean/finder/archive/MJarJarArchiveTest.java
|
||||
|
||||
%build
|
||||
%mvn_build -- -f xbean-reflect
|
||||
%mvn_build -- -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
%files -f .mfiles
|
||||
%doc LICENSE NOTICE
|
||||
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%doc LICENSE NOTICE
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.18-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 4.18-7
|
||||
- Rebuilt for java-17-openjdk as system jdk
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.18-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-5
|
||||
- Set explicit Java compiler source/target levels to 1.7
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.18-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Mon Jun 21 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-3
|
||||
- Enable xbean-finder
|
||||
- Resolves: rhbz#1969297
|
||||
|
||||
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-2
|
||||
- Bootstrap build
|
||||
- Non-bootstrap build
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.15-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jan 26 2021 Marian Koncek <mkoncek@redhat.com> - 4.18-1
|
||||
- Update to upstream version 4.18
|
||||
|
||||
* 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.
|
||||
|
||||
* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 4.17-1
|
||||
- Update to upsteam version 4.17
|
||||
|
||||
* Wed Jul 29 2020 Mat Booth <mat.booth@redhat.com> - 4.15-5
|
||||
- Remove springframework conditionals, the deps are a long time removed from
|
||||
Fedora and this simplifies the spec a bit
|
||||
- Disable unused modules that can't build on JDK 11
|
||||
|
||||
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 4.15-4
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Thu Jun 25 2020 Jeff Johnston <jjohnstn@redhat.com> - 4.15-3
|
||||
- Fix JVM as 1.8.0 as package cannot be built with Java 9 and above
|
||||
|
||||
* Fri May 15 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.14-4
|
||||
- Remove dependency on log4j and commons-logging
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.15-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Nov 13 2019 Fabio Valentini <decathorpe@gmail.com> - 4.15-1
|
||||
- Update to version 4.15.
|
||||
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.14-3
|
||||
- Mass rebuild for javapackages-tools 201902
|
||||
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.14-2
|
||||
- Disable all modules except xbean-reflect
|
||||
|
||||
* Wed Sep 18 2019 Fabio Valentini <decathorpe@gmail.com> - 4.14-2
|
||||
- Migrate from the obsolete felix-osgi-core to osgi-core.
|
||||
|
||||
* Tue Aug 20 2019 Fabio Valentini <decathorpe@gmail.com> - 4.14-1
|
||||
- Update to version 4.14.
|
||||
|
||||
* Sun Jul 28 2019 Fabio Valentini <decathorpe@gmail.com> - 4.9-5
|
||||
- Disable support for spring and groovy.
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.9-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Tue Jul 09 2019 Fabio Valentini <decathorpe@gmail.com> - 4.9-3
|
||||
- Disable eclipse equinox functionality to fix the FTBFS issue on 32bit arches.
|
||||
|
||||
* Wed Jun 26 2019 Marian Koncek <mkoncek@redhat.com> - 4.14-1
|
||||
- Update to upstream version 4.14
|
||||
|
||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.8-2
|
||||
- Mass rebuild for javapackages-tools 201901
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.9-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Aug 07 2018 Michael Simacek <msimacek@redhat.com> - 4.9-1
|
||||
- Update to upstream version 4.9
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.8-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Apr 19 2018 Michael Simacek <msimacek@redhat.com> - 4.8-1
|
||||
- Update to upstream version 4.8
|
||||
|
||||
Loading…
Reference in New Issue