From 269c8649c98ba2fa37f3889cee2660f4f4e051ca Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 11 Mar 2013 15:26:12 +0100 Subject: [PATCH] Disable tests (they use obsolete servlet API 2.4) - Resolves: rhbz#913878 --- apache-commons-fileupload.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/apache-commons-fileupload.spec b/apache-commons-fileupload.spec index 85d0e37..50012b2 100644 --- a/apache-commons-fileupload.spec +++ b/apache-commons-fileupload.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.2.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: This package provides an api to work with html file upload License: ASL 2.0 Group: Development/Libraries @@ -17,7 +17,7 @@ Patch2: %{name}-remove-portlet.patch BuildRequires: java-devel >= 1:1.6.0 BuildRequires: maven-local BuildRequires: junit >= 0:3.8.1 -BuildRequires: servlet25 +BuildRequires: servlet BuildRequires: apache-commons-io BuildRequires: maven-antrun-plugin BuildRequires: maven-assembly-plugin @@ -84,7 +84,8 @@ rm -f src/test/org/apache/commons/fileupload/*Portlet* %build # fix build with generics support -mvn-rpmbuild -Dmaven.compile.source=1.5 -Dmaven.compile.target=1.5 install javadoc:javadoc +# tests fail to compile because they use an obsolete version of servlet API (2.4) +mvn-rpmbuild -Dmaven.test.skip=true -Dmaven.compile.source=1.5 -Dmaven.compile.target=1.5 install javadoc:javadoc # ----------------------------------------------------------------------------- %install @@ -124,6 +125,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : # ----------------------------------------------------------------------------- %changelog +* Mon Mar 11 2013 Mikolaj Izdebski - 1.2.2-11 +- Disable tests (they use obsolete servlet API 2.4) +- Resolves: rhbz#913878 + * Thu Feb 14 2013 Mikolaj Izdebski - 1.2.2-10 - Add missing BR: maven-local