diff --git a/java-xapool-1.5.0-build_xml.patch b/java-xapool-1.5.0-build_xml.patch
deleted file mode 100644
index e6c78ec..0000000
--- a/java-xapool-1.5.0-build_xml.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- xapool-1.5.0-src/build.xml	2005-05-03 12:09:01.000000000 +0200
-+++ xapool-1.5.0-src/build.xml-gil	2009-10-10 18:02:04.000000000 +0200
-@@ -71,6 +71,7 @@
-   <target name="compile.base">
-     <mkdir dir="${build}/classes"/>
-     <javac
-+      source="1.4"
-       srcdir="${src}"
-       destdir="${build}/classes"
-       deprecation="${compiler.deprecation}"
-@@ -209,7 +210,7 @@
-       packagenames="org.enhydra.*"
-       destdir="${dist.jdoc}"
-       windowtitle="XAPool Developer Documentation"
--      author="true" version="true" use="true" >
-+      author="true" version="true" use="true" source="1.4" >
-       <doctitle><![CDATA[<h1>XAPool Developer Documentation</h1>]]></doctitle>
-       <sourcepath>
-         <pathelement path="${src}"/>
diff --git a/java-xapool-1.5.0.pom b/java-xapool-1.5.0.pom
deleted file mode 100644
index 66d45ab..0000000
--- a/java-xapool-1.5.0.pom
+++ /dev/null
@@ -1,6 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.experlog</groupId>
-  <artifactId>xapool</artifactId>
-  <version>1.5.0</version>
-</project>
\ No newline at end of file
diff --git a/java-xapool.spec b/java-xapool.spec
index 85af32d..3f814c5 100644
--- a/java-xapool.spec
+++ b/java-xapool.spec
@@ -1,96 +1,40 @@
-%define        javahome   /usr/lib/jvm/jdk-gcj
 Name:          java-xapool
 Version:       1.5.0
-Release:       3mamba
+Release:       4mamba
 Summary:       XA database connection pool
 Group:         Development/Libraries/Java
 Vendor:        openmamba
 Distribution:  openmamba
-Packager:      gil <puntogil@libero.it>
-URL:           http://xapool.ow2.org/
-Source0:       http://download.forge.objectweb.org/xapool/xapool-%{version}-src.tgz
-Source1:       java-xapool-1.5.0.pom
-Patch0:        java-xapool-1.5.0-build_xml.patch
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
+URL:           https://javalibs.com/artifact/xapool
+Source0:       http://www.java2s.com/Code/JarDownload/xapool/xapool-%{version}.jar.zip
 License:       LGPL
-BuildRequires: apache-ant
-BuildRequires: apache-geronimo-1.2-specs
-BuildRequires: apache-log4j
-BuildRequires: jakarta-commons-logging
-BuildRequires: java-carol
-BuildRequires: java-gcj-compat
-BuildRequires: java-hsqldb
-BuildRequires: java-jotm
-BuildRequires: java-junit3
-BuildRequires: java-p6spy
-BuildRequires: jpackage-utils
-Requires:      apache-log4j
-Requires:      jakarta-commons-logging
-Requires:      java-carol
-Requires:      java-jotm
-Requires:      java-p6spy
-Requires:      jpackage-utils
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+## AUTOBUILDREQ-BEGIN
+## AUTOBUILDREQ-END
+BuildRequires: javapackages
+Requires:      javapackages
+#Requires:      apache-log4j
+#Requires:      jakarta-commons-logging
+#Requires:      java-carol
+#Requires:      java-jotm
+#Requires:      java-p6spy
+#Requires:      jpackage-utils
 
 %description
 XAPool is an XA database connection pool. XAPool implements javax.sql.XADataSource, and
 provides connection pooling facilities. XAPool allows to pool objects, JDBC connections and
 XA connections.
 
-%package javadoc
-Group:          Documentation
-Summary:        Javadoc for %{name}
-
-%description javadoc
-XAPool is an XA database connection pool.
-
-This package contains javadoc for %{name}
-
 %prep
-
-%setup -q -n xapool-%{version}-src
-%patch0 -p1
-
-for j in $(find . -name "*.jar"); do
-	mv $j $j.no
-done
-
-pushd externals
-	ln -sf $(build-classpath carol/ow_carol) carol.jar
-	ln -sf $(build-classpath howl-logger) howl.jar
-	ln -sf $(build-classpath jotm/jotm) jotm.jar
-	ln -sf $(build-classpath jotm/jotm_jrmp_stubs) jotm_jrmp_stubs.jar
-	ln -sf $(build-classpath commons-logging) commons-logging.jar
-	ln -sf $(build-classpath geronimo/j2ee-connector-1.5-api-1.1.1) connector-1_5.jar
-	ln -sf $(build-classpath geronimo/jta-1.0.1B-api-1.1.1) jta-spec1_0_1.jar
-	ln -sf $(build-classpath log4j) log4j.jar
-	ln -sf $(build-classpath junit-3.8.2) junit.jar
-	ln -sf $(build-classpath p6spy) p6spy.jar
-
-# mv externals/jonas_timer.jar.no
-# mv externals/idb.jar.no
-# mv externals/classes12.jar.no oracle-jdbc-thin
-popd
-
-ln -sf $(build-classpath hsqldb) test/jotmxapooltest/lib/hsqldb.jar
+%setup -q -c
 
 %build
-export JAVA_HOME=%javahome
-export CLASSPATH=""
-CLASSPATH=$CLASSPATH:$(build-classpath commons-logging carol/ow_carol howl-logger)
-CLASSPATH=$CLASSPATH:$(build-classpath geronimo/j2ee-connector-1.5-api geronimo/jta-1.0.1B-api)
-CLASSPATH=$CLASSPATH:$(build-classpath log4j jotm/jotm jotm/jotm_jrmp_stubs hsqldb p6spy)
-ant
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
-mkdir -p %{buildroot}%{_javadir}
-mkdir -p %{buildroot}%{_datadir}/maven2/poms
-
-install -m 644 output/dist/lib/xapool.jar \
+install -D -m 644 xapool-%{version}.jar \
 	%{buildroot}%{_javadir}/xapool-%{version}.jar
-%add_to_maven_depmap com.experlog xapool %{version} JPP xapool
-install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/maven2/poms/JPP-xapool.pom
 
 (
 	cd %{buildroot}%{_javadir}
@@ -99,33 +43,18 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/maven2/poms/JPP-xapool.pom
 	done
 )
 
-mkdir -p %{buildroot}%{_javadocdir}/xapool-%{version}
-cp -pr output/dist/jdoc/* %{buildroot}%{_javadocdir}/xapool-%{version}
-ln -s xapool-%{version} %{buildroot}%{_javadocdir}/xapool
-
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
 %defattr(-,root,root)
 %{_javadir}/xapool-%{version}.jar
 %{_javadir}/xapool.jar
-%{_datadir}/maven2/poms
-%{_mavendepmapfragdir}
-%doc README.txt
-
-%files javadoc
-%defattr(-,root,root)
-%{_javadocdir}/xapool-%{version}
-%{_javadocdir}/xapool
 
 %changelog
+* Fri Aug 19 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 1.5.0-4mamba
+- repackaged using upstream binary jar
+
 * Sun Mar 06 2011 gil <puntogil@libero.it> 1.5.0-3mamba
 - add java-p6spy support
 - rebuilt with java-gcj-compat support