diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2015-03-29 00:53:49 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2015-03-29 00:53:49 +0000 |
| commit | 8097994ca1e4dd8ca25adc905708b0cefd925704 (patch) | |
| tree | 0087160ccf637887a1793ec33f4587413c259f2c /dev-java/commons-dbcp | |
| parent | Fix bad atom. (diff) | |
| download | gentoo-2-8097994ca1e4dd8ca25adc905708b0cefd925704.tar.gz gentoo-2-8097994ca1e4dd8ca25adc905708b0cefd925704.tar.bz2 gentoo-2-8097994ca1e4dd8ca25adc905708b0cefd925704.zip | |
Augment required JDK to 1.7. Fix bug 544810.
Signed-off-by: monsieurp@gentoo.org
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Diffstat (limited to 'dev-java/commons-dbcp')
| -rw-r--r-- | dev-java/commons-dbcp/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/commons-dbcp/commons-dbcp-2.1.ebuild | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog index 3a527723abf8..ecce92b84820 100644 --- a/dev-java/commons-dbcp/ChangeLog +++ b/dev-java/commons-dbcp/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/commons-dbcp # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.67 2015/03/20 16:18:45 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.68 2015/03/29 00:53:49 monsieurp Exp $ + + 29 Mar 2015; Patrice Clement <monsieurp@gentoo.org> commons-dbcp-2.1.ebuild: + Augment required JDK to 1.7. Fix bug 544810. 20 Mar 2015; Patrice Clement <monsieurp@gentoo.org> commons-dbcp-2.1.ebuild: EAPI 5 bump while we're at it. diff --git a/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild b/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild index 5e949edc0a05..76283e7f0c80 100644 --- a/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild +++ b/dev-java/commons-dbcp/commons-dbcp-2.1.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/commons-dbcp/commons-dbcp-2.1.ebuild,v 1.3 2015/03/20 16:18:45 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild,v 1.4 2015/03/29 00:53:49 monsieurp Exp $ EAPI=5 @@ -26,10 +26,10 @@ CDEPEND=">=dev-java/commons-logging-1.1.1 java-virtuals/transaction-api:0 dev-java/junit:4" DEPEND="${CDEPEND} - >=virtual/jdk-1.6 + >=virtual/jdk-1.7 test? ( dev-java/ant-junit:0 )" RDEPEND=" - >=virtual/jdk-1.6 + >=virtual/jdk-1.7 ${CDEPEND}" S="${WORKDIR}/${MY_P}" @@ -59,7 +59,6 @@ src_test() { # These tests depend on a geronimo, # which is not packaged yet for Gentoo unfortunately. # See bug #348853. - test_to_del src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java test_to_del src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java test_to_del src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java |