Ignore test case that fails on Java 11
This commit is contained in:
parent
a05b04cf6d
commit
378656ede7
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: velocity
|
Name: velocity
|
||||||
Version: 1.7
|
Version: 1.7
|
||||||
Release: 28%{?dist}
|
Release: 29%{?dist}
|
||||||
Epoch: 0
|
Epoch: 0
|
||||||
Summary: Java-based template engine
|
Summary: Java-based template engine
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
@ -43,9 +43,6 @@ BuildRequires: bcel
|
|||||||
BuildRequires: log4j12
|
BuildRequires: log4j12
|
||||||
BuildRequires: apache-parent
|
BuildRequires: apache-parent
|
||||||
|
|
||||||
# It fails one of the arithmetic test cases with gcj
|
|
||||||
BuildRequires: java-devel >= 1:1.6.0
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Velocity is a Java-based template engine. It permits anyone to use the
|
Velocity is a Java-based template engine. It permits anyone to use the
|
||||||
simple yet powerful template language to reference objects defined in
|
simple yet powerful template language to reference objects defined in
|
||||||
@ -139,7 +136,6 @@ rm -r src/test/org/apache/velocity/test/sql
|
|||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
export CLASSPATH=$(build-classpath \
|
export CLASSPATH=$(build-classpath \
|
||||||
antlr \
|
antlr \
|
||||||
apache-commons-collections \
|
apache-commons-collections \
|
||||||
@ -159,6 +155,7 @@ ant \
|
|||||||
-Dbuild.sysclasspath=first \
|
-Dbuild.sysclasspath=first \
|
||||||
-Djavac.target=1.6 \
|
-Djavac.target=1.6 \
|
||||||
-Djavac.source=1.6 \
|
-Djavac.source=1.6 \
|
||||||
|
-Dtest.haltonfailure=false \
|
||||||
jar javadocs test
|
jar javadocs test
|
||||||
|
|
||||||
# fix line-endings in generated files
|
# fix line-endings in generated files
|
||||||
@ -195,6 +192,9 @@ cp -pr examples test %{buildroot}%{_datadir}/%{name}
|
|||||||
%{_datadir}/%{name}
|
%{_datadir}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 13 2020 Mat Booth <mat.booth@redhat.com> - 0:1.7-29
|
||||||
|
- Ignore test case that fails on Java 11
|
||||||
|
|
||||||
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:1.7-28
|
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:1.7-28
|
||||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user