From f684ffd653abc8f709900330e467462278a11477c6d6b5e03d33a6da05033498 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 22 Feb 2022 15:04:22 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/reload4j?expand=0&rev=9

---
 reload4j-build.xml | 36 ++++++++++++++++++------------------
 reload4j.spec      |  7 +++----
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/reload4j-build.xml b/reload4j-build.xml
index 0dae8a1..d3731d4 100644
--- a/reload4j-build.xml
+++ b/reload4j-build.xml
@@ -131,14 +131,14 @@
           <include name="**/*Test.java"/>
           <include name="**/*TestCase.java"/>
           <exclude name="**/*Abstract*Test.java"/>
-		  <exclude name="**/*Test*Constants.java"/>
+          <exclude name="**/*Test*Constants.java"/>
         </fileset>
       </batchtest>
       <batchtest todir="${test.reports}" if="test">
         <fileset dir="${build.testDir}">
           <include name="**/${test}.java"/>
           <exclude name="**/*Abstract*Test.java"/>
-		  <exclude name="**/*Test*Constants.java"/>
+          <exclude name="**/*Test*Constants.java"/>
         </fileset>
       </batchtest>
     </junit>
@@ -215,22 +215,22 @@
          basedir="${build.outputDir}" 
          excludes="**/package.html">
       <manifest>
-		<attribute name="Bundle-Description" value="Reload4j revives EOLed log4j 1.x"/>
-		<attribute name="Bundle-DocURL" value="https://reload4j.qos.ch/"/>
-		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-		<attribute name="Bundle-ManifestVersion" value="2"/>
-		<attribute name="Bundle-Name" value="${project.artifactId}"/>
-		<attribute name="Bundle-SymbolicName" value="org.apache.log4j"/>
-		<attribute name="Bundle-Vendor" value="QOS.CH Sarl (Switzerland)"/>
-		<attribute name="Bundle-Version" value="${project.version}"/>
-		<attribute name="Export-Package" value="org.apache.log4j.config;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j&quot;,org.apache.log4j.helpers;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.jdbc;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.net;version=&quot;${project.version}&quot;;uses:=&quot;javax.jms,javax.mail,javax.naming,org.apache.log4j,org.apache.log4j.helpers,org.apache.log4j.spi,org.apache.log4j.xml,org.w3c.dom&quot;,org.apache.log4j.or.jms;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j.or&quot;,org.apache.log4j.or.sax;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j.or&quot;,org.apache.log4j.or;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j.spi&quot;,org.apache.log4j.pattern;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j,org.apache.log4j.helpers,org.apache.log4j.spi&quot;,org.apache.log4j.rewrite;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j,org.apache.log4j.spi,org.apache.log4j.xml,org.w3c.dom&quot;,org.apache.log4j.spi;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j,org.apache.log4j.or&quot;,org.apache.log4j.varia;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.xml;version=&quot;${project.version}&quot;;uses:=&quot;javax.xml.parsers,org.apache.log4j,org.apache.log4j.config,org.apache.log4j.spi,org.w3c.dom,org.xml.sax&quot;,org.apache.log4j;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j.helpers,org.apache.log4j.or,org.apache.log4j.spi&quot;"/>
-		<attribute name="Implementation-Title" value="${project.artifactId}"/>
-		<attribute name="Implementation-Vendor" value="QOS.CH Sarl (Switzerland)"/>
-		<attribute name="Implementation-Version" value="${project.version}"/>
-		<attribute name="Import-Package" value="javax.jmdns;resolution:=optional,javax.jms;resolution:=optional,javax.mail.internet;version=&quot;[1.4,2)&quot;;resolution:=optional,javax.mail;version=&quot;[1.4,2)&quot;;resolution:=optional,javax.naming,javax.xml.parsers,org.w3c.dom,org.xml.sax,org.xml.sax.helpers"/>
-		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-		<attribute name="X-Compile-Source-JDK" value="${compiler.source}"/>
-		<attribute name="X-Compile-Target-JDK" value="${compiler.target}"/>
+        <attribute name="Bundle-Description" value="Reload4j revives EOLed log4j 1.x"/>
+        <attribute name="Bundle-DocURL" value="https://reload4j.qos.ch/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="${project.artifactId}"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.log4j"/>
+        <attribute name="Bundle-Vendor" value="QOS.CH Sarl (Switzerland)"/>
+        <attribute name="Bundle-Version" value="${project.version}"/>
+        <attribute name="Export-Package" value="org.apache.log4j.config;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j&quot;,org.apache.log4j.helpers;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.jdbc;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.net;version=&quot;${project.version}&quot;;uses:=&quot;javax.jms,javax.mail,javax.naming,org.apache.log4j,org.apache.log4j.helpers,org.apache.log4j.spi,org.apache.log4j.xml,org.w3c.dom&quot;,org.apache.log4j.or.jms;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j.or&quot;,org.apache.log4j.or.sax;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j.or&quot;,org.apache.log4j.or;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j.spi&quot;,org.apache.log4j.pattern;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j,org.apache.log4j.helpers,org.apache.log4j.spi&quot;,org.apache.log4j.rewrite;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j,org.apache.log4j.spi,org.apache.log4j.xml,org.w3c.dom&quot;,org.apache.log4j.spi;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j,org.apache.log4j.or&quot;,org.apache.log4j.varia;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.xml;version=&quot;${project.version}&quot;;uses:=&quot;javax.xml.parsers,org.apache.log4j,org.apache.log4j.config,org.apache.log4j.spi,org.w3c.dom,org.xml.sax&quot;,org.apache.log4j;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j.helpers,org.apache.log4j.or,org.apache.log4j.spi&quot;"/>
+        <attribute name="Implementation-Title" value="${project.artifactId}"/>
+        <attribute name="Implementation-Vendor" value="QOS.CH Sarl (Switzerland)"/>
+        <attribute name="Implementation-Version" value="${project.version}"/>
+        <attribute name="Import-Package" value="javax.jmdns;resolution:=optional,javax.jms;resolution:=optional,javax.mail.internet;version=&quot;[1.4,2)&quot;;resolution:=optional,javax.mail;version=&quot;[1.4,2)&quot;;resolution:=optional,javax.naming,javax.xml.parsers,org.w3c.dom,org.xml.sax,org.xml.sax.helpers"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
+        <attribute name="X-Compile-Source-JDK" value="${compiler.source}"/>
+        <attribute name="X-Compile-Target-JDK" value="${compiler.target}"/>
       </manifest>
     </jar>
   </target>
diff --git a/reload4j.spec b/reload4j.spec
index f90a978..f7e57e8 100644
--- a/reload4j.spec
+++ b/reload4j.spec
@@ -49,6 +49,7 @@ BuildArch:      noarch
 %if %{with tests}
 BuildRequires:  ant-junit
 BuildRequires:  geronimo-jaf-1_0_2-api
+BuildRequires:  h2database
 %endif
 
 %description
@@ -69,18 +70,16 @@ This package contains the API documentation for %{name}.
 %setup -q
 cp %{SOURCE1} build.xml
 mkdir -p lib
-# Tests removed class
-rm -f src/test/java/org/apache/log4j/jdbc/JdbcAppenderTest.java
 
 %build
 build-jar-repository -s lib javamail geronimo-jms-1.1-api
 %if %{with tests}
-build-jar-repository -s lib geronimo-jaf-1.0.2-api
+build-jar-repository -s lib geronimo-jaf-1.0.2-api h2database
 %endif
 
 %{ant} \
 %if %{without tests}
-		-Dtest.skip=true \
+        -Dtest.skip=true \
 %endif
         package javadoc