diff --git a/xbean-4.9-source-release.zip b/xbean-4.19-source-release.zip similarity index 55% rename from xbean-4.9-source-release.zip rename to xbean-4.19-source-release.zip index 2d964329ca47f638b979a0ae6305e16822b7b748..c6df79dc7cdda7cb0a0c7cbc74b4e2ec4ebc4b1a 100644 Binary files a/xbean-4.9-source-release.zip and b/xbean-4.19-source-release.zip differ diff --git a/xbean.spec b/xbean.spec index ced7bb53f3047b3d3358b8cdf710afaa8ed07972..44cda618ad5d63d7bef94b4223520a03a9d217ac 100644 --- a/xbean.spec +++ b/xbean.spec @@ -1,6 +1,6 @@ Name: xbean -Version: 4.9 -Release: 3 +Version: 4.19 +Release: 1 Summary: A plugin based server License: ASL 2.0 URL: http://geronimo.apache.org/xbean/ @@ -15,6 +15,7 @@ BuildRequires: mvn(org.slf4j:slf4j-api), mvn(org.eclipse:osgi), mvn(org.codehaus BuildRequires: mvn(com.thoughtworks.qdox:qdox), mvn(org.apache.maven:maven-archiver), mvn(org.apache.maven:maven-artifact), mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-project), mvn(org.apache.maven.plugins:maven-antrun-plugin), mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-archiver), mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) Provides: %{name}-javadoc%{?_isa} %{name}-javadoc Obsoletes: %{name}-javadoc @@ -31,10 +32,8 @@ rm -rf src/site/site.xml %pom_remove_parent %pom_remove_dep mx4j:mx4j %pom_remove_dep -r :xbean-finder-shaded -%pom_remove_dep -r :xbean-asm6-shaded %pom_disable_module xbean-finder-shaded -%pom_disable_module xbean-asm6-shaded %pom_disable_module xbean-blueprint %pom_add_dep org.apache.xbean:xbean-asm-util:%{version} xbean-reflect @@ -42,7 +41,6 @@ rm -rf src/site/site.xml %pom_xpath_remove 'pom:scope[text()="provided"]' xbean-reflect xbean-asm-util %pom_xpath_remove pom:optional xbean-reflect xbean-asm-util -sed -i 's/org\.apache\.xbean\.asm6/org.objectweb.asm/g' `find xbean-reflect -name '*.java'` %pom_remove_dep org.springframework: %pom_disable_module xbean-classloader %pom_disable_module xbean-spring @@ -53,6 +51,9 @@ sed -i 's/org\.apache\.xbean\.asm6/org.objectweb.asm/g' `find xbean-reflect -nam sed -i "s|||" xbean-blueprint/pom.xml +sed -i "s/ASM9/ASM8/g" xbean-asm-util/src/main/java/org/apache/xbean/asm9/original/commons/AsmConstants.java +sed -i "/com.sun.org.apache.regexp.internal/d" xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java + %build %mvn_build -f @@ -67,6 +68,9 @@ sed -i "s|||" xbean-blueprint/pom.xml /usr/share/maven* %changelog +* Thu Jan 02 2025 Ge Wang - 4.19-1 +- Update to version 4.19 + * Wed Mar 11 2020 yanglijin - 4.9-3 - modify require