Compare commits
No commits in common. "c8-stream-201902" and "stream-javapackages-bootstrap-202201-rhel-8.9.0" have entirely different histories.
c8-stream-
...
stream-jav
@ -1 +0,0 @@
|
||||
24ceef44b43cd2726c865d0de5168a84a1cb30c7 SOURCES/apache-ant-1.10.7-src.tar.bz2
|
||||
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
||||
1
|
||||
29
.gitignore
vendored
29
.gitignore
vendored
@ -1 +1,28 @@
|
||||
SOURCES/apache-ant-1.10.7-src.tar.bz2
|
||||
/results_*
|
||||
/*.src.rpm
|
||||
|
||||
/apache-ant-1.7.1-src.tar.bz2
|
||||
/apache-ant-1.8.1-src.tar.bz2
|
||||
/apache-ant-1.8.2-src.tar.bz2
|
||||
/apache-ant-1.8.3-src.tar.bz2
|
||||
/apache-ant-1.8.4-src.tar.bz2
|
||||
/apache-ant-1.9.0-src.tar.bz2
|
||||
/apache-ant-1.9.1-src.tar.bz2
|
||||
/apache-ant-1.9.2-src.tar.bz2
|
||||
/apache-ant-1.9.3-src.tar.bz2
|
||||
/apache-ant-1.9.4-src.tar.bz2
|
||||
/apache-ant-1.9.5-src.tar.bz2
|
||||
/apache-ant-1.9.6-src.tar.bz2
|
||||
/apache-ant-1.9.7-src.tar.bz2
|
||||
/apache-ant-1.10.0-src.tar.bz2
|
||||
/apache-ant-1.10.1-src.tar.bz2
|
||||
/apache-ant-1.10.2-src.tar.bz2
|
||||
/apache-ant-1.10.3-src.tar.bz2
|
||||
/apache-ant-1.10.4-src.tar.bz2
|
||||
/apache-ant-1.10.5-src.tar.bz2
|
||||
/apache-ant-1.10.6-src.tar.bz2
|
||||
/apache-ant-1.10.7-src.tar.bz2
|
||||
/apache-ant-1.10.8-src.tar.bz2
|
||||
/apache-ant-1.10.9-src.tar.bz2
|
||||
/apache-ant-1.10.11-src.tar.bz2
|
||||
/apache-ant-1.10.12-src.tar.bz2
|
||||
|
||||
@ -0,0 +1,68 @@
|
||||
From 750924c556fbb0c431e983ec57befb9a7f070685 Mon Sep 17 00:00:00 2001
|
||||
From: Marian Koncek <mkoncek@redhat.com>
|
||||
Date: Fri, 3 Jun 2022 12:43:45 +0200
|
||||
Subject: [PATCH] Fix integer overflow when parsing SOURCE_DATE_EPOCH
|
||||
|
||||
Upstream: https://github.com/apache/ant/pull/186/commits
|
||||
|
||||
---
|
||||
.../org/apache/tools/ant/taskdefs/Tstamp.java | 2 +-
|
||||
src/tests/antunit/taskdefs/tstamp-test.xml | 31 +++++++++++++++++++
|
||||
2 files changed, 32 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
|
||||
index aa1034e..ca10efe 100644
|
||||
--- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
|
||||
+++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
|
||||
@@ -82,7 +82,7 @@ public class Tstamp extends Task {
|
||||
try {
|
||||
if (epoch != null) {
|
||||
// Value of SOURCE_DATE_EPOCH will be an integer, representing seconds.
|
||||
- d = new Date(Integer.parseInt(epoch) * 1000);
|
||||
+ d = new Date(Long.parseLong(epoch) * 1000L);
|
||||
log("Honouring environment variable " + ENV_SOURCE_DATE_EPOCH + " which has been set to " + epoch);
|
||||
}
|
||||
} catch(NumberFormatException e) {
|
||||
diff --git a/src/tests/antunit/taskdefs/tstamp-test.xml b/src/tests/antunit/taskdefs/tstamp-test.xml
|
||||
index 20c3227..1553d32 100644
|
||||
--- a/src/tests/antunit/taskdefs/tstamp-test.xml
|
||||
+++ b/src/tests/antunit/taskdefs/tstamp-test.xml
|
||||
@@ -75,4 +75,35 @@ public class IsEpochIn1969Here implements Condition {
|
||||
<!-- 'iso' overrides 'simple' -->
|
||||
<au:assertPropertyEquals name="DSTAMP" value="19720417"/>
|
||||
</target>
|
||||
+
|
||||
+ <target name="testSourceDateEpoch">
|
||||
+ <mkdir dir="${input}"/>
|
||||
+ <mkdir dir="${output}"/>
|
||||
+ <echo file="${input}/TstampAntunitTest.java"><![CDATA[
|
||||
+ import org.apache.tools.ant.*;
|
||||
+ import org.apache.tools.ant.taskdefs.*;
|
||||
+ public class TstampAntunitTest {
|
||||
+ public static void main(String[] args) {
|
||||
+ Task task = new Tstamp();
|
||||
+ task.setProject(new Project());
|
||||
+ task.execute();
|
||||
+ String today = task.getProject().getProperty("TODAY");
|
||||
+ System.out.println("TODAY is " + today);
|
||||
+ }
|
||||
+ }
|
||||
+ ]]></echo>
|
||||
+ <javac srcdir="${input}" destdir="${output}"/>
|
||||
+ <local name="testout"/>
|
||||
+ <java classname="TstampAntunitTest"
|
||||
+ failonerror="true"
|
||||
+ outputproperty="testout"
|
||||
+ fork="true">
|
||||
+ <classpath>
|
||||
+ <pathelement location="${output}"/>
|
||||
+ <pathelement path="${java.class.path}"/>
|
||||
+ </classpath>
|
||||
+ <env key="SOURCE_DATE_EPOCH" value="1650585600"/>
|
||||
+ </java>
|
||||
+ <au:assertEquals expected="TODAY is April 22 2022" actual="${testout}"/>
|
||||
+ </target>
|
||||
</project>
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
--- apache-ant-1.10.7/build.xml~ 2019-10-31 14:10:07.739864466 +0100
|
||||
+++ apache-ant-1.10.7/build.xml 2019-10-31 14:10:12.018897830 +0100
|
||||
@@ -145,8 +145,6 @@
|
||||
-->
|
||||
<pathelement location="${src.junit}"/>
|
||||
<pathelement location="${tests.etc.dir}"/>
|
||||
- <!-- Otherwise many tests fail with "com.sun.tools.javac.Main is not on the classpath.": -->
|
||||
- <pathelement location="${java.home}/../lib/tools.jar"/>
|
||||
</path>
|
||||
|
||||
<!--
|
||||
@@ -801,7 +799,6 @@
|
||||
</metainf>
|
||||
<manifest>
|
||||
<attribute name="Main-Class" value="org.apache.tools.ant.Main"/>
|
||||
- <attribute name="Class-Path" value="ant.jar xalan.jar"/>
|
||||
</manifest>
|
||||
</jar>
|
||||
|
||||
@@ -1543,7 +1540,25 @@
|
||||
maxmemory="1000M"
|
||||
verbose="${javadoc.verbose}">
|
||||
|
||||
- <packageset dir="${java.dir}"/>
|
||||
+ <fileset dir="${java.dir}">
|
||||
+ <include name="**/*.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/taskdefs/email/MimeMailer.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/taskdefs/optional/NetRexxC.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/taskdefs/optional/image/Image.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/Arc.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/BasicShape.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/Draw.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/DrawOperation.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/Ellipse.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/ImageOperation.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/Rectangle.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/Rotate.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/Scale.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/Text.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/TransformOperation.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/ColorMapper.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java"/>
|
||||
+ </fileset>
|
||||
|
||||
<!-- hide some meta information for javadoc -->
|
||||
<tag name="todo" description="To do:" scope="all"/>
|
||||
46
ant-build.xml.patch
Normal file
46
ant-build.xml.patch
Normal file
@ -0,0 +1,46 @@
|
||||
--- build.xml~ 2021-05-17 12:32:48.406394876 +0200
|
||||
+++ build.xml 2021-05-17 12:32:39.990389601 +0200
|
||||
@@ -145,8 +145,6 @@
|
||||
-->
|
||||
<pathelement location="${src.junit}"/>
|
||||
<pathelement location="${tests.etc.dir}"/>
|
||||
- <!-- Otherwise many tests fail with "com.sun.tools.javac.Main is not on the classpath.": -->
|
||||
- <pathelement location="${java.home}/../lib/tools.jar"/>
|
||||
</path>
|
||||
|
||||
<!--
|
||||
@@ -819,7 +817,6 @@
|
||||
</metainf>
|
||||
<manifest>
|
||||
<attribute name="Main-Class" value="org.apache.tools.ant.Main"/>
|
||||
- <attribute name="Class-Path" value="ant.jar xalan.jar"/>
|
||||
</manifest>
|
||||
</jar>
|
||||
|
||||
@@ -1562,7 +1559,25 @@
|
||||
verbose="${javadoc.verbose}"
|
||||
additionalparam="${javadoc.doclint.none}">
|
||||
|
||||
- <packageset dir="${java.dir}"/>
|
||||
+ <fileset dir="${java.dir}">
|
||||
+ <include name="**/*.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/taskdefs/email/MimeMailer.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/taskdefs/optional/NetRexxC.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/taskdefs/optional/image/Image.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/Arc.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/BasicShape.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/Draw.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/DrawOperation.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/Ellipse.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/ImageOperation.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/Rectangle.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/Rotate.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/Scale.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/Text.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/TransformOperation.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/types/optional/image/ColorMapper.java"/>
|
||||
+ <exclude name="org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java"/>
|
||||
+ </fileset>
|
||||
|
||||
<!-- hide some meta information for javadoc -->
|
||||
<tag name="todo" description="To do:" scope="all"/>
|
||||
@ -28,31 +28,48 @@
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
|
||||
%bcond_with bootstrap
|
||||
|
||||
%if %{without bootstrap}
|
||||
%bcond_with ant_minimal
|
||||
%else
|
||||
%bcond_without ant_minimal
|
||||
%endif
|
||||
|
||||
%global ant_home %{_datadir}/ant
|
||||
|
||||
Name: ant
|
||||
Version: 1.10.7
|
||||
Release: 2%{?dist}
|
||||
Version: 1.10.12
|
||||
Release: 8%{?dist}
|
||||
Summary: Java build tool
|
||||
Summary(it): Tool per la compilazione di programmi java
|
||||
Summary(fr): Outil de compilation pour java
|
||||
License: ASL 2.0
|
||||
URL: https://ant.apache.org/
|
||||
BuildArch: noarch
|
||||
ExclusiveArch: %{java_arches} noarch
|
||||
|
||||
Source0: https://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
|
||||
Source2: apache-ant-1.8.ant.conf
|
||||
# manpage
|
||||
Source3: ant.asciidoc
|
||||
|
||||
Patch0: %{name}-build.xml.patch
|
||||
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: java-devel >= 1:1.8.0
|
||||
BuildRequires: ant >= 1.10.2
|
||||
BuildRequires: ant-junit
|
||||
Patch1: 0001-Fix-integer-overflow-when-parsing-SOURCE_DATE_EPOCH.patch
|
||||
|
||||
BuildRequires: asciidoc
|
||||
BuildRequires: xmlto
|
||||
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: javapackages-bootstrap
|
||||
%else
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: java-devel >= 1:1.8.0
|
||||
BuildRequires: ant >= 1.10.2
|
||||
BuildRequires: ant-junit
|
||||
%endif
|
||||
|
||||
%if %{without ant_minimal}
|
||||
BuildRequires: mvn(antlr:antlr)
|
||||
BuildRequires: mvn(bcel:bcel)
|
||||
BuildRequires: mvn(bsf:bsf)
|
||||
@ -62,7 +79,6 @@ BuildRequires: mvn(commons-net:commons-net)
|
||||
BuildRequires: mvn(javax.mail:mail)
|
||||
BuildRequires: mvn(jdepend:jdepend)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(log4j:log4j:1.2.13)
|
||||
BuildRequires: mvn(org.tukaani:xz)
|
||||
BuildRequires: mvn(oro:oro)
|
||||
BuildRequires: mvn(regexp:regexp)
|
||||
@ -72,22 +88,17 @@ BuildRequires: mvn(org.hamcrest:hamcrest-core)
|
||||
BuildRequires: mvn(org.hamcrest:hamcrest-library)
|
||||
|
||||
BuildRequires: junit5
|
||||
%endif
|
||||
|
||||
# Theoretically Ant might be usable with just JRE, but typical Ant
|
||||
# workflow requires full JDK, so we recommend it here.
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
Recommends: java-devel >= 1:1.8.0
|
||||
%else
|
||||
Requires: java-devel >= 1:1.8.0
|
||||
%endif
|
||||
|
||||
Requires: %{name}-lib = %{version}-%{release}
|
||||
# Require full javapackages-tools since the ant script uses
|
||||
# /usr/share/java-utils/java-functions
|
||||
Requires: javapackages-tools
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
Apache Ant is a Java library and command-line tool whose mission is to
|
||||
drive processes described in build files as targets and extension
|
||||
@ -115,6 +126,18 @@ Summary: Core part of %{name}
|
||||
%description lib
|
||||
Core part of Apache Ant that can be used as a library.
|
||||
|
||||
%package junit
|
||||
Summary: Optional junit tasks for %{name}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description junit
|
||||
Optional junit tasks for %{name}.
|
||||
|
||||
%description junit -l fr
|
||||
Taches junit optionelles pour %{name}.
|
||||
|
||||
%if %{without ant_minimal}
|
||||
|
||||
%package jmf
|
||||
Summary: Optional jmf tasks for %{name}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
@ -185,8 +208,6 @@ Optional commons net tasks for %{name}.
|
||||
%description commons-net -l fr
|
||||
Taches commons net optionelles pour %{name}.
|
||||
|
||||
# Disable because we don't ship the dependencies
|
||||
|
||||
%package apache-bcel
|
||||
Summary: Optional apache bcel tasks for %{name}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
@ -197,16 +218,6 @@ Optional apache bcel tasks for %{name}.
|
||||
%description apache-bcel -l fr
|
||||
Taches apache bcel optionelles pour %{name}.
|
||||
|
||||
%package apache-log4j
|
||||
Summary: Optional apache log4j tasks for %{name}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description apache-log4j
|
||||
Optional apache log4j tasks for %{name}.
|
||||
|
||||
%description apache-log4j -l fr
|
||||
Taches apache log4j optionelles pour %{name}.
|
||||
|
||||
%package apache-oro
|
||||
Summary: Optional apache oro tasks for %{name}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
@ -274,16 +285,6 @@ Optional jsch tasks for %{name}.
|
||||
%description jsch -l fr
|
||||
Taches jsch optionelles pour %{name}.
|
||||
|
||||
%package junit
|
||||
Summary: Optional junit tasks for %{name}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description junit
|
||||
Optional junit tasks for %{name}.
|
||||
|
||||
%description junit -l fr
|
||||
Taches junit optionelles pour %{name}.
|
||||
|
||||
%package junit5
|
||||
Summary: Optional junit5 tasks for %{name}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
@ -329,28 +330,44 @@ Javadoc for %{name}.
|
||||
%description javadoc -l fr
|
||||
Javadoc pour %{name}.
|
||||
|
||||
%endif
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -n apache-ant-%{version}
|
||||
%patch0 -p1
|
||||
%patch0 -p0
|
||||
%patch1 -p1
|
||||
|
||||
# clean jar files
|
||||
find . -name "*.jar" | xargs -t rm
|
||||
|
||||
# Use our own version of javamail
|
||||
%pom_remove_dep com.sun.mail:jakarta.mail src/etc/poms/ant-javamail
|
||||
%pom_add_dep com.sun.mail:javax.mail::compile src/etc/poms/ant-javamail
|
||||
|
||||
# failing testcases. TODO see why
|
||||
rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java \
|
||||
src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsFileSelectedTest.java \
|
||||
src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsSignedTest.java \
|
||||
src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java \
|
||||
src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java \
|
||||
src/tests/junit/org/apache/tools/mail/MailMessageTest.java
|
||||
|
||||
# Test relies on internal JUnit 5 API that was changed
|
||||
rm src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyXmlResultFormatterTest.java
|
||||
|
||||
# Log4jListener is deprecated by upstream: Apache Log4j (1) is not
|
||||
# developed any more. Last release is 1.2.17 from 26 May 2012 and
|
||||
# contains vulnerability issues.
|
||||
rm src/main/org/apache/tools/ant/listener/Log4jListener.java
|
||||
|
||||
#install jars
|
||||
build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j-1 oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer hamcrest/core hamcrest/library xz-java junit5 opentest4j
|
||||
%if %{with bootstrap}
|
||||
build-jar-repository -s -p lib/optional javapackages-bootstrap/junit javapackages-bootstrap/hamcrest-core
|
||||
%else
|
||||
%if %{with ant_minimal}
|
||||
build-jar-repository -s -p lib/optional junit hamcrest/core hamcrest/library
|
||||
%else
|
||||
build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer hamcrest/core hamcrest/library xz-java junit5 opentest4j
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# fix hardcoded paths in ant script and conf
|
||||
cp -p %{SOURCE2} %{name}.conf
|
||||
@ -373,17 +390,26 @@ mv LICENSE.utf8 LICENSE
|
||||
# We want a hard dep on antlr
|
||||
%pom_xpath_remove pom:optional src/etc/poms/ant-antlr/pom.xml
|
||||
|
||||
# fix javamail dependency coordinates (remove once javamail is updated)
|
||||
%pom_change_dep -r com.sun.mail:jakarta.mail javax.mail:mail src/etc/poms/ant-javamail/pom.xml
|
||||
|
||||
%build
|
||||
%if %{with ant_minimal}
|
||||
%{ant} jars
|
||||
%else
|
||||
%{ant} jars test-jar javadocs
|
||||
%endif
|
||||
|
||||
# typeset the manpage
|
||||
mkdir man
|
||||
asciidoc -b docbook -d manpage -o man/%{name}.xml %{SOURCE3}
|
||||
xmlto man man/%{name}.xml -o man
|
||||
|
||||
#remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests.
|
||||
rm -fr build/lib/ant-jai.jar build/lib/ant-netrexx.jar
|
||||
# -----------------------------------------------------------------------------
|
||||
# remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests.
|
||||
rm build/lib/ant-jai.jar build/lib/ant-netrexx.jar
|
||||
# log4j logging is deprecated
|
||||
rm build/lib/ant-apache-log4j.jar
|
||||
|
||||
|
||||
%install
|
||||
# ANT_HOME and subdirs
|
||||
@ -394,6 +420,16 @@ mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc,bin}
|
||||
|
||||
%mvn_file ':{ant,ant-bootstrap,ant-launcher}' %{name}/@1 @1
|
||||
|
||||
%if %{with ant_minimal}
|
||||
mv build/lib build/lib0
|
||||
mkdir build/lib/
|
||||
mv build/lib0/ant.jar build/lib/
|
||||
mv build/lib0/ant-bootstrap.jar build/lib/
|
||||
mv build/lib0/ant-launcher.jar build/lib/
|
||||
mv build/lib0/ant-junit.jar build/lib/
|
||||
mv build/lib0/ant-junit4.jar build/lib/
|
||||
%endif
|
||||
|
||||
for jar in build/lib/*.jar
|
||||
do
|
||||
# Make sure that installed JARs are not empty
|
||||
@ -430,6 +466,11 @@ rm -f src/script/*.bat
|
||||
rm -f src/script/*.cmd
|
||||
|
||||
# XSLs
|
||||
%if %{with ant_minimal}
|
||||
rm src/etc/jdepend-frames.xsl
|
||||
rm src/etc/jdepend.xsl
|
||||
rm src/etc/maudit-frames.xsl
|
||||
%endif
|
||||
cp -p src/etc/*.xsl $RPM_BUILD_ROOT%{ant_home}/etc
|
||||
|
||||
# install everything else
|
||||
@ -444,16 +485,19 @@ cp -p %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
|
||||
|
||||
# OPT_JAR_LIST fragments
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d
|
||||
echo "junit hamcrest/core ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
|
||||
echo "junit hamcrest/core ant/ant-junit4" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit4
|
||||
|
||||
%if %{without ant_minimal}
|
||||
|
||||
echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jmf
|
||||
echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/swing
|
||||
echo "antlr ant/ant-antlr" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/antlr
|
||||
echo "rhino bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bsf
|
||||
echo "bsf commons-logging ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bsf
|
||||
echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-resolver
|
||||
echo "apache-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-logging
|
||||
echo "apache-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net
|
||||
#echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%%{_sysconfdir}/%%{name}.d/jai
|
||||
echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bcel
|
||||
echo "log4j12 ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-log4j
|
||||
echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-oro
|
||||
echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-regexp
|
||||
echo "xalan-j2 xalan-j2-serializer ant/ant-apache-xalan2" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-xalan2
|
||||
@ -461,8 +505,6 @@ echo "ant/ant-imageio" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/imageio
|
||||
echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/javamail
|
||||
echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend
|
||||
echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
|
||||
echo "junit hamcrest/core ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
|
||||
echo "junit hamcrest/core ant/ant-junit4" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit4
|
||||
echo "junit5 hamcrest/core junit opentest4j ant/ant-junitlauncher" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junitlauncher
|
||||
echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/testutil
|
||||
echo "xz-java ant/ant-xz" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/xz
|
||||
@ -474,17 +516,16 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
# fix link between manual and javadoc
|
||||
(cd manual; ln -sf %{_javadocdir}/%{name} api)
|
||||
|
||||
%endif
|
||||
|
||||
# manpage
|
||||
install -d -m 755 %{buildroot}%{_mandir}/man1/
|
||||
install -p -m 644 man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
|
||||
|
||||
%if %{without ant_minimal}
|
||||
%check
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
export LC_ALL=en_US.UTF-8
|
||||
%else
|
||||
export LC_ALL=C.UTF-8
|
||||
LC_ALL=C.UTF-8 %{ant} test
|
||||
%endif
|
||||
%{ant} test
|
||||
|
||||
%files
|
||||
%doc KEYS README WHATSNEW
|
||||
@ -513,6 +554,19 @@ export LC_ALL=C.UTF-8
|
||||
%{ant_home}/lib/%{name}-launcher.jar
|
||||
%{ant_home}/lib/%{name}-bootstrap.jar
|
||||
|
||||
%files junit -f .mfiles-junit
|
||||
%{ant_home}/lib/%{name}-junit.jar
|
||||
%{ant_home}/lib/%{name}-junit4.jar
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/junit
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/junit4
|
||||
%{ant_home}/etc/junit-frames.xsl
|
||||
%{ant_home}/etc/junit-noframes.xsl
|
||||
%{ant_home}/etc/junit-frames-xalan1.xsl
|
||||
%{ant_home}/etc/junit-frames-saxon.xsl
|
||||
%{ant_home}/etc/junit-noframes-saxon.xsl
|
||||
|
||||
%if %{without ant_minimal}
|
||||
|
||||
%files jmf -f .mfiles-jmf
|
||||
%{ant_home}/lib/%{name}-jmf.jar
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/jmf
|
||||
@ -541,16 +595,10 @@ export LC_ALL=C.UTF-8
|
||||
%{ant_home}/lib/%{name}-commons-net.jar
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/commons-net
|
||||
|
||||
# Disable as we dont ship the dependencies
|
||||
|
||||
%files apache-bcel -f .mfiles-apache-bcel
|
||||
%{ant_home}/lib/%{name}-apache-bcel.jar
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel
|
||||
|
||||
%files apache-log4j -f .mfiles-apache-log4j
|
||||
%{ant_home}/lib/%{name}-apache-log4j.jar
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-log4j
|
||||
|
||||
%files apache-oro -f .mfiles-apache-oro
|
||||
%{ant_home}/lib/%{name}-apache-oro.jar
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro
|
||||
@ -582,17 +630,6 @@ export LC_ALL=C.UTF-8
|
||||
%{ant_home}/lib/%{name}-jsch.jar
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/jsch
|
||||
|
||||
%files junit -f .mfiles-junit
|
||||
%{ant_home}/lib/%{name}-junit.jar
|
||||
%{ant_home}/lib/%{name}-junit4.jar
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/junit
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/junit4
|
||||
%{ant_home}/etc/junit-frames.xsl
|
||||
%{ant_home}/etc/junit-noframes.xsl
|
||||
%{ant_home}/etc/junit-frames-xalan1.xsl
|
||||
%{ant_home}/etc/junit-frames-saxon.xsl
|
||||
%{ant_home}/etc/junit-noframes-saxon.xsl
|
||||
|
||||
%files junit5 -f .mfiles-junitlauncher
|
||||
%{ant_home}/lib/%{name}-junitlauncher.jar
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/junitlauncher
|
||||
@ -613,20 +650,102 @@ export LC_ALL=C.UTF-8
|
||||
%license LICENSE NOTICE
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%endif
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.7-2
|
||||
- Mass rebuild for javapackages-tools 201902
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.12-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Wed Oct 16 2019 Marian Koncek <mkoncek@redhat.com> - 1.10.7-1
|
||||
- Update to upstream version 1.10.7
|
||||
* Thu Jul 14 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.12-7
|
||||
- Skip running ImageIOTest test
|
||||
|
||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.6-2
|
||||
- Mass rebuild for javapackages-tools 201901
|
||||
* Mon Jun 06 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.12-6
|
||||
- Rebuild to fix incorrect version string
|
||||
- Resolves: rhbz#1936159
|
||||
|
||||
* Wed May 08 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.6-1
|
||||
- Update to upstream version 1.10.6
|
||||
* Fri Jun 03 2022 Marian Koncek <mkoncek@redhat.com> - 1.10.12-5
|
||||
- Fix integer overflow when parsing SOURCE_DATE_EPOCH
|
||||
|
||||
* Fri Apr 22 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.12-4
|
||||
- Fix FTBFS with JUnit 5.8.x
|
||||
|
||||
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.10.12-3
|
||||
- Rebuilt for java-17-openjdk as system jdk
|
||||
|
||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.12-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Tue Nov 09 2021 Marian Koncek <mkoncek@redhat.com> - 1.10.12-1
|
||||
- Update to upstream version 1.10.12
|
||||
|
||||
* Wed Oct 13 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.11-2
|
||||
- Bump release
|
||||
|
||||
* Thu Sep 9 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.10.11-1
|
||||
- Add Obsoletes for removed apache-log4j subpackage to fix upgrades
|
||||
|
||||
* Wed Aug 11 2021 Marian Koncek <mkoncek@redhat.com> - 1.10.11-1
|
||||
- Update to upstream version 1.10.11
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.9-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.9-5
|
||||
- Disable deprecated log4j logging functionality
|
||||
|
||||
* Mon Jun 21 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.9-4
|
||||
- Remove support for JavaScript
|
||||
|
||||
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.9-3
|
||||
- Bootstrap build
|
||||
- Non-bootstrap build
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.10.9-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Oct 16 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.10.9-1
|
||||
- Update to version 1.10.9.
|
||||
- Addresses: CVE-2020-11979
|
||||
|
||||
* Wed Sep 16 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.10.8-6
|
||||
- Remove workaround for jarsigner issues / RHBZ#1869017.
|
||||
|
||||
* Wed Sep 09 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.10.8-5
|
||||
- Switch from log4j 1.2 compat package to log4j 1.2 API shim.
|
||||
|
||||
* Sun Aug 23 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.10.8-4
|
||||
- Temporarily disable some jarsigner tests to work around RHBZ#1869017.
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.10.8-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0:1.10.8-2
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
- disabled javadoc, as it fails in jdk11, and ant should not be an FTBFS to soon
|
||||
|
||||
* Sat May 16 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.10.8-1
|
||||
- Update to version 1.10.8.
|
||||
- Addresses: CVE-2020-1945
|
||||
|
||||
* Fri May 08 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.10.7-1
|
||||
- Update to version 1.10.7.
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.10.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Mon Jul 29 2019 Fabio Valentini <decathorpe@gmail.com> - 0:1.10.6-1
|
||||
- Update to version 1.10.6.
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.10.5-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sat Apr 27 2019 François Cami <fcami@redhat.com> - - 0:1.10.5-5
|
||||
- Bump to fix FTBFS
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.10.5-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Nov 19 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0:1.10.5-3
|
||||
- Use C.UTF-8 locale
|
||||
@ -650,7 +769,7 @@ export LC_ALL=C.UTF-8
|
||||
|
||||
* Tue Jun 26 2018 Michael Simacek <msimacek@redhat.com> - 0:1.10.4-1
|
||||
- Update to upstream version 1.10.4
|
||||
- Resolves: rhbz#1584407
|
||||
- Resolves rhbz#1584407
|
||||
|
||||
* Wed Apr 18 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.10.3-2
|
||||
- Remove legacy Obsoletes/Provides
|
||||
9
gating.yaml
Normal file
9
gating.yaml
Normal file
@ -0,0 +1,9 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_contexts:
|
||||
- bodhi_update_push_testing
|
||||
- bodhi_update_push_stable
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional}
|
||||
7
plans/javapackages.fmf
Normal file
7
plans/javapackages.fmf
Normal file
@ -0,0 +1,7 @@
|
||||
summary:
|
||||
Run javapackages-specific tests
|
||||
discover:
|
||||
how: fmf
|
||||
url: https://pagure.io/javapackages-validator-tests
|
||||
execute:
|
||||
how: tmt
|
||||
6
plans/smoke.fmf
Normal file
6
plans/smoke.fmf
Normal file
@ -0,0 +1,6 @@
|
||||
summary: Basic smoke test
|
||||
execute:
|
||||
script:
|
||||
- ant -version
|
||||
- ant -diagnostics
|
||||
- ant -v -f plans/smoke.xml hello
|
||||
5
plans/smoke.xml
Normal file
5
plans/smoke.xml
Normal file
@ -0,0 +1,5 @@
|
||||
<project>
|
||||
<target name="hello">
|
||||
<echo message="Hello, world"/>
|
||||
</target>
|
||||
</project>
|
||||
Loading…
Reference in New Issue
Block a user