re-import sources as agreed with the maintainer
This commit is contained in:
Adam Samalik
Stepan Oksanichenko
parent
c022d36b87
commit
e4cb541655
14
.gitignore
vendored
14
.gitignore
vendored
@ -1 +1,13 @@
|
||||
SOURCES/xbean-4.8-source-release.zip
|
||||
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
|
||||
|
||||
1
.xbean.metadata
Normal file
1
.xbean.metadata
Normal file
@ -0,0 +1 @@
|
||||
64f049581900a100206fa065501c043de4f9dc46 xbean-4.8-source-release.zip
|
||||
@ -1,25 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_contexts:
|
||||
- osci_compose_gate
|
||||
rules:
|
||||
# https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test
|
||||
- !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap}
|
||||
Loading…
Reference in New Issue
Block a user