From 6e782991cfa2bbe88a31ef0468d6b934fa80c383 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 01/50] Expand conditionals --- xbean.spec | 82 ------------------------------------------------------ 1 file changed, 82 deletions(-) diff --git a/xbean.spec b/xbean.spec index 99f516b..975b24d 100644 --- a/xbean.spec +++ b/xbean.spec @@ -1,8 +1,5 @@ # Conditionals to help breaking eclipse <-> xbean dependency cycle # when bootstrapping for new architectures -%bcond_without equinox -%bcond_without groovy -%bcond_without spring Name: xbean Version: 4.8 @@ -28,30 +25,8 @@ BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.ow2.asm:asm-commons) BuildRequires: mvn(org.slf4j:slf4j-api) -%if %{with equinox} -BuildRequires: mvn(org.eclipse:osgi) -%endif -%if %{with groovy} -BuildRequires: mvn(org.codehaus.groovy:groovy-all) -%endif -%if %{with spring} -BuildRequires: mvn(ant:ant) -BuildRequires: mvn(commons-logging:commons-logging) -BuildRequires: mvn(com.thoughtworks.qdox:qdox) -BuildRequires: mvn(org.apache.maven:maven-archiver) -BuildRequires: mvn(org.apache.maven:maven-artifact) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven:maven-project) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) -BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.springframework:spring-beans) -BuildRequires: mvn(org.springframework:spring-context) -BuildRequires: mvn(org.springframework:spring-web) -%endif %description The goal of XBean project is to create a plugin based server @@ -62,35 +37,6 @@ support for running with no IoC system, JMX without JMX code, lifecycle and class loader management, and a rock solid Spring integration. -%if %{with spring} -# For now blueprint module fails to compile. Disable it. -%if 0 -%package blueprint -Summary: Schema-driven namespace handler for Apache Aries Blueprint - -%description blueprint -This package provides %{summary}. -%endif - -%package classloader -Summary: A flexibie multi-parent classloader - -%description classloader -This package provides %{summary}. - -%package spring -Summary: Schema-driven namespace handler for spring contexts -Requires: %{name} = %{version}-%{release} - -%description spring -This package provides %{summary}. - -%package -n maven-%{name}-plugin -Summary: XBean plugin for Apache Maven - -%description -n maven-%{name}-plugin -This package provides %{summary}. -%endif %package javadoc Summary: API documentation for %{name} @@ -103,9 +49,6 @@ This package provides %{summary}. # build failing on this due to doxia-sitetools problems rm src/site/site.xml -%if %{with equinox} -%patch1 -p1 -%endif %patch2 -p1 %pom_remove_parent @@ -122,29 +65,19 @@ rm src/site/site.xml sed -i 's/org\.apache\.xbean\.asm6/org.objectweb.asm/g' `find xbean-reflect -name '*.java'` # Prevent modules depending on springframework from building. -%if %{without spring} %pom_remove_dep org.springframework: #%%pom_disable_module xbean-blueprint %pom_disable_module xbean-classloader %pom_disable_module xbean-spring %pom_disable_module maven-xbean-plugin -%else - %mvn_package :xbean-classloader classloader - %mvn_package :xbean-spring spring - %mvn_package :maven-xbean-plugin maven-xbean-plugin -%endif # blueprint FTBFS, disable for now %pom_disable_module xbean-blueprint -%if %{without equinox} %pom_remove_dep :xbean-bundleutils xbean-finder rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle* %pom_disable_module xbean-bundleutils -%endif -%if %{without groovy} %pom_disable_module xbean-telnet -%endif # maven-xbean-plugin invocation makes no sense as there are no namespaces %pom_remove_plugin :maven-xbean-plugin xbean-classloader @@ -166,21 +99,6 @@ sed -i "s|||" xbean-blueprint/pom.xml %doc LICENSE NOTICE %dir %{_javadir}/%{name} -%if %{with spring} -%if 0 -%files blueprint -f .mfiles-blueprint -%doc LICENSE NOTICE %{name}-blueprint/target/restaurant.xsd* -%endif - -%files classloader -f .mfiles-classloader -%doc LICENSE NOTICE - -%files spring -f .mfiles-spring -%doc LICENSE NOTICE - -%files -n maven-%{name}-plugin -f .mfiles-maven-%{name}-plugin -%doc LICENSE NOTICE -%endif %files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE From 34576dc0b5b30feb96b55891e21b75e15690d3ca Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:46 +0200 Subject: [PATCH 02/50] Mass rebuild for javapackages-tools 201901 --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index 975b24d..949854b 100644 --- a/xbean.spec +++ b/xbean.spec @@ -3,7 +3,7 @@ Name: xbean Version: 4.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java plugin based web server License: ASL 2.0 URL: http://geronimo.apache.org/xbean/ @@ -104,6 +104,9 @@ sed -i "s|||" xbean-blueprint/pom.xml %doc LICENSE NOTICE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 4.8-2 +- Mass rebuild for javapackages-tools 201901 + * Thu Apr 19 2018 Michael Simacek - 4.8-1 - Update to upstream version 4.8 From e1f29279a4ee86df54bc1b3e784b8516acce93fa Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 27 Jun 2019 10:06:59 +0200 Subject: [PATCH 03/50] Update to upstream version 4.14 --- .gitignore | 1 + sources | 2 +- xbean.spec | 17 ++++++++--------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index b7f3755..0c0e51b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ xbean-3.7.tar.xz /xbean-4.5-source-release.zip /xbean-4.6-source-release.zip /xbean-4.8-source-release.zip +/xbean-4.14-source-release.zip diff --git a/sources b/sources index 9458fe7..3c1fe28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xbean-4.8-source-release.zip) = 349f1becc801b180710b14f3f0cf6c148e08c0fc50078a754ee2f8e204c2e87ef430ddd8240db03b64618465080bad09f76c283504620c514db99ee03d56dd54 +SHA512 (xbean-4.14-source-release.zip) = 1aaf9315d4f75a53b3a18da4f56d0737dbee75aa1516491aeea6d2d1b247fdcadc173c8b494efd2758e880b2512f7c015076322a57913ad1a491ea3871f9e5e1 diff --git a/xbean.spec b/xbean.spec index 949854b..497c572 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,8 +2,8 @@ # when bootstrapping for new architectures Name: xbean -Version: 4.8 -Release: 2%{?dist} +Version: 4.14 +Release: 1%{?dist} Summary: Java plugin based web server License: ASL 2.0 URL: http://geronimo.apache.org/xbean/ @@ -25,9 +25,6 @@ BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.ow2.asm:asm-commons) BuildRequires: mvn(org.slf4j:slf4j-api) - - - %description The goal of XBean project is to create a plugin based server analogous to Eclipse being a plugin based IDE. XBean will be able to @@ -55,14 +52,14 @@ rm src/site/site.xml %pom_remove_dep mx4j:mx4j # Unshade ASM -%pom_remove_dep -r :xbean-asm6-shaded +%pom_remove_dep -r :xbean-asm7-shaded %pom_remove_dep -r :xbean-finder-shaded -%pom_disable_module xbean-asm6-shaded +%pom_disable_module xbean-asm7-shaded %pom_disable_module xbean-finder-shaded %pom_add_dep org.apache.xbean:xbean-asm-util:%{version} xbean-reflect %pom_xpath_remove pom:optional xbean-reflect xbean-asm-util %pom_xpath_remove 'pom:scope[text()="provided"]' xbean-reflect xbean-asm-util -sed -i 's/org\.apache\.xbean\.asm6/org.objectweb.asm/g' `find xbean-reflect -name '*.java'` +sed -i 's/org\.apache\.xbean\.asm7/org.objectweb.asm/g' `find xbean-reflect -name '*.java'` # Prevent modules depending on springframework from building. %pom_remove_dep org.springframework: @@ -97,13 +94,15 @@ sed -i "s|||" xbean-blueprint/pom.xml %files -f .mfiles %doc LICENSE NOTICE -%dir %{_javadir}/%{name} %files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE %changelog +* Wed Jun 26 2019 Marian Koncek - 4.14-1 +- Update to upstream version 4.14 + * Fri May 24 2019 Mikolaj Izdebski - 4.8-2 - Mass rebuild for javapackages-tools 201901 From ee6f539794b294b636500ef37abd61adf2c37021 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 4 Sep 2019 21:18:05 +0200 Subject: [PATCH 04/50] Remove unused patch --- 0002-Port-to-Eclipse-Luna-OSGi.patch | 62 ---------------------------- xbean.spec | 2 - 2 files changed, 64 deletions(-) delete mode 100644 0002-Port-to-Eclipse-Luna-OSGi.patch diff --git a/0002-Port-to-Eclipse-Luna-OSGi.patch b/0002-Port-to-Eclipse-Luna-OSGi.patch deleted file mode 100644 index af2e743..0000000 --- a/0002-Port-to-Eclipse-Luna-OSGi.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 9e1bb9bfee86490163fb1e226556620aa8cdf7bc Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Fri, 21 Nov 2014 10:05:05 +0100 -Subject: [PATCH 2/3] Port to Eclipse Luna OSGi - ---- - xbean-bundleutils/pom.xml | 8 +------- - .../apache/xbean/osgi/bundle/util/DelegatingBundleContext.java | 10 ++++++++++ - 2 files changed, 11 insertions(+), 7 deletions(-) - -diff --git a/xbean-bundleutils/pom.xml b/xbean-bundleutils/pom.xml -index 72f4865..2b3459d 100644 ---- a/xbean-bundleutils/pom.xml -+++ b/xbean-bundleutils/pom.xml -@@ -35,15 +35,9 @@ - slf4j-api - - -- org.osgi -- org.osgi.core -- 4.3.1 -- provided -- -- - org.eclipse - osgi -- 3.6.0.v20100517 -+ 3.10.0-v20140606-1445 - provided - - -diff --git a/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java b/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java -index 58a392b..cc8d081 100644 ---- a/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java -+++ b/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java -@@ -31,7 +31,9 @@ import org.osgi.framework.BundleListener; - import org.osgi.framework.Filter; - import org.osgi.framework.FrameworkListener; - import org.osgi.framework.InvalidSyntaxException; -+import org.osgi.framework.ServiceFactory; - import org.osgi.framework.ServiceListener; -+import org.osgi.framework.ServiceObjects; - import org.osgi.framework.ServiceReference; - import org.osgi.framework.ServiceRegistration; - -@@ -153,5 +155,13 @@ public class DelegatingBundleContext implements BundleContext { - public Bundle getBundle(String location) { - return bundleContext.getBundle(location); - } -+ -+ public ServiceObjects getServiceObjects(ServiceReference reference) { -+ return bundleContext.getServiceObjects(reference); -+ } -+ -+ public ServiceRegistration registerService(Class clazz, ServiceFactory factory, Dictionary properties) { -+ return bundleContext.registerService(clazz, factory, properties); -+ } - - } --- -2.9.3 - diff --git a/xbean.spec b/xbean.spec index 497c572..48a8312 100644 --- a/xbean.spec +++ b/xbean.spec @@ -11,8 +11,6 @@ BuildArch: noarch Source0: http://repo2.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip -# Compatibility with Eclipse Luna (rhbz#1087461) -Patch1: 0002-Port-to-Eclipse-Luna-OSGi.patch Patch2: 0003-Port-to-QDox-2.0.patch BuildRequires: maven-local From 921e82d24a6987e0a2df0e71ef7d254454b29a95 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 13:37:25 +0100 Subject: [PATCH 05/50] Disable all modules except xbean-reflect --- 0003-Port-to-QDox-2.0.patch | 689 ------------------------------------ xbean.spec | 62 +--- 2 files changed, 15 insertions(+), 736 deletions(-) delete mode 100644 0003-Port-to-QDox-2.0.patch diff --git a/0003-Port-to-QDox-2.0.patch b/0003-Port-to-QDox-2.0.patch deleted file mode 100644 index 95609a2..0000000 --- a/0003-Port-to-QDox-2.0.patch +++ /dev/null @@ -1,689 +0,0 @@ -From 928bd5a98dc500a31197a56c8f6c5e19a3a273f8 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Fri, 21 Nov 2014 10:51:38 +0100 -Subject: [PATCH 3/3] Port to QDox 2.0 - ---- - pom.xml | 2 +- - .../blueprint/generator/QdoxMappingLoader.java | 144 +++++++++++--------- - .../xbean/spring/generator/QdoxMappingLoader.java | 148 ++++++++++++--------- - .../org/apache/xbean/spring/generator/Type.java | 7 +- - 4 files changed, 166 insertions(+), 135 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 6e53649..9132fe4 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -297,7 +297,7 @@ - - com.thoughtworks.qdox - qdox -- 1.6.3 -+ 2.0-M5 - - - -diff --git a/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/generator/QdoxMappingLoader.java b/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/generator/QdoxMappingLoader.java -index 6635937..e17fd08 100644 ---- a/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/generator/QdoxMappingLoader.java -+++ b/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/generator/QdoxMappingLoader.java -@@ -20,6 +20,7 @@ import java.io.File; - import java.io.IOException; - import java.net.URL; - import java.util.ArrayList; -+import java.util.Collection; - import java.util.Collections; - import java.util.Enumeration; - import java.util.HashMap; -@@ -31,14 +32,17 @@ import java.util.TreeSet; - import java.util.jar.JarEntry; - import java.util.jar.JarFile; - --import com.thoughtworks.qdox.JavaDocBuilder; -+import com.thoughtworks.qdox.JavaProjectBuilder; - import com.thoughtworks.qdox.model.BeanProperty; - import com.thoughtworks.qdox.model.DocletTag; - import com.thoughtworks.qdox.model.JavaClass; -+import com.thoughtworks.qdox.model.JavaConstructor; - import com.thoughtworks.qdox.model.JavaMethod; -+import com.thoughtworks.qdox.model.JavaModel; - import com.thoughtworks.qdox.model.JavaParameter; - import com.thoughtworks.qdox.model.JavaSource; --import com.thoughtworks.qdox.model.Type; -+import com.thoughtworks.qdox.model.JavaType; -+ - import org.apache.commons.logging.Log; - import org.apache.commons.logging.LogFactory; - -@@ -62,7 +66,7 @@ public class QdoxMappingLoader implements MappingLoader { - private final String defaultNamespace; - private final File[] srcDirs; - private final String[] excludedClasses; -- private Type collectionType; -+ private JavaClass collectionType; - - public QdoxMappingLoader(String defaultNamespace, File[] srcDirs, String[] excludedClasses) { - this.defaultNamespace = defaultNamespace; -@@ -79,7 +83,7 @@ public class QdoxMappingLoader implements MappingLoader { - } - - public Set loadNamespaces() throws IOException { -- JavaDocBuilder builder = new JavaDocBuilder(); -+ JavaProjectBuilder builder = new JavaProjectBuilder(); - - log.debug("Source directories: "); - -@@ -92,11 +96,11 @@ public class QdoxMappingLoader implements MappingLoader { - getSourceFiles(sourceDirectory, excludedClasses, builder); - } - -- collectionType = builder.getClassByName("java.util.Collection").asType(); -+ collectionType = builder.getClassByName("java.util.Collection"); - return loadNamespaces(builder); - } - -- private Set loadNamespaces(JavaDocBuilder builder) { -+ private Set loadNamespaces(JavaProjectBuilder builder) { - // load all of the elements - List elements = loadElements(builder); - -@@ -131,14 +135,14 @@ public class QdoxMappingLoader implements MappingLoader { - return Collections.unmodifiableSet(namespaces); - } - -- private List loadElements(JavaDocBuilder builder) { -- JavaSource[] javaSources = builder.getSources(); -+ private List loadElements(JavaProjectBuilder builder) { -+ Collection javaSources = builder.getSources(); - List elements = new ArrayList(); - for (JavaSource javaSource : javaSources) { -- if (javaSource.getClasses().length == 0) { -+ if (javaSource.getClasses().isEmpty()) { - log.info("No Java Classes defined in: " + javaSource.getURL()); - } else { -- JavaClass[] classes = javaSource.getClasses(); -+ Collection classes = javaSource.getClasses(); - for (JavaClass javaClass : classes) { - ElementMapping element = loadElement(builder, javaClass); - if (element != null && !javaClass.isAbstract()) { -@@ -152,7 +156,7 @@ public class QdoxMappingLoader implements MappingLoader { - return elements; - } - -- private ElementMapping loadElement(JavaDocBuilder builder, JavaClass javaClass) { -+ private ElementMapping loadElement(JavaProjectBuilder builder, JavaClass javaClass) { - DocletTag xbeanTag = javaClass.getTagByName(XBEAN_ANNOTATION); - if (xbeanTag == null) { - return null; -@@ -176,7 +180,7 @@ public class QdoxMappingLoader implements MappingLoader { - Map attributesByPropertyName = new HashMap(); - - for (JavaClass jClass = javaClass; jClass != null; jClass = jClass.getSuperJavaClass()) { -- BeanProperty[] beanProperties = jClass.getBeanProperties(); -+ Collection beanProperties = jClass.getBeanProperties(); - for (BeanProperty beanProperty : beanProperties) { - // we only care about properties with a setter - if (beanProperty.getMutator() != null) { -@@ -219,9 +223,9 @@ public class QdoxMappingLoader implements MappingLoader { - String destroyMethod = null; - String factoryMethod = null; - for (JavaClass jClass = javaClass; jClass != null; jClass = jClass.getSuperJavaClass()) { -- JavaMethod[] methods = javaClass.getMethods(); -+ Collection methods = javaClass.getMethods(); - for (JavaMethod method : methods) { -- if (method.isPublic() && !method.isConstructor()) { -+ if (method.isPublic()) { - if (initMethod == null && method.getTagByName(INIT_METHOD_ANNOTATION) != null) { - initMethod = method.getName(); - } -@@ -237,22 +241,43 @@ public class QdoxMappingLoader implements MappingLoader { - } - - List> constructorArgs = new ArrayList>(); -- JavaMethod[] methods = javaClass.getMethods(); -- for (JavaMethod method : methods) { -- JavaParameter[] parameters = method.getParameters(); -- if (isValidConstructor(factoryMethod, method, parameters)) { -- List args = new ArrayList(parameters.length); -- for (JavaParameter parameter : parameters) { -- AttributeMapping attributeMapping = attributesByPropertyName.get(parameter.getName()); -- if (attributeMapping == null) { -- attributeMapping = loadParameter(parameter); -- -- attributes.add(attributeMapping); -- attributesByPropertyName.put(attributeMapping.getPropertyName(), attributeMapping); -+ if (factoryMethod == null) { -+ Collection constructors = javaClass.getConstructors(); -+ for (JavaConstructor constructor : constructors) { -+ Collection parameters = constructor.getParameters(); -+ if (constructor.isPublic() && parameters.size() > 0) { -+ List args = new ArrayList(parameters.size()); -+ for (JavaParameter parameter : parameters) { -+ AttributeMapping attributeMapping = attributesByPropertyName.get(parameter.getName()); -+ if (attributeMapping == null) { -+ attributeMapping = loadParameter(parameter, constructor); -+ -+ attributes.add(attributeMapping); -+ attributesByPropertyName.put(attributeMapping.getPropertyName(), attributeMapping); -+ } -+ args.add(new ParameterMapping(attributeMapping.getPropertyName(), toMappingType(parameter.getType(), null))); - } -- args.add(new ParameterMapping(attributeMapping.getPropertyName(), toMappingType(parameter.getType(), null))); -+ constructorArgs.add(Collections.unmodifiableList(args)); -+ } -+ } -+ } else { -+ Collection methods = javaClass.getMethods(); -+ for (JavaMethod method : methods) { -+ Collection parameters = method.getParameters(); -+ if (method.isPublic() && parameters.size() > 0 && method.getName().equals(factoryMethod)) { -+ List args = new ArrayList(parameters.size()); -+ for (JavaParameter parameter : parameters) { -+ AttributeMapping attributeMapping = attributesByPropertyName.get(parameter.getName()); -+ if (attributeMapping == null) { -+ attributeMapping = loadParameter(parameter, method); -+ -+ attributes.add(attributeMapping); -+ attributesByPropertyName.put(attributeMapping.getPropertyName(), attributeMapping); -+ } -+ args.add(new ParameterMapping(attributeMapping.getPropertyName(), toMappingType(parameter.getType(), null))); -+ } -+ constructorArgs.add(Collections.unmodifiableList(args)); - } -- constructorArgs.add(Collections.unmodifiableList(args)); - } - } - -@@ -303,7 +328,7 @@ public class QdoxMappingLoader implements MappingLoader { - interfaces); - } - -- private List getFullyQualifiedNames(JavaClass[] implementedInterfaces) { -+ private List getFullyQualifiedNames(Collection implementedInterfaces) { - ArrayList l = new ArrayList(); - for (JavaClass implementedInterface : implementedInterfaces) { - l.add(implementedInterface.getFullyQualifiedName()); -@@ -395,19 +420,19 @@ public class QdoxMappingLoader implements MappingLoader { - return defaultDescription; - } - -- private AttributeMapping loadParameter(JavaParameter parameter) { -+ private AttributeMapping loadParameter(JavaParameter parameter, JavaModel methodOrConstructor) { - String parameterName = parameter.getName(); - String parameterDescription = getParameterDescription(parameter); - - // first attempt to load the attribute from the java beans accessor methods -- JavaClass javaClass = parameter.getParentMethod().getParentClass(); -+ JavaClass javaClass = parameter.getParentClass(); - BeanProperty beanProperty = javaClass.getBeanProperty(parameterName); - if (beanProperty != null) { - AttributeMapping attributeMapping = loadAttribute(beanProperty, parameterDescription); - // if the attribute mapping is null, the property was tagged as hidden and this is an error - if (attributeMapping == null) { - throw new InvalidModelException("Hidden property usage: " + -- "The construction method " + toMethodLocator(parameter.getParentMethod()) + -+ "The construction method " + toMethodLocator(parameter.getParentClass(), methodOrConstructor) + - " can not use a hidded property " + parameterName); - } - return attributeMapping; -@@ -426,9 +451,9 @@ public class QdoxMappingLoader implements MappingLoader { - - private String getParameterDescription(JavaParameter parameter) { - String parameterName = parameter.getName(); -- DocletTag[] tags = parameter.getParentMethod().getTagsByName("param"); -+ Collection tags = parameter.getTagsByName("param"); - for (DocletTag tag : tags) { -- if (tag.getParameters()[0].equals(parameterName)) { -+ if (tag.getParameters().get(0).equals(parameterName)) { - String parameterDescription = tag.getValue().trim(); - if (parameterDescription.startsWith(parameterName)) { - parameterDescription = parameterDescription.substring(parameterName.length()).trim(); -@@ -439,18 +464,6 @@ public class QdoxMappingLoader implements MappingLoader { - return null; - } - -- private boolean isValidConstructor(String factoryMethod, JavaMethod method, JavaParameter[] parameters) { -- if (!method.isPublic() || parameters.length == 0) { -- return false; -- } -- -- if (factoryMethod == null) { -- return method.isConstructor(); -- } else { -- return method.getName().equals(factoryMethod); -- } -- } -- - private static String getProperty(DocletTag propertyTag, String propertyName) { - return getProperty(propertyTag, propertyName, null); - } -@@ -477,14 +490,17 @@ public class QdoxMappingLoader implements MappingLoader { - return false; - } - -- private org.apache.xbean.blueprint.generator.Type toMappingType(Type type, String nestedType) { -+ private org.apache.xbean.blueprint.generator.Type toMappingType(JavaType type, String nestedType) { - try { -- if (type.isArray()) { -- return org.apache.xbean.blueprint.generator.Type.newArrayType(type.getValue(), type.getDimensions()); -- } else if (type.isA(collectionType)) { -- if (nestedType == null) nestedType = "java.lang.Object"; -- return org.apache.xbean.blueprint.generator.Type.newCollectionType(type.getValue(), -- org.apache.xbean.blueprint.generator.Type.newSimpleType(nestedType)); -+ if (type instanceof JavaClass) { -+ JavaClass clazz = (JavaClass)type; -+ if (clazz.isArray()) { -+ return org.apache.xbean.blueprint.generator.Type.newArrayType(type.getValue(), clazz.getDimensions()); -+ } else if (clazz.isA(collectionType)) { -+ if (nestedType == null) nestedType = "java.lang.Object"; -+ return org.apache.xbean.blueprint.generator.Type.newCollectionType(type.getValue(), -+ org.apache.xbean.blueprint.generator.Type.newSimpleType(nestedType)); -+ } - } - } catch (Throwable t) { - log.debug("Could not load type mapping", t); -@@ -492,26 +508,28 @@ public class QdoxMappingLoader implements MappingLoader { - return org.apache.xbean.blueprint.generator.Type.newSimpleType(type.getValue()); - } - -- private static String toMethodLocator(JavaMethod method) { -+ private static String toMethodLocator(JavaClass parentClass, JavaModel methodOrConstructor) { -+ JavaMethod method = methodOrConstructor instanceof JavaMethod ? (JavaMethod) methodOrConstructor : null; -+ JavaConstructor constructor = methodOrConstructor instanceof JavaConstructor ? (JavaConstructor) methodOrConstructor : null; - StringBuffer buf = new StringBuffer(); -- buf.append(method.getParentClass().getFullyQualifiedName()); -- if (!method.isConstructor()) { -+ buf.append(parentClass.getFullyQualifiedName()); -+ if (method != null) { - buf.append(".").append(method.getName()); - } - buf.append("("); -- JavaParameter[] parameters = method.getParameters(); -- for (int i = 0; i < parameters.length; i++) { -- JavaParameter parameter = parameters[i]; -+ List parameters = method != null ? method.getParameters() : constructor.getParameters(); -+ for (int i = 0; i < parameters.size(); i++) { -+ JavaParameter parameter = parameters.get(i); - if (i > 0) { - buf.append(", "); - } - buf.append(parameter.getName()); - } -- buf.append(") : ").append(method.getLineNumber()); -+ buf.append(") : ").append(method != null ? method.getLineNumber() : constructor.getLineNumber()); - return buf.toString(); - } - -- private static void getSourceFiles(File base, String[] excludedClasses, JavaDocBuilder builder) throws IOException { -+ private static void getSourceFiles(File base, String[] excludedClasses, JavaProjectBuilder builder) throws IOException { - if (base.isDirectory()) { - listAllFileNames(base, "", excludedClasses, builder); - } else { -@@ -519,7 +537,7 @@ public class QdoxMappingLoader implements MappingLoader { - } - } - -- private static void listAllFileNames(File base, String prefix, String[] excludedClasses, JavaDocBuilder builder) throws IOException { -+ private static void listAllFileNames(File base, String prefix, String[] excludedClasses, JavaProjectBuilder builder) throws IOException { - if (!base.canRead() || !base.isDirectory()) { - throw new IllegalArgumentException(base.getAbsolutePath()); - } -@@ -536,7 +554,7 @@ public class QdoxMappingLoader implements MappingLoader { - } - } - -- private static void listAllJarEntries(File base, String[] excludedClasses, JavaDocBuilder builder) throws IOException { -+ private static void listAllJarEntries(File base, String[] excludedClasses, JavaProjectBuilder builder) throws IOException { - JarFile jarFile = new JarFile(base); - for (Enumeration entries = jarFile.entries(); entries.hasMoreElements(); ) { - JarEntry entry = (JarEntry) entries.nextElement(); -diff --git a/xbean-spring/src/main/java/org/apache/xbean/spring/generator/QdoxMappingLoader.java b/xbean-spring/src/main/java/org/apache/xbean/spring/generator/QdoxMappingLoader.java -index 94bd7a1..228117e 100644 ---- a/xbean-spring/src/main/java/org/apache/xbean/spring/generator/QdoxMappingLoader.java -+++ b/xbean-spring/src/main/java/org/apache/xbean/spring/generator/QdoxMappingLoader.java -@@ -20,6 +20,7 @@ import java.io.File; - import java.io.IOException; - import java.net.URL; - import java.util.ArrayList; -+import java.util.Collection; - import java.util.Collections; - import java.util.Enumeration; - import java.util.HashMap; -@@ -31,14 +32,17 @@ import java.util.TreeSet; - import java.util.jar.JarEntry; - import java.util.jar.JarFile; - --import com.thoughtworks.qdox.JavaDocBuilder; -+import com.thoughtworks.qdox.JavaProjectBuilder; - import com.thoughtworks.qdox.model.BeanProperty; - import com.thoughtworks.qdox.model.DocletTag; - import com.thoughtworks.qdox.model.JavaClass; -+import com.thoughtworks.qdox.model.JavaConstructor; - import com.thoughtworks.qdox.model.JavaMethod; -+import com.thoughtworks.qdox.model.JavaModel; - import com.thoughtworks.qdox.model.JavaParameter; - import com.thoughtworks.qdox.model.JavaSource; --import com.thoughtworks.qdox.model.Type; -+import com.thoughtworks.qdox.model.JavaType; -+ - import org.apache.commons.logging.Log; - import org.apache.commons.logging.LogFactory; - -@@ -62,7 +66,7 @@ public class QdoxMappingLoader implements MappingLoader { - private final String defaultNamespace; - private final File[] srcDirs; - private final String[] excludedClasses; -- private Type collectionType; -+ private JavaClass collectionType; - - public QdoxMappingLoader(String defaultNamespace, File[] srcDirs, String[] excludedClasses) { - this.defaultNamespace = defaultNamespace; -@@ -79,7 +83,7 @@ public class QdoxMappingLoader implements MappingLoader { - } - - public Set loadNamespaces() throws IOException { -- JavaDocBuilder builder = new JavaDocBuilder(); -+ JavaProjectBuilder builder = new JavaProjectBuilder(); - - log.debug("Source directories: "); - -@@ -92,11 +96,11 @@ public class QdoxMappingLoader implements MappingLoader { - getSourceFiles(sourceDirectory, excludedClasses, builder); - } - -- collectionType = builder.getClassByName("java.util.Collection").asType(); -+ collectionType = builder.getClassByName("java.util.Collection"); - return loadNamespaces(builder); - } - -- private Set loadNamespaces(JavaDocBuilder builder) { -+ private Set loadNamespaces(JavaProjectBuilder builder) { - // load all of the elements - List elements = loadElements(builder); - -@@ -131,14 +135,14 @@ public class QdoxMappingLoader implements MappingLoader { - return Collections.unmodifiableSet(namespaces); - } - -- private List loadElements(JavaDocBuilder builder) { -- JavaSource[] javaSources = builder.getSources(); -+ private List loadElements(JavaProjectBuilder builder) { -+ Collection javaSources = builder.getSources(); - List elements = new ArrayList(); - for (JavaSource javaSource : javaSources) { -- if (javaSource.getClasses().length == 0) { -+ if (javaSource.getClasses().isEmpty()) { - log.info("No Java Classes defined in: " + javaSource.getURL()); - } else { -- JavaClass[] classes = javaSource.getClasses(); -+ Collection classes = javaSource.getClasses(); - for (JavaClass javaClass : classes) { - ElementMapping element = loadElement(builder, javaClass); - if (element != null && !javaClass.isAbstract()) { -@@ -152,7 +156,7 @@ public class QdoxMappingLoader implements MappingLoader { - return elements; - } - -- private ElementMapping loadElement(JavaDocBuilder builder, JavaClass javaClass) { -+ private ElementMapping loadElement(JavaProjectBuilder builder, JavaClass javaClass) { - DocletTag xbeanTag = javaClass.getTagByName(XBEAN_ANNOTATION); - if (xbeanTag == null) { - return null; -@@ -176,7 +180,7 @@ public class QdoxMappingLoader implements MappingLoader { - Map attributesByPropertyName = new HashMap(); - - for (JavaClass jClass = javaClass; jClass != null; jClass = jClass.getSuperJavaClass()) { -- BeanProperty[] beanProperties = jClass.getBeanProperties(); -+ Collection beanProperties = jClass.getBeanProperties(); - for (BeanProperty beanProperty : beanProperties) { - // we only care about properties with a setter - if (beanProperty.getMutator() != null) { -@@ -219,9 +223,9 @@ public class QdoxMappingLoader implements MappingLoader { - String destroyMethod = null; - String factoryMethod = null; - for (JavaClass jClass = javaClass; jClass != null; jClass = jClass.getSuperJavaClass()) { -- JavaMethod[] methods = javaClass.getMethods(); -+ Collection methods = javaClass.getMethods(); - for (JavaMethod method : methods) { -- if (method.isPublic() && !method.isConstructor()) { -+ if (method.isPublic()) { - if (initMethod == null && method.getTagByName(INIT_METHOD_ANNOTATION) != null) { - initMethod = method.getName(); - } -@@ -237,27 +241,48 @@ public class QdoxMappingLoader implements MappingLoader { - } - - List> constructorArgs = new ArrayList>(); -- JavaMethod[] methods = javaClass.getMethods(); -- for (JavaMethod method : methods) { -- JavaParameter[] parameters = method.getParameters(); -- if (isValidConstructor(factoryMethod, method, parameters)) { -- List args = new ArrayList(parameters.length); -- for (JavaParameter parameter : parameters) { -- AttributeMapping attributeMapping = attributesByPropertyName.get(parameter.getName()); -- if (attributeMapping == null) { -- attributeMapping = loadParameter(parameter); -- -- attributes.add(attributeMapping); -- attributesByPropertyName.put(attributeMapping.getPropertyName(), attributeMapping); -+ if (factoryMethod == null) { -+ Collection constructors = javaClass.getConstructors(); -+ for (JavaConstructor constructor : constructors) { -+ Collection parameters = constructor.getParameters(); -+ if (constructor.isPublic() && parameters.size() > 0) { -+ List args = new ArrayList(parameters.size()); -+ for (JavaParameter parameter : parameters) { -+ AttributeMapping attributeMapping = attributesByPropertyName.get(parameter.getName()); -+ if (attributeMapping == null) { -+ attributeMapping = loadParameter(parameter, constructor); -+ -+ attributes.add(attributeMapping); -+ attributesByPropertyName.put(attributeMapping.getPropertyName(), attributeMapping); -+ } -+ args.add(new ParameterMapping(attributeMapping.getPropertyName(), toMappingType(parameter.getType(), null))); - } -- args.add(new ParameterMapping(attributeMapping.getPropertyName(), toMappingType(parameter.getType(), null))); -+ constructorArgs.add(Collections.unmodifiableList(args)); -+ } -+ } -+ } else { -+ Collection methods = javaClass.getMethods(); -+ for (JavaMethod method : methods) { -+ Collection parameters = method.getParameters(); -+ if (method.isPublic() && parameters.size() > 0 && method.getName().equals(factoryMethod)) { -+ List args = new ArrayList(parameters.size()); -+ for (JavaParameter parameter : parameters) { -+ AttributeMapping attributeMapping = attributesByPropertyName.get(parameter.getName()); -+ if (attributeMapping == null) { -+ attributeMapping = loadParameter(parameter, method); -+ -+ attributes.add(attributeMapping); -+ attributesByPropertyName.put(attributeMapping.getPropertyName(), attributeMapping); -+ } -+ args.add(new ParameterMapping(attributeMapping.getPropertyName(), toMappingType(parameter.getType(), null))); -+ } -+ constructorArgs.add(Collections.unmodifiableList(args)); - } -- constructorArgs.add(Collections.unmodifiableList(args)); - } - } - - HashSet interfaces = new HashSet(); -- interfaces.addAll(getFullyQualifiedNames(javaClass.getImplementedInterfaces())); -+ interfaces.addAll(getFullyQualifiedNames(javaClass.getInterfaces())); - - JavaClass actualClass = javaClass; - if (factoryClass != null) { -@@ -282,7 +307,7 @@ public class QdoxMappingLoader implements MappingLoader { - } - p = s; - superClasses.add(p.getFullyQualifiedName()); -- interfaces.addAll(getFullyQualifiedNames(p.getImplementedInterfaces())); -+ interfaces.addAll(getFullyQualifiedNames(p.getInterfaces())); - } - - return new ElementMapping(namespace, -@@ -303,7 +328,7 @@ public class QdoxMappingLoader implements MappingLoader { - interfaces); - } - -- private List getFullyQualifiedNames(JavaClass[] implementedInterfaces) { -+ private List getFullyQualifiedNames(Collection implementedInterfaces) { - ArrayList l = new ArrayList(); - for (JavaClass implementedInterface : implementedInterfaces) { - l.add(implementedInterface.getFullyQualifiedName()); -@@ -395,19 +420,19 @@ public class QdoxMappingLoader implements MappingLoader { - return defaultDescription; - } - -- private AttributeMapping loadParameter(JavaParameter parameter) { -+ private AttributeMapping loadParameter(JavaParameter parameter, JavaModel methodOrConstructor) { - String parameterName = parameter.getName(); - String parameterDescription = getParameterDescription(parameter); - - // first attempt to load the attribute from the java beans accessor methods -- JavaClass javaClass = parameter.getParentMethod().getParentClass(); -+ JavaClass javaClass = parameter.getDeclaringClass(); - BeanProperty beanProperty = javaClass.getBeanProperty(parameterName); - if (beanProperty != null) { - AttributeMapping attributeMapping = loadAttribute(beanProperty, parameterDescription); - // if the attribute mapping is null, the property was tagged as hidden and this is an error - if (attributeMapping == null) { - throw new InvalidModelException("Hidden property usage: " + -- "The construction method " + toMethodLocator(parameter.getParentMethod()) + -+ "The construction method " + toMethodLocator(parameter.getDeclaringClass(), methodOrConstructor) + - " can not use a hidded property " + parameterName); - } - return attributeMapping; -@@ -426,9 +451,9 @@ public class QdoxMappingLoader implements MappingLoader { - - private String getParameterDescription(JavaParameter parameter) { - String parameterName = parameter.getName(); -- DocletTag[] tags = parameter.getParentMethod().getTagsByName("param"); -+ Collection tags = parameter.getTagsByName("param"); - for (DocletTag tag : tags) { -- if (tag.getParameters()[0].equals(parameterName)) { -+ if (tag.getParameters().get(0).equals(parameterName)) { - String parameterDescription = tag.getValue().trim(); - if (parameterDescription.startsWith(parameterName)) { - parameterDescription = parameterDescription.substring(parameterName.length()).trim(); -@@ -439,18 +464,6 @@ public class QdoxMappingLoader implements MappingLoader { - return null; - } - -- private boolean isValidConstructor(String factoryMethod, JavaMethod method, JavaParameter[] parameters) { -- if (!method.isPublic() || parameters.length == 0) { -- return false; -- } -- -- if (factoryMethod == null) { -- return method.isConstructor(); -- } else { -- return method.getName().equals(factoryMethod); -- } -- } -- - private static String getProperty(DocletTag propertyTag, String propertyName) { - return getProperty(propertyTag, propertyName, null); - } -@@ -477,14 +490,17 @@ public class QdoxMappingLoader implements MappingLoader { - return false; - } - -- private org.apache.xbean.spring.generator.Type toMappingType(Type type, String nestedType) { -+ private org.apache.xbean.spring.generator.Type toMappingType(JavaType type, String nestedType) { - try { -- if (type.isArray()) { -- return org.apache.xbean.spring.generator.Type.newArrayType(type.getValue(), type.getDimensions()); -- } else if (type.isA(collectionType)) { -- if (nestedType == null) nestedType = "java.lang.Object"; -- return org.apache.xbean.spring.generator.Type.newCollectionType(type.getValue(), -- org.apache.xbean.spring.generator.Type.newSimpleType(nestedType)); -+ if (type instanceof JavaClass) { -+ JavaClass clazz = (JavaClass)type; -+ if (clazz.isArray()) { -+ return org.apache.xbean.spring.generator.Type.newArrayType(type.getValue(), clazz.getDimensions()); -+ } else if (clazz.isA(collectionType)) { -+ if (nestedType == null) nestedType = "java.lang.Object"; -+ return org.apache.xbean.spring.generator.Type.newCollectionType(type.getValue(), -+ org.apache.xbean.spring.generator.Type.newSimpleType(nestedType)); -+ } - } - } catch (Throwable t) { - log.debug("Could not load type mapping", t); -@@ -492,26 +508,28 @@ public class QdoxMappingLoader implements MappingLoader { - return org.apache.xbean.spring.generator.Type.newSimpleType(type.getValue()); - } - -- private static String toMethodLocator(JavaMethod method) { -+ private static String toMethodLocator(JavaClass parentClass, JavaModel methodOrConstructor) { -+ JavaMethod method = methodOrConstructor instanceof JavaMethod ? (JavaMethod) methodOrConstructor : null; -+ JavaConstructor constructor = methodOrConstructor instanceof JavaConstructor ? (JavaConstructor) methodOrConstructor : null; - StringBuffer buf = new StringBuffer(); -- buf.append(method.getParentClass().getFullyQualifiedName()); -- if (!method.isConstructor()) { -+ buf.append(parentClass.getFullyQualifiedName()); -+ if (method != null) { - buf.append(".").append(method.getName()); - } - buf.append("("); -- JavaParameter[] parameters = method.getParameters(); -- for (int i = 0; i < parameters.length; i++) { -- JavaParameter parameter = parameters[i]; -+ List parameters = method != null ? method.getParameters() : constructor.getParameters(); -+ for (int i = 0; i < parameters.size(); i++) { -+ JavaParameter parameter = parameters.get(i); - if (i > 0) { - buf.append(", "); - } - buf.append(parameter.getName()); - } -- buf.append(") : ").append(method.getLineNumber()); -+ buf.append(") : ").append(method != null ? method.getLineNumber() : constructor.getLineNumber()); - return buf.toString(); - } - -- private static void getSourceFiles(File base, String[] excludedClasses, JavaDocBuilder builder) throws IOException { -+ private static void getSourceFiles(File base, String[] excludedClasses, JavaProjectBuilder builder) throws IOException { - if (base.isDirectory()) { - listAllFileNames(base, "", excludedClasses, builder); - } else { -@@ -519,7 +537,7 @@ public class QdoxMappingLoader implements MappingLoader { - } - } - -- private static void listAllFileNames(File base, String prefix, String[] excludedClasses, JavaDocBuilder builder) throws IOException { -+ private static void listAllFileNames(File base, String prefix, String[] excludedClasses, JavaProjectBuilder builder) throws IOException { - if (!base.canRead() || !base.isDirectory()) { - throw new IllegalArgumentException(base.getAbsolutePath()); - } -@@ -536,7 +554,7 @@ public class QdoxMappingLoader implements MappingLoader { - } - } - -- private static void listAllJarEntries(File base, String[] excludedClasses, JavaDocBuilder builder) throws IOException { -+ private static void listAllJarEntries(File base, String[] excludedClasses, JavaProjectBuilder builder) throws IOException { - JarFile jarFile = new JarFile(base); - for (Enumeration entries = jarFile.entries(); entries.hasMoreElements(); ) { - JarEntry entry = (JarEntry) entries.nextElement(); -diff --git a/xbean-spring/src/main/java/org/apache/xbean/spring/generator/Type.java b/xbean-spring/src/main/java/org/apache/xbean/spring/generator/Type.java -index 5eac64c..0d9fa63 100644 ---- a/xbean-spring/src/main/java/org/apache/xbean/spring/generator/Type.java -+++ b/xbean-spring/src/main/java/org/apache/xbean/spring/generator/Type.java -@@ -41,12 +41,7 @@ public class Type { - public static Type newArrayType(String type, int dimensions) { - if (type == null) throw new NullPointerException("type"); - if (dimensions < 1) throw new IllegalArgumentException("dimensions must be atleast one"); -- StringBuffer buf = new StringBuffer(type.length() + (dimensions * 2)); -- buf.append(type); -- for (int i = 0; i < dimensions; i ++) { -- buf.append("[]"); -- } -- return new Type(buf.toString(), newSimpleType(type)); -+ return new Type(type, newSimpleType(type.replaceAll("\\[\\]", ""))); - } - - public static Type newCollectionType(String collectionType, Type elementType) { --- -2.9.3 - diff --git a/xbean.spec b/xbean.spec index 48a8312..b774c20 100644 --- a/xbean.spec +++ b/xbean.spec @@ -1,9 +1,6 @@ -# Conditionals to help breaking eclipse <-> xbean dependency cycle -# when bootstrapping for new architectures - Name: xbean Version: 4.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java plugin based web server License: ASL 2.0 URL: http://geronimo.apache.org/xbean/ @@ -11,17 +8,13 @@ BuildArch: noarch Source0: http://repo2.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip -Patch2: 0003-Port-to-QDox-2.0.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.apache.maven.plugins:maven-source-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) %description The goal of XBean project is to create a plugin based server @@ -41,51 +34,23 @@ This package provides %{summary}. %prep %setup -q -# build failing on this due to doxia-sitetools problems -rm src/site/site.xml - -%patch2 -p1 +# Parent POM is not packaged %pom_remove_parent -%pom_remove_dep mx4j:mx4j + +# Plugins useful for upstream only +%pom_remove_plugin :apache-rat-plugin +%pom_remove_plugin :maven-source-plugin # Unshade ASM -%pom_remove_dep -r :xbean-asm7-shaded -%pom_remove_dep -r :xbean-finder-shaded -%pom_disable_module xbean-asm7-shaded -%pom_disable_module xbean-finder-shaded -%pom_add_dep org.apache.xbean:xbean-asm-util:%{version} xbean-reflect -%pom_xpath_remove pom:optional xbean-reflect xbean-asm-util -%pom_xpath_remove 'pom:scope[text()="provided"]' xbean-reflect xbean-asm-util -sed -i 's/org\.apache\.xbean\.asm7/org.objectweb.asm/g' `find xbean-reflect -name '*.java'` +%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 -# Prevent modules depending on springframework from building. - %pom_remove_dep org.springframework: - #%%pom_disable_module xbean-blueprint - %pom_disable_module xbean-classloader - %pom_disable_module xbean-spring - %pom_disable_module 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-bundleutils - -%pom_disable_module xbean-telnet - -# maven-xbean-plugin invocation makes no sense as there are no namespaces -%pom_remove_plugin :maven-xbean-plugin xbean-classloader - -# As auditing tool RAT is useful for upstream only. -%pom_remove_plugin :apache-rat-plugin - -# disable copy of internal aries-blueprint -sed -i "s|||" xbean-blueprint/pom.xml +# 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 +%mvn_build -- -f xbean-reflect %install %mvn_install @@ -98,6 +63,9 @@ sed -i "s|||" xbean-blueprint/pom.xml %doc LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 4.14-2 +- Disable all modules except xbean-reflect + * Wed Jun 26 2019 Marian Koncek - 4.14-1 - Update to upstream version 4.14 From e5c1de6e1f4925d983594fc046effbefab80a58c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 06/50] Mass rebuild for javapackages-tools 201902 --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index b774c20..548ef60 100644 --- a/xbean.spec +++ b/xbean.spec @@ -1,6 +1,6 @@ Name: xbean Version: 4.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java plugin based web server License: ASL 2.0 URL: http://geronimo.apache.org/xbean/ @@ -63,6 +63,9 @@ sed -i '/import com.sun.org.apache.regexp.internal.RE/d' xbean-reflect/src/main/ %doc LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 4.14-3 +- Mass rebuild for javapackages-tools 201902 + * Tue Nov 05 2019 Mikolaj Izdebski - 4.14-2 - Disable all modules except xbean-reflect From 5980df04d9b1dda74b16fd8538e3be68e971ef28 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 15 May 2020 07:30:20 +0200 Subject: [PATCH 07/50] Remove dependency on log4j and commons-logging --- 0001-Remove-unused-import.patch | 25 +++++++++++++ 0002-Unbundle-ASM.patch | 35 +++++++++++++++++++ ...endency-on-log4j-and-commons-logging.patch | 35 +++++++++++++++++++ xbean.spec | 27 ++++++++------ 4 files changed, 112 insertions(+), 10 deletions(-) create mode 100644 0001-Remove-unused-import.patch create mode 100644 0002-Unbundle-ASM.patch create mode 100644 0003-Remove-dependency-on-log4j-and-commons-logging.patch diff --git a/0001-Remove-unused-import.patch b/0001-Remove-unused-import.patch new file mode 100644 index 0000000..c0a9a2f --- /dev/null +++ b/0001-Remove-unused-import.patch @@ -0,0 +1,25 @@ +From c7b2913a7d552929a3182901466db69ba40e4340 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +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 + diff --git a/0002-Unbundle-ASM.patch b/0002-Unbundle-ASM.patch new file mode 100644 index 0000000..af94b2d --- /dev/null +++ b/0002-Unbundle-ASM.patch @@ -0,0 +1,35 @@ +From 4f7a61dcd47ed0dee2d78e31e2dd50b88ab42f25 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +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 + diff --git a/0003-Remove-dependency-on-log4j-and-commons-logging.patch b/0003-Remove-dependency-on-log4j-and-commons-logging.patch new file mode 100644 index 0000000..b1846ee --- /dev/null +++ b/0003-Remove-dependency-on-log4j-and-commons-logging.patch @@ -0,0 +1,35 @@ +From 28e37850d8343f44f82e3138c772dd65d1d0ff2f Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +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 + diff --git a/xbean.spec b/xbean.spec index 548ef60..896fb8d 100644 --- a/xbean.spec +++ b/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 - 4.14-4 +- Remove dependency on log4j and commons-logging + * Tue Nov 05 2019 Mikolaj Izdebski - 4.14-3 - Mass rebuild for javapackages-tools 201902 From 614fba7205f8c670cdbd819a8cba22c6632f40ca Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 29 Jul 2020 10:42:54 +0200 Subject: [PATCH 08/50] Update to upsteam version 4.17 --- .gitignore | 1 + 0002-Unbundle-ASM.patch | 38 ++++++++++++++++++++++++++------------ sources | 2 +- xbean.spec | 17 ++++++++++------- 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 0c0e51b..ee2d408 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ xbean-3.7.tar.xz /xbean-4.6-source-release.zip /xbean-4.8-source-release.zip /xbean-4.14-source-release.zip +/xbean-4.17-source-release.zip diff --git a/0002-Unbundle-ASM.patch b/0002-Unbundle-ASM.patch index af94b2d..6dc968f 100644 --- a/0002-Unbundle-ASM.patch +++ b/0002-Unbundle-ASM.patch @@ -4,32 +4,46 @@ 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(-) + .../xbean/recipe/XbeanAsmParameterNameLoader.java | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 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 +index 0da1987..a507156 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 @@ +@@ -17,11 +17,11 @@ */ 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.apache.xbean.asm8.ClassReader; +-import org.apache.xbean.asm8.ClassVisitor; +-import org.apache.xbean.asm8.Label; +-import org.apache.xbean.asm8.MethodVisitor; +-import org.apache.xbean.asm8.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; +@@ -36,7 +36,7 @@ import java.util.List; + import java.util.Map; + import java.util.WeakHashMap; + +-import static org.apache.xbean.asm8.shade.commons.AsmConstants.ASM_VERSION; ++import static org.apache.xbean.asm8.original.commons.AsmConstants.ASM_VERSION; + + /** + * Implementation of ParameterNameLoader that uses ASM to read the parameter names from the local variable table in the +@@ -315,4 +315,4 @@ public class XbeanAsmParameterNameLoader implements ParameterNameLoader { + return null; + } + } +-} +\ No newline at end of file ++} -- -2.21.0 +2.25.4 diff --git a/sources b/sources index 3c1fe28..996abdc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xbean-4.14-source-release.zip) = 1aaf9315d4f75a53b3a18da4f56d0737dbee75aa1516491aeea6d2d1b247fdcadc173c8b494efd2758e880b2512f7c015076322a57913ad1a491ea3871f9e5e1 +SHA512 (xbean-4.17-source-release.zip) = 0cc86b846f4eb797649cb3229c2eac5d37d6549f1a7ac8bf3f85b873b3cd2d5db837387ac1891d257f46613c925e3f331fcb63c5a80bf0b1a8004b31031de5c8 diff --git a/xbean.spec b/xbean.spec index 896fb8d..eeaba9d 100644 --- a/xbean.spec +++ b/xbean.spec @@ -1,12 +1,12 @@ Name: xbean -Version: 4.14 -Release: 4%{?dist} +Version: 4.17 +Release: 1%{?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 -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 @@ -27,7 +27,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} @@ -40,12 +39,14 @@ This package provides %{summary}. %patch2 -p1 %patch3 -p1 +cp xbean-asm-util/src/main/java/org/apache/xbean/asm8/original/commons/AsmConstants.java xbean-reflect/src/main/java/org/apache/xbean/recipe/ + # 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 +%pom_remove_dep :xbean-asm8-shaded xbean-reflect find -name CommonsLoggingConverter.java -delete find -name Log4jConverter.java -delete @@ -62,11 +63,13 @@ find -name Log4jConverter.java -delete %files -f .mfiles %doc LICENSE NOTICE - %files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE %changelog +* Wed Jul 29 2020 Marian Koncek - 4.17-1 +- Update to upsteam version 4.17 + * Fri May 15 2020 Mikolaj Izdebski - 4.14-4 - Remove dependency on log4j and commons-logging From 6695aa66b980420e833c3a60344426e84b65c96f Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 9 Sep 2020 23:02:43 +0200 Subject: [PATCH 09/50] switch from log4j 1.2 compat package to log4j 1.2 API shim --- xbean.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xbean.spec b/xbean.spec index 7acb2a7..44dafac 100644 --- a/xbean.spec +++ b/xbean.spec @@ -4,7 +4,7 @@ Name: xbean Summary: Java plugin based web server Version: 4.15 -Release: 5%{?dist} +Release: 6%{?dist} License: ASL 2.0 URL: http://geronimo.apache.org/xbean/ @@ -19,8 +19,8 @@ BuildArch: noarch 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.apache.logging.log4j:log4j-1.2-api) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.ow2.asm:asm) @@ -68,6 +68,9 @@ rm src/site/site.xml # use osgi-core instead of felix-osgi-core %pom_change_dep -r :org.osgi.core org.osgi:osgi.core +# switch from log4j 1.2 compat package to log4j 1.2 API shim +%pom_change_dep -r log4j:log4j org.apache.logging.log4j:log4j-1.2-api + # Unshade ASM %pom_remove_dep -r :xbean-asm7-shaded %pom_remove_dep -r :xbean-finder-shaded @@ -128,6 +131,9 @@ sed -i '/import com.sun.org.apache.regexp.internal.RE/d' xbean-reflect/src/main/ %changelog +* Wed Sep 09 2020 Fabio Valentini - 4.15-6 +- Switch from log4j 1.2 compat package to log4j 1.2 API shim. + * Wed Jul 29 2020 Mat Booth - 4.15-5 - Remove springframework conditionals, the deps are a long time removed from Fedora and this simplifies the spec a bit From 9dde50328fd448b730db89c343903cb0006e835d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 17 Dec 2020 15:49:20 +0100 Subject: [PATCH 10/50] Patch for XBEAN-329 was forwarded upstream --- xbean.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xbean.spec b/xbean.spec index 44dafac..027b572 100644 --- a/xbean.spec +++ b/xbean.spec @@ -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} From 9be8087e92dc6f055ce57cb2f33a70e0f8f0bfe9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:48:21 +0000 Subject: [PATCH 11/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index 027b572..e0c3079 100644 --- a/xbean.spec +++ b/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/ @@ -132,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 - 4.15-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Sep 09 2020 Fabio Valentini - 4.15-6 - Switch from log4j 1.2 compat package to log4j 1.2 API shim. From 2a37621c4efd0c05805274e326b947499ca0fa27 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 12 Feb 2021 10:42:33 +0100 Subject: [PATCH 12/50] Update to upstream version 4.18 --- .gitignore | 1 + 0002-Unbundle-ASM.patch | 29 +++++++++++------------------ sources | 2 +- xbean.spec | 9 ++++++--- 4 files changed, 19 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index ee2d408..2f3e4a3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ xbean-3.7.tar.xz /xbean-4.8-source-release.zip /xbean-4.14-source-release.zip /xbean-4.17-source-release.zip +/xbean-4.18-source-release.zip diff --git a/0002-Unbundle-ASM.patch b/0002-Unbundle-ASM.patch index 6dc968f..eb40658 100644 --- a/0002-Unbundle-ASM.patch +++ b/0002-Unbundle-ASM.patch @@ -4,22 +4,22 @@ Date: Thu, 12 Dec 2019 08:51:57 +0100 Subject: [PATCH 2/3] Unbundle ASM --- - .../xbean/recipe/XbeanAsmParameterNameLoader.java | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) + .../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 0da1987..a507156 100644 +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.asm8.ClassReader; --import org.apache.xbean.asm8.ClassVisitor; --import org.apache.xbean.asm8.Label; --import org.apache.xbean.asm8.MethodVisitor; --import org.apache.xbean.asm8.Type; +-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; @@ -32,18 +32,11 @@ index 0da1987..a507156 100644 import java.util.Map; import java.util.WeakHashMap; --import static org.apache.xbean.asm8.shade.commons.AsmConstants.ASM_VERSION; -+import static org.apache.xbean.asm8.original.commons.AsmConstants.ASM_VERSION; +-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 -@@ -315,4 +315,4 @@ public class XbeanAsmParameterNameLoader implements ParameterNameLoader { - return null; - } - } --} -\ No newline at end of file -+} -- -2.25.4 +2.29.2 diff --git a/sources b/sources index 996abdc..fcc3e67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xbean-4.17-source-release.zip) = 0cc86b846f4eb797649cb3229c2eac5d37d6549f1a7ac8bf3f85b873b3cd2d5db837387ac1891d257f46613c925e3f331fcb63c5a80bf0b1a8004b31031de5c8 +SHA512 (xbean-4.18-source-release.zip) = 766746caa4f9ea87ceff1af1fe052481a9478cab4754b18cb7c760fb9dc466e5fd85533f2040583c3378cf36a4e17ba357d48060896af86a933916008cb2dda6 diff --git a/xbean.spec b/xbean.spec index eeaba9d..e1f63f9 100644 --- a/xbean.spec +++ b/xbean.spec @@ -1,5 +1,5 @@ Name: xbean -Version: 4.17 +Version: 4.18 Release: 1%{?dist} Summary: Java plugin based web server License: ASL 2.0 @@ -39,14 +39,14 @@ This package provides %{summary}. %patch2 -p1 %patch3 -p1 -cp xbean-asm-util/src/main/java/org/apache/xbean/asm8/original/commons/AsmConstants.java xbean-reflect/src/main/java/org/apache/xbean/recipe/ +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_remove_dep :commons-logging-api xbean-reflect %pom_remove_dep :log4j xbean-reflect -%pom_remove_dep :xbean-asm8-shaded xbean-reflect +%pom_remove_dep :xbean-asm9-shaded xbean-reflect find -name CommonsLoggingConverter.java -delete find -name Log4jConverter.java -delete @@ -67,6 +67,9 @@ find -name Log4jConverter.java -delete %doc LICENSE NOTICE %changelog +* Tue Jan 26 2021 Marian Koncek - 4.18-1 +- Update to upstream version 4.18 + * Wed Jul 29 2020 Marian Koncek - 4.17-1 - Update to upsteam version 4.17 From c94a452c84542e3fd5300233868d2a3e76d516cd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 12 Mar 2021 10:10:10 +0100 Subject: [PATCH 13/50] Patch was applied upstream --- xbean.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xbean.spec b/xbean.spec index e0c3079..735dabc 100644 --- a/xbean.spec +++ b/xbean.spec @@ -96,6 +96,7 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac # Unused import which is not available in OpenJDK 11 # Forwarded upstream: https://issues.apache.org/jira/browse/XBEAN-329 +# Accepted upstream: https://svn.apache.org/viewvc?view=revision&revision=1887532 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} From 2ff0069abf86f83e3607446ebcd72ce2ea32dd52 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:13 +0200 Subject: [PATCH 14/50] Conditionalize buildrequires in bootstrap mode --- xbean.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xbean.spec b/xbean.spec index e1f63f9..cf8e18c 100644 --- a/xbean.spec +++ b/xbean.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: xbean Version: 4.18 Release: 1%{?dist} @@ -13,10 +15,14 @@ Patch2: 0002-Unbundle-ASM.patch Patch3: 0003-Remove-dependency-on-log4j-and-commons-logging.patch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.ow2.asm:asm-commons) +%endif %description The goal of XBean project is to create a plugin based server From 244575006769646075f06a5927a3a592b9125aed Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:43 +0200 Subject: [PATCH 15/50] Turn off bootstrap mode by default --- xbean.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index cf8e18c..3a5b0f9 100644 --- a/xbean.spec +++ b/xbean.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: xbean Version: 4.18 From d0b6f5bb8b39c9498b873db78304b5b7261065d8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:50:50 +0200 Subject: [PATCH 16/50] Bootstrap build --- xbean.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xbean.spec b/xbean.spec index 2ee05c8..9500abc 100644 --- a/xbean.spec +++ b/xbean.spec @@ -1,8 +1,8 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: xbean Version: 4.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java plugin based web server License: ASL 2.0 URL: https://geronimo.apache.org/xbean/ @@ -73,6 +73,9 @@ find -name Log4jConverter.java -delete %license LICENSE NOTICE %changelog +* Mon May 17 2021 Mikolaj Izdebski - 4.18-2 +- Bootstrap build + * Wed Jan 27 2021 Fedora Release Engineering - 4.15-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 2d44ede507e4d14c2e8cdd662d9c70a315841541 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:49 +0200 Subject: [PATCH 17/50] Non-bootstrap build --- xbean.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index 9500abc..3dfe739 100644 --- a/xbean.spec +++ b/xbean.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: xbean Version: 4.18 @@ -75,6 +75,7 @@ find -name Log4jConverter.java -delete %changelog * Mon May 17 2021 Mikolaj Izdebski - 4.18-2 - Bootstrap build +- Non-bootstrap build * Wed Jan 27 2021 Fedora Release Engineering - 4.15-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 751c090809560b932f5a3afa07c4620e60af3a4b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 21 Jun 2021 17:02:24 +0200 Subject: [PATCH 18/50] Enable xbean-finder Resolves: rhbz#1969297 --- xbean.spec | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/xbean.spec b/xbean.spec index 3dfe739..7f064eb 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.18 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java plugin based web server License: ASL 2.0 URL: https://geronimo.apache.org/xbean/ @@ -20,8 +20,10 @@ BuildRequires: javapackages-bootstrap %else BuildRequires: mvn(junit:junit) 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 @@ -50,6 +52,17 @@ cp xbean-asm-util/src/main/java/org/apache/xbean/asm9/original/commons/AsmConsta # 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 @@ -60,8 +73,14 @@ find -name Log4jConverter.java -delete %pom_remove_plugin :apache-rat-plugin %pom_remove_plugin :maven-source-plugin +%pom_remove_dep :xbean-bundleutils xbean-finder +rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle* + +# 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 %install %mvn_install @@ -73,6 +92,10 @@ find -name Log4jConverter.java -delete %license LICENSE NOTICE %changelog +* Mon Jun 21 2021 Mikolaj Izdebski - 4.18-3 +- Enable xbean-finder +- Resolves: rhbz#1969297 + * Mon May 17 2021 Mikolaj Izdebski - 4.18-2 - Bootstrap build - Non-bootstrap build From 92cbd81e6ca399b164a2aacab553c71b1c1d64cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:17:52 +0000 Subject: [PATCH 19/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index 7f064eb..7628e3a 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java plugin based web server License: ASL 2.0 URL: https://geronimo.apache.org/xbean/ @@ -92,6 +92,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.18-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jun 21 2021 Mikolaj Izdebski - 4.18-3 - Enable xbean-finder - Resolves: rhbz#1969297 From 4ff70c5ee0ad45998e7b6ff5247be348b48e7386 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Nov 2021 17:22:46 +0100 Subject: [PATCH 20/50] Set explicit Java compiler source/target levels to 1.7 --- xbean.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xbean.spec b/xbean.spec index 7628e3a..67f0d94 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java plugin based web server License: ASL 2.0 URL: https://geronimo.apache.org/xbean/ @@ -80,7 +80,7 @@ rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle* sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apache/xbean/finder/archive/MJarJarArchiveTest.java %build -%mvn_build +%mvn_build -- -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 %install %mvn_install @@ -92,6 +92,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Tue Nov 02 2021 Mikolaj Izdebski - 4.18-5 +- Set explicit Java compiler source/target levels to 1.7 + * Fri Jul 23 2021 Fedora Release Engineering - 4.18-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 8454512593bc97518b95ac8f644c0e9c478eb20f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:49:27 +0000 Subject: [PATCH 21/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index 67f0d94..9010d1b 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.18 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java plugin based web server License: ASL 2.0 URL: https://geronimo.apache.org/xbean/ @@ -92,6 +92,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 4.18-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Nov 02 2021 Mikolaj Izdebski - 4.18-5 - Set explicit Java compiler source/target levels to 1.7 From d1a85f8d3e41c3e5c00ee961f7525558a8f9c617 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sun, 6 Feb 2022 00:41:25 +0100 Subject: [PATCH 22/50] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index 9010d1b..dffb5f1 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.18 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java plugin based web server License: ASL 2.0 URL: https://geronimo.apache.org/xbean/ @@ -92,6 +92,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Sat Feb 05 2022 Jiri Vanek - 4.18-7 +- Rebuilt for java-17-openjdk as system jdk + * Sat Jan 22 2022 Fedora Release Engineering - 4.18-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 22d77d5c43fb0954876854dc7b1f82e17fd38139 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 23/50] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- xbean.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xbean.spec b/xbean.spec index dffb5f1..ddd42ac 100644 --- a/xbean.spec +++ b/xbean.spec @@ -7,6 +7,7 @@ Summary: Java plugin based web server License: ASL 2.0 URL: https://geronimo.apache.org/xbean/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Source0: https://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip From a3c19bf6e1893e41cccc78bb9f3b575ca5041cdf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 24/50] Update build-requires in bootstrap mode --- xbean.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index ddd42ac..0254def 100644 --- a/xbean.spec +++ b/xbean.spec @@ -15,10 +15,10 @@ Patch1: 0001-Remove-unused-import.patch Patch2: 0002-Unbundle-ASM.patch Patch3: 0003-Remove-dependency-on-log4j-and-commons-logging.patch -BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: maven-local BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.osgi:org.osgi.core) From f8a4fe0f38d03a1d09d420f44874911026817e92 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:48:21 +0000 Subject: [PATCH 25/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index 0254def..e989ce0 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.18 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java plugin based web server License: ASL 2.0 URL: https://geronimo.apache.org/xbean/ @@ -93,6 +93,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 4.18-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Feb 05 2022 Jiri Vanek - 4.18-7 - Rebuilt for java-17-openjdk as system jdk From e943684d4202c5a4a5b0bf5d02bac7c256d87eb6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:52 +0200 Subject: [PATCH 26/50] Onboard package into gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8f6c9cb --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 +execute: + how: tmt From 1a1813585705dac6f1fc753c05d560c3e275995a Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 9 Sep 2022 15:36:22 +0200 Subject: [PATCH 27/50] Update to upstream version 4.21 --- .gitignore | 1 + 0001-Remove-unused-import.patch | 25 ------------------- ...undle-ASM.patch => 0001-Unbundle-ASM.patch | 0 ...endency-on-log4j-and-commons-logging.patch | 0 sources | 2 +- xbean.spec | 15 +++++------ 6 files changed, 10 insertions(+), 33 deletions(-) delete mode 100644 0001-Remove-unused-import.patch rename 0002-Unbundle-ASM.patch => 0001-Unbundle-ASM.patch (100%) rename 0003-Remove-dependency-on-log4j-and-commons-logging.patch => 0002-Remove-dependency-on-log4j-and-commons-logging.patch (100%) diff --git a/.gitignore b/.gitignore index 283289a..0cd42f9 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /xbean-4.15-source-release.zip /xbean-4.17-source-release.zip /xbean-4.18-source-release.zip +/xbean-4.21-source-release.zip diff --git a/0001-Remove-unused-import.patch b/0001-Remove-unused-import.patch deleted file mode 100644 index c0a9a2f..0000000 --- a/0001-Remove-unused-import.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c7b2913a7d552929a3182901466db69ba40e4340 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -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 - diff --git a/0002-Unbundle-ASM.patch b/0001-Unbundle-ASM.patch similarity index 100% rename from 0002-Unbundle-ASM.patch rename to 0001-Unbundle-ASM.patch diff --git a/0003-Remove-dependency-on-log4j-and-commons-logging.patch b/0002-Remove-dependency-on-log4j-and-commons-logging.patch similarity index 100% rename from 0003-Remove-dependency-on-log4j-and-commons-logging.patch rename to 0002-Remove-dependency-on-log4j-and-commons-logging.patch diff --git a/sources b/sources index fcc3e67..8ab93b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xbean-4.18-source-release.zip) = 766746caa4f9ea87ceff1af1fe052481a9478cab4754b18cb7c760fb9dc466e5fd85533f2040583c3378cf36a4e17ba357d48060896af86a933916008cb2dda6 +SHA512 (xbean-4.21-source-release.zip) = 174072e9cb1577a20494822d056d7b25feef51f0d1871f6c4c84891c220e5822af082e0d408f755d58de8a62c4638d4d2a8697eaca7d47b9d06a93b263da22f1 diff --git a/xbean.spec b/xbean.spec index e989ce0..0bdc5c1 100644 --- a/xbean.spec +++ b/xbean.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: xbean -Version: 4.18 -Release: 8%{?dist} +Version: 4.21 +Release: 1%{?dist} Summary: Java plugin based web server License: ASL 2.0 URL: https://geronimo.apache.org/xbean/ @@ -11,9 +11,8 @@ ExclusiveArch: %{java_arches} noarch 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 +Patch1: 0001-Unbundle-ASM.patch +Patch2: 0002-Remove-dependency-on-log4j-and-commons-logging.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap @@ -46,7 +45,6 @@ This package provides %{summary}. %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/ @@ -77,7 +75,7 @@ find -name Log4jConverter.java -delete %pom_remove_dep :xbean-bundleutils xbean-finder rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle* -# Disable one test that fails on JDK 11 +# Disable one test that fails on JVM 11 sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apache/xbean/finder/archive/MJarJarArchiveTest.java %build @@ -93,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Fri Sep 09 2022 Marian Koncek - 4.21-1 +- Update to upstream version 4.21 + * Sat Jul 23 2022 Fedora Release Engineering - 4.18-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 2a993ebcfcb9a59f5e38920cbed79d323ef7efcc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:10:03 +0000 Subject: [PATCH 28/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index 0bdc5c1..57e6a42 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java plugin based web server License: ASL 2.0 URL: https://geronimo.apache.org/xbean/ @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 4.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Sep 09 2022 Marian Koncek - 4.21-1 - Update to upstream version 4.21 From 1b07956bb5ada2603a993b299a2d11e2902d0aae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:32:20 +0000 Subject: [PATCH 29/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index 57e6a42..54b8ea2 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.21 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java plugin based web server License: ASL 2.0 URL: https://geronimo.apache.org/xbean/ @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 4.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 4.21-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 8121c9d2a4e390373fccb1864365aa39a045485f Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 17 Jul 2023 12:24:06 +0200 Subject: [PATCH 30/50] Use SPDX license format --- xbean.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index 54b8ea2..38d9657 100644 --- a/xbean.spec +++ b/xbean.spec @@ -4,7 +4,7 @@ Name: xbean Version: 4.21 Release: 3%{?dist} Summary: Java plugin based web server -License: ASL 2.0 +License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch From 47951676968bac217868bd8f2bd7c8404dd29cfb Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 17 Jul 2023 12:23:22 +0200 Subject: [PATCH 31/50] Update to upstream version 4.23 --- .gitignore | 1 + sources | 2 +- xbean.spec | 13 ++++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0cd42f9..2ed9e2a 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /xbean-4.17-source-release.zip /xbean-4.18-source-release.zip /xbean-4.21-source-release.zip +/xbean-4.23-source-release.zip diff --git a/sources b/sources index 8ab93b4..0a4268a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xbean-4.21-source-release.zip) = 174072e9cb1577a20494822d056d7b25feef51f0d1871f6c4c84891c220e5822af082e0d408f755d58de8a62c4638d4d2a8697eaca7d47b9d06a93b263da22f1 +SHA512 (xbean-4.23-source-release.zip) = 3b8ebd3a4a4825f9cad3f977fd56056ccfe72c627b07785549d1fff5d81d9ccd226934c612c59213ce04b74ff1ec840e8a86ae27e0f238304ed5d8b805df0974 diff --git a/xbean.spec b/xbean.spec index 38d9657..30c1194 100644 --- a/xbean.spec +++ b/xbean.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: xbean -Version: 4.21 -Release: 3%{?dist} +Version: 4.23 +Release: 1%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -43,8 +43,8 @@ This package provides %{summary}. %prep %setup -q -%patch1 -p1 -%patch2 -p1 +%patch 1 -p1 +%patch 2 -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/ @@ -79,7 +79,7 @@ rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle* sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apache/xbean/finder/archive/MJarJarArchiveTest.java %build -%mvn_build -- -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 +%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Thu Aug 17 2023 Marian Koncek - 4.23-1 +- Update to upstream version 4.23 + * Sat Jul 22 2023 Fedora Release Engineering - 4.21-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From f440934af575038a7087a8c9fb6a1402b8f61be4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 17 Aug 2023 15:58:53 +0200 Subject: [PATCH 32/50] Bootstrap build --- xbean.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index 30c1194..529d6df 100644 --- a/xbean.spec +++ b/xbean.spec @@ -1,4 +1,4 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: xbean Version: 4.23 From 6a2491ab9bd0b547822a8ded46c18023c8957c94 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 17 Aug 2023 16:22:35 +0200 Subject: [PATCH 33/50] Non-bootstrap build --- xbean.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index 529d6df..30c1194 100644 --- a/xbean.spec +++ b/xbean.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: xbean Version: 4.23 From 0f955bf078fb5555eae654e73f2fabda3fd5ecb9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 15:58:22 +0200 Subject: [PATCH 34/50] Rebuild --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index 30c1194..7073877 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.23 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 4.23-2 +- Rebuild + * Thu Aug 17 2023 Marian Koncek - 4.23-1 - Update to upstream version 4.23 From 32d400f78ddac74a7d1773848b78ee411e2f8c00 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:08 +0200 Subject: [PATCH 35/50] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f37 + ref: f40 execute: how: tmt From 260da62b600d349ca57e7fcedd515a8b57074240 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 19 Dec 2023 15:09:40 +0100 Subject: [PATCH 36/50] Update to upstream version 4.24 --- .gitignore | 1 + sources | 2 +- xbean.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2ed9e2a..8b65bd9 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /xbean-4.18-source-release.zip /xbean-4.21-source-release.zip /xbean-4.23-source-release.zip +/xbean-4.24-source-release.zip diff --git a/sources b/sources index 0a4268a..225cbe3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xbean-4.23-source-release.zip) = 3b8ebd3a4a4825f9cad3f977fd56056ccfe72c627b07785549d1fff5d81d9ccd226934c612c59213ce04b74ff1ec840e8a86ae27e0f238304ed5d8b805df0974 +SHA512 (xbean-4.24-source-release.zip) = c88fc635e6365335cb8b78b28ac1324be0970e0d2bc000f5f43ff40d4ce6fbed04a61006788873dc0819e8f80913f40b2da4b9b264c2fe81e78ffcde5dd85e65 diff --git a/xbean.spec b/xbean.spec index 7073877..b380b5e 100644 --- a/xbean.spec +++ b/xbean.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: xbean -Version: 4.23 -Release: 2%{?dist} +Version: 4.24 +Release: 1%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Tue Dec 19 2023 Marian Koncek - 4.24-1 +- Update to upstream version 4.24 + * Fri Sep 01 2023 Mikolaj Izdebski - 4.23-2 - Rebuild From 67f934aff112dc3ba3ec4fe54b056cde76927e68 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:20:49 +0000 Subject: [PATCH 37/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index b380b5e..e54fa1b 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.24 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 4.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Dec 19 2023 Marian Koncek - 4.24-1 - Update to upstream version 4.24 From 82d26a659b8b24758d1523c0506030fa6205d16b Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 18:32:09 +0100 Subject: [PATCH 38/50] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index e54fa1b..d2535d1 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.24 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Tue Feb 27 2024 Jiri Vanek - 4.24-3 +- Rebuilt for java-21-openjdk as system jdk + * Sat Jan 27 2024 Fedora Release Engineering - 4.24-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0f425c958b193f65876848833dc6da729b093327 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:43:56 +0000 Subject: [PATCH 39/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index d2535d1..3232dec 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.24 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 4.24-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 4.24-3 - Rebuilt for java-21-openjdk as system jdk From 0b3a38a2e098a34ea768452131e9ea2e66ea6511 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:26:55 +0000 Subject: [PATCH 40/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index 3232dec..fd4076b 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.24 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 4.24-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 4.24-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a696f3deeada1b98c7853e9b12e6b47efa7c246d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:38:21 +0000 Subject: [PATCH 41/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index fd4076b..44fe407 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.24 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.24-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 4.24-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 772b66254edc9aa916ed072fc90594d8cd01dedc Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 01:30:18 +0200 Subject: [PATCH 42/50] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- xbean.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xbean.spec b/xbean.spec index 44fe407..784b014 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.24 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -17,7 +17,7 @@ Patch2: 0002-Remove-dependency-on-log4j-and-commons-logging.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.osgi:org.osgi.core) @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Tue Jul 29 2025 jiri vanek - 4.24-7 +- Rebuilt for java-25-openjdk as preffered jdk + * Fri Jul 25 2025 Fedora Release Engineering - 4.24-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From cdc3f0019aec0799201fa4feaa7bad07f1dda14a Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 14:12:05 +0200 Subject: [PATCH 43/50] Rrevert to jdk21 during rebuild for https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk your package failed to build. Is preemptively reverted back to versioned jdk21 --- xbean.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xbean.spec b/xbean.spec index 784b014..b25b65c 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.24 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -17,7 +17,7 @@ Patch2: 0002-Remove-dependency-on-log4j-and-commons-logging.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local-openjdk25 +BuildRequires: maven-local-openjdk21 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.osgi:org.osgi.core) @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Wed Jul 30 2025 jiri vanek - 4.24-8 +- Rrevert to jdk21 + * Tue Jul 29 2025 jiri vanek - 4.24-7 - Rebuilt for java-25-openjdk as preffered jdk From 7305b4db3e4d572f913c5acac953af76ec8f34bf Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 19 Aug 2025 11:09:35 +0200 Subject: [PATCH 44/50] Update javapackages-validator URL --- plans/javapackages.fmf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..075e436 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git + ref: main execute: how: tmt From 21a05de56c2b5fa83eeaaf31416c2599e604027a Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 19 Aug 2025 12:32:12 +0200 Subject: [PATCH 45/50] Drop -javadoc subpackage --- xbean.spec | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/xbean.spec b/xbean.spec index b25b65c..08df078 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.24 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -14,6 +14,9 @@ Source0: https://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{vers Patch1: 0001-Unbundle-ASM.patch Patch2: 0002-Remove-dependency-on-log4j-and-commons-logging.patch +# TODO Remove in Fedora 47 +Obsoletes: %{name}-javadoc < 4.24-9 + %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else @@ -35,12 +38,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} - -%description javadoc -This package provides %{summary}. - %prep %setup -q %patch 1 -p1 @@ -79,7 +76,7 @@ rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle* sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apache/xbean/finder/archive/MJarJarArchiveTest.java %build -%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 +%mvn_build -j -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install @@ -87,10 +84,10 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %files -f .mfiles %license LICENSE NOTICE -%files javadoc -f .mfiles-javadoc -%license LICENSE NOTICE - %changelog +* Tue Aug 19 2025 Marian Koncek - 4.24-9 +- Drop -javadoc subpackage + * Wed Jul 30 2025 jiri vanek - 4.24-8 - Rrevert to jdk21 From e540496e47aa0a727ae1f335c0914c0b5ad9cd24 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 19 Aug 2025 12:42:25 +0200 Subject: [PATCH 46/50] Use autorelease and autochangelog --- changelog | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++ xbean.spec | 312 +---------------------------------------------------- 2 files changed, 305 insertions(+), 307 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..549083e --- /dev/null +++ b/changelog @@ -0,0 +1,300 @@ +* Tue Aug 19 2025 Marian Koncek - 4.24-9 +- Drop -javadoc subpackage + +* Wed Jul 30 2025 jiri vanek - 4.24-8 +- Rrevert to jdk21 + +* Tue Jul 29 2025 jiri vanek - 4.24-7 +- Rebuilt for java-25-openjdk as preffered jdk + +* Fri Jul 25 2025 Fedora Release Engineering - 4.24-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 4.24-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 4.24-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 4.24-3 +- Rebuilt for java-21-openjdk as system jdk + +* Sat Jan 27 2024 Fedora Release Engineering - 4.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Dec 19 2023 Marian Koncek - 4.24-1 +- Update to upstream version 4.24 + +* Fri Sep 01 2023 Mikolaj Izdebski - 4.23-2 +- Rebuild + +* Thu Aug 17 2023 Marian Koncek - 4.23-1 +- Update to upstream version 4.23 + +* Sat Jul 22 2023 Fedora Release Engineering - 4.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 4.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Sep 09 2022 Marian Koncek - 4.21-1 +- Update to upstream version 4.21 + +* Sat Jul 23 2022 Fedora Release Engineering - 4.18-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 4.18-7 +- Rebuilt for java-17-openjdk as system jdk + +* Sat Jan 22 2022 Fedora Release Engineering - 4.18-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 4.18-5 +- Set explicit Java compiler source/target levels to 1.7 + +* Fri Jul 23 2021 Fedora Release Engineering - 4.18-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 21 2021 Mikolaj Izdebski - 4.18-3 +- Enable xbean-finder +- Resolves: rhbz#1969297 + +* Mon May 17 2021 Mikolaj Izdebski - 4.18-2 +- Bootstrap build +- Non-bootstrap build + +* Wed Jan 27 2021 Fedora Release Engineering - 4.15-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jan 26 2021 Marian Koncek - 4.18-1 +- Update to upstream version 4.18 + +* Wed Sep 09 2020 Fabio Valentini - 4.15-6 +- Switch from log4j 1.2 compat package to log4j 1.2 API shim. + +* Wed Jul 29 2020 Marian Koncek - 4.17-1 +- Update to upsteam version 4.17 + +* Wed Jul 29 2020 Mat Booth - 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 - 4.15-4 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Jun 25 2020 Jeff Johnston - 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 - 4.14-4 +- Remove dependency on log4j and commons-logging + +* Fri Jan 31 2020 Fedora Release Engineering - 4.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Nov 13 2019 Fabio Valentini - 4.15-1 +- Update to version 4.15. + +* Tue Nov 05 2019 Mikolaj Izdebski - 4.14-3 +- Mass rebuild for javapackages-tools 201902 + +* Tue Nov 05 2019 Mikolaj Izdebski - 4.14-2 +- Disable all modules except xbean-reflect + +* Wed Sep 18 2019 Fabio Valentini - 4.14-2 +- Migrate from the obsolete felix-osgi-core to osgi-core. + +* Tue Aug 20 2019 Fabio Valentini - 4.14-1 +- Update to version 4.14. + +* Sun Jul 28 2019 Fabio Valentini - 4.9-5 +- Disable support for spring and groovy. + +* Sat Jul 27 2019 Fedora Release Engineering - 4.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jul 09 2019 Fabio Valentini - 4.9-3 +- Disable eclipse equinox functionality to fix the FTBFS issue on 32bit arches. + +* Wed Jun 26 2019 Marian Koncek - 4.14-1 +- Update to upstream version 4.14 + +* Fri May 24 2019 Mikolaj Izdebski - 4.8-2 +- Mass rebuild for javapackages-tools 201901 + +* Sun Feb 03 2019 Fedora Release Engineering - 4.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Aug 07 2018 Michael Simacek - 4.9-1 +- Update to upstream version 4.9 + +* Sat Jul 14 2018 Fedora Release Engineering - 4.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Apr 19 2018 Michael Simacek - 4.8-1 +- Update to upstream version 4.8 + +* Tue Mar 13 2018 Michael Simacek - 4.6-1 +- Update to upstream version 4.6 + +* Fri Feb 09 2018 Fedora Release Engineering - 4.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 4.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 4.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 1 2017 Mikolaj Izdebski - 4.5-6 +- Introduce groovy build conditional + +* Wed Feb 01 2017 Michael Simacek - 4.5-5 +- Fix build with conditionals + +* Wed Feb 01 2017 Michael Simacek - 4.5-4 +- Port to current QDox + +* Thu Jun 16 2016 Mikolaj Izdebski - 4.5-3 +- Add missing build-requires + +* Thu May 12 2016 Michael Simacek - 4.5-2 +- Enable xbean-asm-util + +* Mon May 02 2016 Michael Simacek - 4.5-1 +- Update to upstream version 4.5 + +* Fri Feb 05 2016 Fedora Release Engineering - 4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 24 2015 Michael Simacek - 4.4-1 +- Update to upstream version 4.4 +- Rebase patches +- Remove obsolete groovy patch + +* Mon Jul 13 2015 Mikolaj Izdebski - 4.3-1 +- Update to upstream version 4.3 + +* Fri Jun 19 2015 Fedora Release Engineering - 4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Apr 1 2015 Mikolaj Izdebski - 4.2-1 +- Update to upstream version 4.2 + +* Thu Feb 5 2015 Mikolaj Izdebski - 4.1-2 +- Fix patch unshading ASM + +* Fri Nov 21 2014 Mikolaj Izdebski - 4.1-1 +- Update to upstream version 4.1 + +* Sun Jun 08 2014 Fedora Release Engineering - 3.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Apr 14 2014 Mikolaj Izdebski - 3.17-1 +- Update to upstream version 3.17 +- Add patch for Eclipse Luna + +* Thu Dec 5 2013 Mikolaj Izdebski - 3.16-1 +- Update to upstream version 3.16 + +* Thu Aug 08 2013 Stanislav Ochotnicky - 3.13-4 +- Update to latest packaging guidelines + +* Sun Aug 04 2013 Fedora Release Engineering - 3.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Apr 29 2013 Mikolaj Izdebski - 3.13-2 +- Remove unneeded BR: maven-idea-plugin + +* Fri Mar 15 2013 Michal Srb - 3.13-1 +- Update to upstream version 3.13 + +* Fri Feb 15 2013 Fedora Release Engineering - 3.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 3.12-5 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Mon Dec 17 2012 Mikolaj Izdebski - 3.12-4 +- Enable xbean-spring, resolves rhbz#887496 +- Disable xbean-blueprint due to FTBFS + +* Mon Oct 22 2012 Mikolaj Izdebski - 3.12-3 +- Replace eclipse-rcp requires with eclipse-equinox-osgi +- Reenable Equinox + +* Tue Oct 16 2012 gil cattaneo - 3.12-2 +- Enable xbean-blueprint and xbean-classloader modules + +* Wed Oct 10 2012 Mikolaj Izdebski - 3.12-1 +- Update to upstream version 3.12 + +* Wed Oct 10 2012 Krzysztof Daniel 3.11.1-8 +- Revert previous changes. + +* Wed Oct 10 2012 Krzysztof Daniel 3.11.1-7 +- Disable parts dependent on Eclipse (for bootstraping purpose). + +* Wed Oct 10 2012 Mikolaj Izdebski - 3.11.1-6 +- Implement equinox and spring conditionals + +* Mon Sep 3 2012 Mikolaj Izdebski - 3.11.1-5 +- Fix eclipse requires + +* Mon Aug 27 2012 Mikolaj Izdebski - 3.11.1-4 +- Fix felix-framework enabling patch + +* Mon Aug 6 2012 Mikolaj Izdebski - 3.11.1-3 +- Enable xbean-spring +- Enable maven-xbean-plugin +- Remove RPM bug workaround + +* Sun Jul 22 2012 Fedora Release Engineering - 3.11.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jul 13 2012 Mikolaj Izdebski - 3.11.1-1 +- Update to the upstream version 3.11.1 +- Force use of Equinox instead of Felix +- Convert patch to POM macros + +* Thu May 3 2012 Stanislav Ochotnicky - 3.8-5 +- Remove mx4j from deps (javax.management provided by JDK 1.5+) + +* Tue Apr 24 2012 Alexander Kurtakov 3.8-4 +- BR felix-framework instead of felix-osgi-core. + +* Tue Apr 24 2012 Alexander Kurtakov 3.8-3 +- Do not build equinox specific parts for RHEL. + +* Sat Jan 14 2012 Fedora Release Engineering - 3.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 6 2011 Stanislav Ochotnicky - 3.8-1 +- Update to latest upstream version +- Build with maven 3 +- Packaging & guidelines fixes + +* Sat May 28 2011 Marek Goldmann - 3.7-7 +- Added xbean-finder and xbean-bundleutils submodules + +* Fri Mar 4 2011 Stanislav Ochotnicky - 3.7-6 +- Add comment for removing javadoc +- Fix maven 3 build + +* Mon Feb 07 2011 Fedora Release Engineering - 3.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Dec 6 2010 Stanislav Ochotnicky - 3.7-4 +- Fix pom filename (Resolves rhbz#655827) +- Add depmap for main pom file +- Fixes according to new guidelines (versionless jars, javadocs) + +* Fri Jul 30 2010 Stanislav Ochotnicky - 3.7-3 +- Use javadoc:aggregate to generate javadocs + +* Fri Jul 9 2010 Stanislav Ochotnicky - 3.7-2 +- Add license to javadoc subpackage + +* Mon Jun 21 2010 Stanislav Ochotnicky - 3.7-1 +- First release diff --git a/xbean.spec b/xbean.spec index 08df078..ffcce68 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.24 -Release: 9%{?dist} +Release: %autorelease Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -11,8 +11,8 @@ ExclusiveArch: %{java_arches} noarch Source0: https://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip -Patch1: 0001-Unbundle-ASM.patch -Patch2: 0002-Remove-dependency-on-log4j-and-commons-logging.patch +Patch: 0001-Unbundle-ASM.patch +Patch: 0002-Remove-dependency-on-log4j-and-commons-logging.patch # TODO Remove in Fedora 47 Obsoletes: %{name}-javadoc < 4.24-9 @@ -39,9 +39,7 @@ lifecycle and class loader management, and a rock solid Spring integration. %prep -%setup -q -%patch 1 -p1 -%patch 2 -p1 +%autosetup -p1 -C cp xbean-asm-util/src/main/java/org/apache/xbean/asm9/original/commons/AsmConstants.java xbean-reflect/src/main/java/org/apache/xbean/recipe/ @@ -84,304 +82,4 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %files -f .mfiles %license LICENSE NOTICE -%changelog -* Tue Aug 19 2025 Marian Koncek - 4.24-9 -- Drop -javadoc subpackage - -* Wed Jul 30 2025 jiri vanek - 4.24-8 -- Rrevert to jdk21 - -* Tue Jul 29 2025 jiri vanek - 4.24-7 -- Rebuilt for java-25-openjdk as preffered jdk - -* Fri Jul 25 2025 Fedora Release Engineering - 4.24-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 4.24-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 4.24-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 4.24-3 -- Rebuilt for java-21-openjdk as system jdk - -* Sat Jan 27 2024 Fedora Release Engineering - 4.24-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Dec 19 2023 Marian Koncek - 4.24-1 -- Update to upstream version 4.24 - -* Fri Sep 01 2023 Mikolaj Izdebski - 4.23-2 -- Rebuild - -* Thu Aug 17 2023 Marian Koncek - 4.23-1 -- Update to upstream version 4.23 - -* Sat Jul 22 2023 Fedora Release Engineering - 4.21-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 4.21-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Sep 09 2022 Marian Koncek - 4.21-1 -- Update to upstream version 4.21 - -* Sat Jul 23 2022 Fedora Release Engineering - 4.18-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 4.18-7 -- Rebuilt for java-17-openjdk as system jdk - -* Sat Jan 22 2022 Fedora Release Engineering - 4.18-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Nov 02 2021 Mikolaj Izdebski - 4.18-5 -- Set explicit Java compiler source/target levels to 1.7 - -* Fri Jul 23 2021 Fedora Release Engineering - 4.18-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jun 21 2021 Mikolaj Izdebski - 4.18-3 -- Enable xbean-finder -- Resolves: rhbz#1969297 - -* Mon May 17 2021 Mikolaj Izdebski - 4.18-2 -- Bootstrap build -- Non-bootstrap build - -* Wed Jan 27 2021 Fedora Release Engineering - 4.15-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jan 26 2021 Marian Koncek - 4.18-1 -- Update to upstream version 4.18 - -* Wed Sep 09 2020 Fabio Valentini - 4.15-6 -- Switch from log4j 1.2 compat package to log4j 1.2 API shim. - -* Wed Jul 29 2020 Marian Koncek - 4.17-1 -- Update to upsteam version 4.17 - -* Wed Jul 29 2020 Mat Booth - 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 - 4.15-4 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Thu Jun 25 2020 Jeff Johnston - 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 - 4.14-4 -- Remove dependency on log4j and commons-logging - -* Fri Jan 31 2020 Fedora Release Engineering - 4.15-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Nov 13 2019 Fabio Valentini - 4.15-1 -- Update to version 4.15. - -* Tue Nov 05 2019 Mikolaj Izdebski - 4.14-3 -- Mass rebuild for javapackages-tools 201902 - -* Tue Nov 05 2019 Mikolaj Izdebski - 4.14-2 -- Disable all modules except xbean-reflect - -* Wed Sep 18 2019 Fabio Valentini - 4.14-2 -- Migrate from the obsolete felix-osgi-core to osgi-core. - -* Tue Aug 20 2019 Fabio Valentini - 4.14-1 -- Update to version 4.14. - -* Sun Jul 28 2019 Fabio Valentini - 4.9-5 -- Disable support for spring and groovy. - -* Sat Jul 27 2019 Fedora Release Engineering - 4.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Jul 09 2019 Fabio Valentini - 4.9-3 -- Disable eclipse equinox functionality to fix the FTBFS issue on 32bit arches. - -* Wed Jun 26 2019 Marian Koncek - 4.14-1 -- Update to upstream version 4.14 - -* Fri May 24 2019 Mikolaj Izdebski - 4.8-2 -- Mass rebuild for javapackages-tools 201901 - -* Sun Feb 03 2019 Fedora Release Engineering - 4.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Aug 07 2018 Michael Simacek - 4.9-1 -- Update to upstream version 4.9 - -* Sat Jul 14 2018 Fedora Release Engineering - 4.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Apr 19 2018 Michael Simacek - 4.8-1 -- Update to upstream version 4.8 - -* Tue Mar 13 2018 Michael Simacek - 4.6-1 -- Update to upstream version 4.6 - -* Fri Feb 09 2018 Fedora Release Engineering - 4.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 4.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 4.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 1 2017 Mikolaj Izdebski - 4.5-6 -- Introduce groovy build conditional - -* Wed Feb 01 2017 Michael Simacek - 4.5-5 -- Fix build with conditionals - -* Wed Feb 01 2017 Michael Simacek - 4.5-4 -- Port to current QDox - -* Thu Jun 16 2016 Mikolaj Izdebski - 4.5-3 -- Add missing build-requires - -* Thu May 12 2016 Michael Simacek - 4.5-2 -- Enable xbean-asm-util - -* Mon May 02 2016 Michael Simacek - 4.5-1 -- Update to upstream version 4.5 - -* Fri Feb 05 2016 Fedora Release Engineering - 4.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Nov 24 2015 Michael Simacek - 4.4-1 -- Update to upstream version 4.4 -- Rebase patches -- Remove obsolete groovy patch - -* Mon Jul 13 2015 Mikolaj Izdebski - 4.3-1 -- Update to upstream version 4.3 - -* Fri Jun 19 2015 Fedora Release Engineering - 4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Apr 1 2015 Mikolaj Izdebski - 4.2-1 -- Update to upstream version 4.2 - -* Thu Feb 5 2015 Mikolaj Izdebski - 4.1-2 -- Fix patch unshading ASM - -* Fri Nov 21 2014 Mikolaj Izdebski - 4.1-1 -- Update to upstream version 4.1 - -* Sun Jun 08 2014 Fedora Release Engineering - 3.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Apr 14 2014 Mikolaj Izdebski - 3.17-1 -- Update to upstream version 3.17 -- Add patch for Eclipse Luna - -* Thu Dec 5 2013 Mikolaj Izdebski - 3.16-1 -- Update to upstream version 3.16 - -* Thu Aug 08 2013 Stanislav Ochotnicky - 3.13-4 -- Update to latest packaging guidelines - -* Sun Aug 04 2013 Fedora Release Engineering - 3.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Apr 29 2013 Mikolaj Izdebski - 3.13-2 -- Remove unneeded BR: maven-idea-plugin - -* Fri Mar 15 2013 Michal Srb - 3.13-1 -- Update to upstream version 3.13 - -* Fri Feb 15 2013 Fedora Release Engineering - 3.12-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 3.12-5 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Mon Dec 17 2012 Mikolaj Izdebski - 3.12-4 -- Enable xbean-spring, resolves rhbz#887496 -- Disable xbean-blueprint due to FTBFS - -* Mon Oct 22 2012 Mikolaj Izdebski - 3.12-3 -- Replace eclipse-rcp requires with eclipse-equinox-osgi -- Reenable Equinox - -* Tue Oct 16 2012 gil cattaneo - 3.12-2 -- Enable xbean-blueprint and xbean-classloader modules - -* Wed Oct 10 2012 Mikolaj Izdebski - 3.12-1 -- Update to upstream version 3.12 - -* Wed Oct 10 2012 Krzysztof Daniel 3.11.1-8 -- Revert previous changes. - -* Wed Oct 10 2012 Krzysztof Daniel 3.11.1-7 -- Disable parts dependent on Eclipse (for bootstraping purpose). - -* Wed Oct 10 2012 Mikolaj Izdebski - 3.11.1-6 -- Implement equinox and spring conditionals - -* Mon Sep 3 2012 Mikolaj Izdebski - 3.11.1-5 -- Fix eclipse requires - -* Mon Aug 27 2012 Mikolaj Izdebski - 3.11.1-4 -- Fix felix-framework enabling patch - -* Mon Aug 6 2012 Mikolaj Izdebski - 3.11.1-3 -- Enable xbean-spring -- Enable maven-xbean-plugin -- Remove RPM bug workaround - -* Sun Jul 22 2012 Fedora Release Engineering - 3.11.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jul 13 2012 Mikolaj Izdebski - 3.11.1-1 -- Update to the upstream version 3.11.1 -- Force use of Equinox instead of Felix -- Convert patch to POM macros - -* Thu May 3 2012 Stanislav Ochotnicky - 3.8-5 -- Remove mx4j from deps (javax.management provided by JDK 1.5+) - -* Tue Apr 24 2012 Alexander Kurtakov 3.8-4 -- BR felix-framework instead of felix-osgi-core. - -* Tue Apr 24 2012 Alexander Kurtakov 3.8-3 -- Do not build equinox specific parts for RHEL. - -* Sat Jan 14 2012 Fedora Release Engineering - 3.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 6 2011 Stanislav Ochotnicky - 3.8-1 -- Update to latest upstream version -- Build with maven 3 -- Packaging & guidelines fixes - -* Sat May 28 2011 Marek Goldmann - 3.7-7 -- Added xbean-finder and xbean-bundleutils submodules - -* Fri Mar 4 2011 Stanislav Ochotnicky - 3.7-6 -- Add comment for removing javadoc -- Fix maven 3 build - -* Mon Feb 07 2011 Fedora Release Engineering - 3.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Dec 6 2010 Stanislav Ochotnicky - 3.7-4 -- Fix pom filename (Resolves rhbz#655827) -- Add depmap for main pom file -- Fixes according to new guidelines (versionless jars, javadocs) - -* Fri Jul 30 2010 Stanislav Ochotnicky - 3.7-3 -- Use javadoc:aggregate to generate javadocs - -* Fri Jul 9 2010 Stanislav Ochotnicky - 3.7-2 -- Add license to javadoc subpackage - -* Mon Jun 21 2010 Stanislav Ochotnicky - 3.7-1 -- First release +%autochangelog From fc6e5b300c1d6453bc4144fc60e03ca18225d469 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 4 Sep 2025 17:31:51 +0200 Subject: [PATCH 47/50] manual bodhi update for jdk25 needed on selected pkgs From 1df289d87c3617482e813a5dac348b01c67d271f Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 5 Jan 2026 16:39:35 +0100 Subject: [PATCH 48/50] Bumped to jdk25 and skipped tests (fails) --- xbean.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbean.spec b/xbean.spec index ffcce68..2499b2d 100644 --- a/xbean.spec +++ b/xbean.spec @@ -20,7 +20,7 @@ Obsoletes: %{name}-javadoc < 4.24-9 %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local-openjdk21 +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.osgi:org.osgi.core) @@ -74,7 +74,7 @@ rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle* sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apache/xbean/finder/archive/MJarJarArchiveTest.java %build -%mvn_build -j -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 +%mvn_build --force -j -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install From e58a9fa27a3df45dd370a65159b7324f286400b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:28:14 +0000 Subject: [PATCH 49/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From ba8a4b3f3ea770d4fc2bc1fdf70709625712a354 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:01:39 +0000 Subject: [PATCH 50/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild