Hello community,
here is the log from the commit of package apache-commons-exec for
openSUSE:Leap:15.2 checked in at 2020-02-05 07:27:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/apache-commons-exec (Old)
and /work/SRC/openSUSE:Leap:15.2/.apache-commons-exec.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-commons-exec"
Wed Feb 5 07:27:15 2020 rev:1 rq:763157 version:1.3
Changes:
--------
New Changes file:
--- /dev/null 2019-12-19 10:12:34.003146842 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.apache-commons-exec.new.26092/apache-commons-exec.changes
2020-02-05 07:27:16.366692474 +0100
@@ -0,0 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 4 06:05:53 UTC 2019 - Fridrich Strba <fst...@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
New:
----
apache-commons-exec.changes
apache-commons-exec.spec
commons-exec-1.3-build_xml.patch
commons-exec-1.3-src.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-exec.spec ++++++
#
# spec file for package apache-commons-exec
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# 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-commons-exec
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: http://commons.apache.org/exec/
Source0:
http://www.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
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
%setup -q -n %{short_name}-%{version}-src
%patch0 -p1
# 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}
install -pm 0644 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
++++++ commons-exec-1.3-build_xml.patch ++++++
--- 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.6"/>
+ <property name="maven.compiler.target" value="1.6"/>
<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="${maven.build.version}",org.apache.commons.exec.environment;version="${maven.build.version}",org.apache.commons.exec.launcher;version="${maven.build.version}",org.apache.commons.exec.util;version="${maven.build.version}""/>
+ <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:="(&(osgi.ee=JavaSE)(version=${maven.compiler.target}))""/>
+ <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>
