OBS-URL: https://build.opensuse.org/package/show/Java:packages/xbean?expand=0&rev=24

xbean-build.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ab2b6f7661dc3d5763bb96acb2e67944ea11f28eea930c6e2713d9a99ef9d5c
+size 2332

xbean.changes

@@ -1,3 +1,51 @@
+-------------------------------------------------------------------
+Mon Mar  7 09:46:33 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 4.20
+  * Bugs
+    + XBEAN-298: FileArchive can lead to NPE
+    + XBEAN-326: NullpointerException in BundleAssignableClassFinder
+    + XBEAN-327: ASM9 bundle
+    + XBEAN-328: Upgrade to asm 9.0
+    + XBEAN-329: trunk does not build due to unused import
+    + XBEAN-330: Wrong OSGi manifests in xbean-asm9-shaded
+    + XBEAN-331: Upgrade to asm 9.1
+  * Improvements
+    + XBEAN-301: Add Automatic-Module-Name to xbean manifest
+    + XBEAN-303: asm shade NOTICE file shouldnt exist
+    + XBEAN-306: MultiJar release support enhancements
+    + XBEAN-309: Support Constructors and Static Factory Methods
+      in xbean-reflect
+    + XBEAN-310: Provide a PropertyEditorRegistry
+    + XBEAN-312: Ensure multi-jar are not scanned twice
+    + XBEAN-318: xbean-finder should log the class name on errors
+    + XBEAN-319: Enable xbean-finder to not store classes without
+      annotations
+    + XBEAN-320: Enable xbean-finder to not track some annotations
+    + XBEAN-322: Upgrade to ASM 7.2
+  * New Features
+    + XBEAN-305: Asm 6.1.1 upgrade
+    + XBEAN-313: Create asm7 bundle
+  * Tasks
+    + XBEAN-296: upgrade to asm 6
+    + XBEAN-302: Upgrade to asm 6.1
+    + XBEAN-308: ASM 6.2 upgrade
+    + XBEAN-311: ASM 6.2.1
+    + XBEAN-314: ASM 7.0 upgrade
+    + XBEAN-316: Upgrade ASM to 7.1
+    + XBEAN-321: Upgrade to asm 7.2-beta
+    + XBEAN-323: Upgrade ASM to 7.3.1
+    + XBEAN-325: Upgrade to asm 8
+- Removed patch:
+  * 0003-Port-to-QDox-2.0.patch
+    + not needed in modules that we build
+- Changed patch:
+  * 0001-Unshade-ASM.patch -> 0002-Unbundle-ASM.patch
+    + Different ASM version and code structure
+- Added patch:
+  * 0003-Remove-dependency-on-log4j-and-commons-logging.patch
+    + Remove unnecessary dependency on log4j and commons-logging
+
 -------------------------------------------------------------------
 Tue Feb 22 18:53:19 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

xbean.spec

@@ -24,10 +24,12 @@ License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            https://geronimo.apache.org/xbean/
 Source0:        https://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip
+Source1:        %{name}-build.tar.xz
 Patch2:         0002-Unbundle-ASM.patch
 Patch3:         0003-Remove-dependency-on-log4j-and-commons-logging.patch
+BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  java-devel >= 1.8
+BuildRequires:  java-devel >= 1.7
 BuildRequires:  javapackages-local
 BuildRequires:  objectweb-asm >= 9
 BuildRequires:  slf4j
@@ -52,7 +54,7 @@ Group:          Documentation/HTML
 This package provides API documentation for xbean.
 
 %prep
-%setup -q
+%setup -q -a1
 %patch2 -p1
 %patch3 -p1
 
@@ -61,6 +63,11 @@ cp xbean-asm-util/src/main/java/org/apache/xbean/asm9/original/commons/AsmConsta
 # Parent POM is not packaged
 %pom_remove_parent
 
+for i in xbean-asm-util xbean-finder xbean-reflect; do
+  %pom_remove_parent ${i}
+  %pom_xpath_inject pom:project "<groupId>org.apache.xbean</groupId><version>%{version}</version>" ${i}
+done
+
 %pom_disable_module xbean-classloader
 %pom_disable_module xbean-classpath
 %pom_disable_module xbean-bundleutils
@@ -86,41 +93,32 @@ find -name Log4jConverter.java -delete
 %pom_remove_dep org.osgi:org.osgi.core 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
-
 %pom_change_dep -r -f ::::: :::::
 
 %build
-for i in xbean-asm-util xbean-finder xbean-naming xbean-reflect; do
-  pushd $i
-    mkdir -p build/classes
-    javac -d build/classes  -encoding utf-8 -source 6 -target 6 \
-      -cp $(build-classpath reload4j commons-logging-api slf4j/api objectweb-asm/asm objectweb-asm/asm-commons):../xbean-asm-util/xbean-asm-util.jar \
-      $(find src/main/java -name *.java)
-    jar cf $i.jar -C build/classes .
-  popd
-done
-mkdir -p build/apidoc
-javadoc -d build/apidoc -source 6 -encoding utf-8 \
-  -classpath $(build-classpath slf4j/api objectweb-asm/asm objectweb-asm/asm-commons) \
-  $(for i in xbean-asm-util xbean-finder xbean-naming xbean-reflect; do find $i/src/main/java -name *.java; done | xargs)
+mkdir -p lib
+build-jar-repository -s lib objectweb-asm slf4j
+%{ant} package javadoc
 
 %install
-# jars && poms
+# jars
 install -dm 755 %{buildroot}%{_javadir}/%{name}
+for i in xbean-asm-util xbean-finder xbean-reflect; do
+  install -m 0644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
+done
+
+# poms
 install -dm 755 %{buildroot}%{_mavenpomdir}/%{name}
-for i in xbean-asm-util xbean-finder xbean-naming xbean-reflect; do
-  install -m 0644 $i/$i.jar %{buildroot}%{_javadir}/%{name}
-  %pom_remove_parent ${i}
-  %pom_xpath_inject pom:project "<groupId>org.apache.xbean</groupId><version>%{version}</version>" ${i}
-  install -m 0644 $i/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$i.pom
-  %add_maven_depmap %{name}/$i.pom %{name}/$i.jar
+for i in xbean-asm-util xbean-finder xbean-reflect; do
+  install -m 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
+  %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar
 done
 
 # javadoc
 install -dm 755 %{buildroot}/%{_javadocdir}/%{name}
-cp -aL build/apidoc/* %{buildroot}/%{_javadocdir}/%{name}
+for i in xbean-asm-util xbean-finder xbean-reflect; do
+  cp -r ${i}/target/site/apidocs %{buildroot}/%{_javadocdir}/%{name}/${i}
+done
 %fdupes -s %{buildroot}/%{_javadocdir}/%{name}
 
 %files -f .mfiles