Remove dependency on log4j and commons-logging
This commit is contained in:
Mikolaj Izdebski
parent
e5c1de6e1f
commit
5980df04d9
25
0001-Remove-unused-import.patch
Normal file
25
0001-Remove-unused-import.patch
Normal file
@ -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
|
||||
|
||||
35
0002-Unbundle-ASM.patch
Normal file
35
0002-Unbundle-ASM.patch
Normal file
@ -0,0 +1,35 @@
|
||||
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 7ced2653..1d4b00bc 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,12 +17,12 @@
|
||||
*/
|
||||
package org.apache.xbean.recipe;
|
||||
|
||||
-import org.apache.xbean.asm7.ClassReader;
|
||||
-import org.apache.xbean.asm7.ClassVisitor;
|
||||
-import org.apache.xbean.asm7.Label;
|
||||
-import org.apache.xbean.asm7.MethodVisitor;
|
||||
-import org.apache.xbean.asm7.Opcodes;
|
||||
-import org.apache.xbean.asm7.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.Opcodes;
|
||||
+import org.objectweb.asm.Type;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
--
|
||||
2.21.0
|
||||
|
||||
35
0003-Remove-dependency-on-log4j-and-commons-logging.patch
Normal file
35
0003-Remove-dependency-on-log4j-and-commons-logging.patch
Normal file
@ -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
|
||||
|
||||
27
xbean.spec
27
xbean.spec
@ -1,6 +1,6 @@
|
||||
Name: xbean
|
||||
Version: 4.14
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: Java plugin based web server
|
||||
License: ASL 2.0
|
||||
URL: http://geronimo.apache.org/xbean/
|
||||
@ -8,10 +8,12 @@ BuildArch: noarch
|
||||
|
||||
Source0: http://repo2.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
|
||||
|
||||
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.ow2.asm:asm)
|
||||
BuildRequires: mvn(org.ow2.asm:asm-commons)
|
||||
@ -34,21 +36,23 @@ This package provides %{summary}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
# Parent POM is not packaged
|
||||
%pom_remove_parent
|
||||
|
||||
%pom_remove_dep :commons-logging-api xbean-reflect
|
||||
%pom_remove_dep :log4j xbean-reflect
|
||||
%pom_remove_dep :xbean-asm7-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
|
||||
|
||||
# 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
|
||||
|
||||
%build
|
||||
%mvn_build -- -f xbean-reflect
|
||||
|
||||
@ -63,6 +67,9 @@ sed -i '/import com.sun.org.apache.regexp.internal.RE/d' xbean-reflect/src/main/
|
||||
%doc LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Fri May 15 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.14-4
|
||||
- Remove dependency on log4j and commons-logging
|
||||
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.14-3
|
||||
- Mass rebuild for javapackages-tools 201902
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user