Accepting request 957047 from Java:packages

Build against reload4j

OBS-URL: https://build.opensuse.org/request/show/957047
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/axis?expand=0&rev=36

axis.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 22 19:26:22 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Do not build against the log4j12 packages, use the new reload4j
+
 -------------------------------------------------------------------
 Tue Oct  1 08:55:41 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 

axis.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package axis
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@ Release:        0
 Summary:        Apache implementation of the SOAP
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-Url:            http://axis.apache.org/axis/
+URL:            http://axis.apache.org/axis/
 Source0:        axis-src-1_4.tar.bz2
 # svn export http://svn.apache.org/repos/asf/webservices/axis/branches/AXIS_1_4_FINAL/
 # Build only
@@ -64,7 +64,7 @@ BuildRequires:  javamail
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  junit
-BuildRequires:  log4j12-mini
+BuildRequires:  reload4j
 BuildRequires:  servletapi5
 BuildRequires:  unzip
 BuildRequires:  wsdl4j
@@ -76,7 +76,7 @@ Requires:       jakarta-commons-discovery
 Requires:       java
 Requires:       javamail
 Requires:       jaxp_parser_impl
-Requires:       log4j12
+Requires:       reload4j
 Requires:       wsdl4j
 Obsoletes:      %{name}-javadoc
 BuildArch:      noarch
@@ -118,7 +118,7 @@ cp %{SOURCE1} %{SOURCE2} %{SOURCE3} .
 
 %build
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
-CLASSPATH=$(build-classpath wsdl4j commons-discovery commons-httpclient3 commons-logging log4j12/log4j-12 activation javamail servletapi5)
+CLASSPATH=$(build-classpath wsdl4j commons-discovery commons-httpclient3 commons-logging reload4j activation javamail servletapi5)
 export CLASSPATH=$CLASSPATH:$(build-classpath oro junit jdepend jimi xml-security jsse httpunit jms castor 2>/dev/null)
 export OPT_JAR_LIST="ant/ant-nodeps"
 ant -Dcompile.ime=true \
@@ -126,7 +126,7 @@ ant -Dcompile.ime=true \
     -Dcommons-discovery.jar=$(build-classpath commons-discovery) \
     -Dcommons-logging.jar=$(build-classpath commons-logging) \
     -Dcommons-httpclient.jar=$(build-classpath commons-httpclient3) \
-    -Dlog4j-core.jar=$(build-classpath log4j12/log4j-12) \
+    -Dlog4j-core.jar=$(build-classpath reload4j/reload4j) \
     -Dactivation.jar=$(build-classpath jaf) \
     -Dmailapi.jar=$(build-classpath javamail/mailapi) \
     -Dxerces.jar=$(build-classpath jaxp_parser_impl) \