From 7fb3fb5b26f50fd8a160fdd3c156e01539ff50a008b53034780d63f4f4a86f17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Mon, 27 Jan 2025 11:23:47 +0100
Subject: [PATCH] Sync from SUSE:SLFO:Main apache-commons-exec revision
 a037697ad608578981796f35b733fc82

---
 .gitattributes                   |  23 +++++++
 apache-commons-exec.changes      |  25 +++++++
 apache-commons-exec.spec         |  96 ++++++++++++++++++++++++++
 commons-exec-1.3-build_xml.patch | 111 +++++++++++++++++++++++++++++++
 commons-exec-1.3-src.tar.gz      |   3 +
 5 files changed, 258 insertions(+)
 create mode 100644 .gitattributes
 create mode 100644 apache-commons-exec.changes
 create mode 100644 apache-commons-exec.spec
 create mode 100644 commons-exec-1.3-build_xml.patch
 create mode 100644 commons-exec-1.3-src.tar.gz

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..9b03811
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,23 @@
+## Default LFS
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.bsp filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.gem filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.jar filter=lfs diff=lfs merge=lfs -text
+*.lz filter=lfs diff=lfs merge=lfs -text
+*.lzma filter=lfs diff=lfs merge=lfs -text
+*.obscpio filter=lfs diff=lfs merge=lfs -text
+*.oxt filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.rpm filter=lfs diff=lfs merge=lfs -text
+*.tbz filter=lfs diff=lfs merge=lfs -text
+*.tbz2 filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
+*.txz filter=lfs diff=lfs merge=lfs -text
+*.whl filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text
diff --git a/apache-commons-exec.changes b/apache-commons-exec.changes
new file mode 100644
index 0000000..b0ddf21
--- /dev/null
+++ b/apache-commons-exec.changes
@@ -0,0 +1,25 @@
+-------------------------------------------------------------------
+Wed Oct  2 15:30:00 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Spec file cleanup
+
+-------------------------------------------------------------------
+Tue Feb 20 11:05:51 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Use %autosetup macro. Allows to eliminate the usage of deprecated
+  %patchN.
+
+-------------------------------------------------------------------
+Wed Mar 23 23:05:04 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with java source and target levels 8
+
+-------------------------------------------------------------------
+Thu Apr  4 06:05:53 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Initial packaging of apache-commons-exec 1.3
+- Added patch:
+  * commons-exec-1.3-build_xml.patch
+    + Adapt the build.xml file to produce javadoc, to be able
+      to switch off tests from command-line and add a proper OSGi
+      manifest
diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec
new file mode 100644
index 0000000..79b943a
--- /dev/null
+++ b/apache-commons-exec.spec
@@ -0,0 +1,96 @@
+#
+# spec file for package apache-commons-exec
+#
+# Copyright (c) 2024 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%global base_name exec
+%global short_name commons-%{base_name}
+%bcond_with tests
+Name:           apache-%{short_name}
+Version:        1.3
+Release:        0
+Summary:        Java library to reliably execute external processes from within the JVM
+License:        Apache-2.0
+Group:          Development/Libraries/Java
+URL:            https://commons.apache.org/exec/
+Source0:        https://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Patch0:         commons-exec-1.3-build_xml.patch
+BuildRequires:  ant
+BuildRequires:  dos2unix
+BuildRequires:  fdupes
+BuildRequires:  javapackages-local >= 6
+BuildArch:      noarch
+%if %{with tests}
+BuildRequires:  ant-junit
+%endif
+
+%description
+Commons Exec is a library for dealing with external process execution and
+environment management in Java.
+
+%package javadoc
+Summary:        Javadocs for %{name}
+Group:          Documentation/HTML
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+%autosetup -p1 -n %{short_name}-%{version}-src
+
+# Fix wrong end-of-line encoding
+dos2unix LICENSE.txt NOTICE.txt RELEASE-NOTES.txt STATUS
+
+# Shell scripts used for unit tests must be executable (see
+# http://commons.apache.org/exec/faq.html#environment-testing)
+chmod a+x src/test/scripts/*.sh
+
+# Skip Exec57Test (it is unstable), see rhbz#1202260
+find -name Exec57Test.java -delete
+
+%pom_remove_parent .
+
+%build
+ant \
+%if %{without tests}
+    -Dmaven.test.skip=true \
+%endif
+    jar javadoc
+
+%install
+# jar
+install -dm 0755 %{buildroot}%{_javadir}
+install -pm 0644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{short_name}.jar
+ln -sf %{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
+# pom
+install -dm 0755 %{buildroot}%{_mavenpomdir}
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
+%add_maven_depmap %{short_name}.pom %{short_name}.jar
+# javadoc
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
+%fdupes -s %{buildroot}%{_javadocdir}
+
+%files -f .mfiles
+%license LICENSE.txt NOTICE.txt
+%doc STATUS RELEASE-NOTES.txt
+%{_javadir}/%{name}.jar
+
+%files javadoc
+%license LICENSE.txt NOTICE.txt
+%{_javadocdir}/%{name}
+
+%changelog
diff --git a/commons-exec-1.3-build_xml.patch b/commons-exec-1.3-build_xml.patch
new file mode 100644
index 0000000..df2fcee
--- /dev/null
+++ b/commons-exec-1.3-build_xml.patch
@@ -0,0 +1,111 @@
+--- commons-exec-1.3-src/build.xml	2014-11-03 00:43:14.000000000 +0100
++++ commons-exec-1.3-src/build.xml	2019-04-04 07:41:59.501363164 +0200
+@@ -23,7 +23,7 @@
+   <property file="user.properties" />
+   
+   <property file="build.properties" />
+-  <property name="maven.build.version" value="1.2"/>
++  <property name="maven.build.version" value="1.3"/>
+   <property name="maven.build.output" value="target/classes"/>
+   <property name="maven.build.directory" value="target"/>
+   <property name="maven.build.final.name" value="commons-exec-${maven.build.version}"/>
+@@ -33,8 +33,8 @@
+   <!-- JUnit version should agree with the version in pom.xml -->
+   <property name="maven.junit.jar" value="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
+   <!-- These must agree with the versions in pom.xml -->
+-  <property name="maven.compiler.source" value="1.3"/>
+-  <property name="maven.compiler.target" value="1.3"/>
++  <property name="maven.compiler.source" value="1.8"/>
++  <property name="maven.compiler.target" value="1.8"/>
+ 
+   <path id="junit">
+       <pathelement location="${maven.junit.jar}"/>
+@@ -56,10 +56,35 @@
+   </target>
+ 
+   <target name="jar" depends="compile,test" description="Build the JAR">
+-    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
++    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html">
++      <manifest>
++		<attribute name="Bundle-Description" value="Apache Commons Exec is a library to reliably execute external processes from within the JVM."/>
++		<attribute name="Bundle-DocURL" value="http://commons.apache.org/proper/commons-exec/"/>
++		<attribute name="Bundle-License" value="https://www.apache.org/licenses/LICENSE-2.0.txt"/>
++		<attribute name="Bundle-ManifestVersion" value="2"/>
++		<attribute name="Bundle-Name" value="Apache Commons Exec"/>
++		<attribute name="Bundle-SymbolicName" value="org.apache.commons.commons-exec"/>
++		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
++		<attribute name="Bundle-Version" value="${maven.build.version}.0"/>
++		<attribute name="Export-Package" value="org.apache.commons.exec;version=&quot;${maven.build.version}&quot;,org.apache.commons.exec.environment;version=&quot;${maven.build.version}&quot;,org.apache.commons.exec.launcher;version=&quot;${maven.build.version}&quot;,org.apache.commons.exec.util;version=&quot;${maven.build.version}&quot;"/>
++		<attribute name="Implementation-Title" value="Apache Commons Exec"/>
++		<attribute name="Implementation-URL" value="http://commons.apache.org/proper/commons-exec/"/>
++		<attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
++		<attribute name="Implementation-Vendor-Id" value="org.apache"/>
++		<attribute name="Implementation-Version" value="${maven.build.version}"/>
++		<attribute name="Include-Resource" value="META-INF/NOTICE.txt=NOTICE.txt,META-INF/LICENSE.txt=LICENSE.txt"/>
++		<attribute name="JavaPackages-ArtifactId" value="commons-exec"/>
++		<attribute name="JavaPackages-GroupId" value="org.apache.commons"/>
++		<attribute name="JavaPackages-Version" value="${maven.build.version}"/>
++		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${maven.compiler.target}))&quot;"/>
++		<attribute name="Specification-Title" value="Apache Commons Exec"/>
++		<attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
++		<attribute name="Specification-Version" value="${maven.build.version}"/>
++      </manifest>
++    </jar>
+   </target>
+ 
+-  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
++  <target name="compile-tests" depends="compile" description="Compile the test code" unless="maven.test.skip">
+     <mkdir dir="${maven.test.output}"/>
+     <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false" 
+         includeAntRuntime="false"
+@@ -74,7 +100,15 @@
+     </javac>
+   </target>
+ 
+-  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
++  <target name="javadoc" description="Generates the Javadoc of the application">
++    <javadoc sourcepath="${basedir}/src/main/java" packagenames="*" destdir="${maven.build.directory}/site/apidocs"
++        access="protected" verbose="false" encoding="iso-8859-1" version="true" use="true" author="true"
++		splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false"
++		nohelp="false" nonavbar="false" serialwarn="false" source="${maven.compiler.source}" linksource="true" breakiterator="false">
++    </javadoc>
++  </target>
++
++  <target name="test" depends="compile-tests, junit-missing" unless="junit.skipped" description="Run the test cases">
+     <mkdir dir="${maven.test.reports}"/>
+     <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+       <sysproperty key="basedir" value="."/>
+@@ -101,7 +135,23 @@
+     <available classname="junit.framework.Test" property="junit.present" classpathref="junit"/>
+   </target>
+ 
+-  <target name="junit-present" depends="test-junit-present" unless="junit.present">
++  <target name="test-junit-status" 
++          depends="test-junit-present">
++    <condition property="junit.missing">
++      <and>
++        <isfalse value="${junit.present}"/>
++        <isfalse value="${maven.test.skip}"/>
++      </and>
++    </condition>
++    <condition property="junit.skipped">
++      <or>
++        <isfalse value="${junit.present}"/>
++        <istrue value="${maven.test.skip}"/>
++      </or>
++    </condition>
++  </target>
++
++  <target name="junit-missing" depends="test-junit-status" if="junit.missing">
+     <echo>================================= WARNING ================================</echo>
+     <echo> JUnit isn't present in your classpath. Tests not executed. </echo>
+     <echo>==========================================================================</echo>
+@@ -147,7 +197,7 @@
+     <delete file="${maven.build.directory}/dist/commons-exec-test-${maven.build.version}.tar"/>
+   </target>
+ 
+-  <target name="test-distribution" depends="junit-present,test-distribution-zip,test-distribution-tar" description="Creates a test distribution" if="junit.present" >
++  <target name="test-distribution" depends="junit-missing,test-distribution-zip,test-distribution-tar" description="Creates a test distribution" if="junit.present" >
+   </target>
+   
+ </project>
diff --git a/commons-exec-1.3-src.tar.gz b/commons-exec-1.3-src.tar.gz
new file mode 100644
index 0000000..a365906
--- /dev/null
+++ b/commons-exec-1.3-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db0742fa59b7d69375e5d99e827aee0bf06ac527aa6def63618950e40c24cb9f
+size 153409