- add junit4 to fix a build fail

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-codec?expand=0&rev=4
This commit is contained in:
Michal Vyskocil 2012-04-02 13:00:42 +00:00 committed by Git OBS Bridge
parent 21fe53e80b
commit 6c8d498ea7
2 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Apr 2 13:00:19 UTC 2012 - mvyskocil@suse.cz
- add junit4 to fix a build fail
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 28 09:59:47 UTC 2012 - mvyskocil@suse.cz Tue Feb 28 09:59:47 UTC 2012 - mvyskocil@suse.cz

View File

@ -62,6 +62,7 @@ Source4: MANIFEST.MF
BuildRequires: ant >= 1.7 BuildRequires: ant >= 1.7
BuildRequires: ant-junit >= 1.7 BuildRequires: ant-junit >= 1.7
BuildRequires: junit4
BuildRequires: java-devel >= 1.6.0 BuildRequires: java-devel >= 1.6.0
%if %with maven %if %with maven
@ -136,12 +137,12 @@ export MAVEN_OPTS="-Dmaven2.jpp.mode=true -Dmaven2.jpp.depmap.file=%{SOURCE2} -D
install javadoc:javadoc install javadoc:javadoc
%else %else
export CLASSPATH=$(build-classpath junit) export CLASSPATH=$(build-classpath junit4)
ant -Dbuild.sysclasspath=first \ ant -v -d -Dbuild.sysclasspath=first \
-Dconf.home=src/conf \ -Dconf.home=src/conf \
-Dbuild.home=build \ -Dbuild.home=build \
-Dsource.home=src/java \ -Dsource.home=src/main/java \
-Dtest.home=src/test \ -Dtest.home=src/test/java \
-Ddist.home=dist \ -Ddist.home=dist \
-Dcomponent.title=%{short_name} \ -Dcomponent.title=%{short_name} \
-Dcomponent.version=%{version} \ -Dcomponent.version=%{version} \