diff options
| -rw-r--r-- | dev-java/junit/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/junit/files/junit-4.12-build.xml | 2 | ||||
| -rw-r--r-- | dev-java/junit/junit-4.12.ebuild | 8 |
3 files changed, 11 insertions, 6 deletions
diff --git a/dev-java/junit/ChangeLog b/dev-java/junit/ChangeLog index 2408757fd483..7f477012e54b 100644 --- a/dev-java/junit/ChangeLog +++ b/dev-java/junit/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/junit # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.87 2015/07/11 13:21:27 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.88 2015/07/12 12:19:16 monsieurp Exp $ + + 12 Jul 2015; Patrice Clement <monsieurp@gentoo.org> + files/junit-4.12-build.xml, junit-4.12.ebuild: + Remove 'test' target dependency from 'package' target so that jar file gets + created even with tests off. Fix bug 554584. 11 Jul 2015; Patrice Clement <monsieurp@gentoo.org> files/junit-4.12-build.xml: diff --git a/dev-java/junit/files/junit-4.12-build.xml b/dev-java/junit/files/junit-4.12-build.xml index ad246aa708fe..a7d5f6a44571 100644 --- a/dev-java/junit/files/junit-4.12-build.xml +++ b/dev-java/junit/files/junit-4.12-build.xml @@ -229,7 +229,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="compile" description="Package the application"> <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="false" diff --git a/dev-java/junit/junit-4.12.ebuild b/dev-java/junit/junit-4.12.ebuild index 8420690f7f2b..cbadbe9003ef 100644 --- a/dev-java/junit/junit-4.12.ebuild +++ b/dev-java/junit/junit-4.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.12.ebuild,v 1.1 2015/07/10 12:48:21 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.12.ebuild,v 1.2 2015/07/12 12:19:16 monsieurp Exp $ EAPI="5" @@ -40,20 +40,20 @@ java_prepare() { java-pkg_jar-from --into lib hamcrest-core-1.3 hamcrest-core.jar } -EANT_BUILD_TARGET="compile" +EANT_BUILD_TARGET="package" src_compile() { java-pkg-2_src_compile } -EANT_TEST_TARGET="package" +EANT_TEST_TARGET="test" src_test() { java-pkg-2_src_test } src_install() { - java-pkg_newjar target/${P}.jar + java-pkg_newjar target/${P}.jar junit.jar dodoc doc/ReleaseNotes${PV}.md if use examples; then |