Date: Fri, 16 Oct 2015 18:15:11 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399496 - in head/databases/hbase: . files Message-ID: <201510161815.t9GIFBAW022907@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Fri Oct 16 18:15:11 2015 New Revision: 399496 URL: https://svnweb.freebsd.org/changeset/ports/399496 Log: databases/hbase: fix build with OpenJDK8 PR: 203506 Approved by: maintainer timeout (demon, >2 weeks) Added: head/databases/hbase/files/extra-patch-PoolMap.java (contents, props changed) head/databases/hbase/files/extra-patch-pom.xml (contents, props changed) Modified: head/databases/hbase/Makefile Modified: head/databases/hbase/Makefile ============================================================================== --- head/databases/hbase/Makefile Fri Oct 16 18:13:28 2015 (r399495) +++ head/databases/hbase/Makefile Fri Oct 16 18:15:11 2015 (r399496) @@ -52,6 +52,13 @@ PLIST_SUB= HBASE_USER=${HBASE_USER} \ HBASE_RUNDIR=${HBASE_RUNDIR} \ PORTVERSION="${PORTVERSION}" +.include <bsd.port.pre.mk> + +.if ${JAVA_PORT_VERSION:M1.8.*} +EXTRA_PATCHES= ${FILESDIR}/extra-patch-PoolMap.java \ + ${FILESDIR}/extra-patch-pom.xml +.endif + post-patch: ${REINPLACE_CMD} -e "s#%%ETCDIR%%#${ETCDIR}#" ${WRKSRC}/conf/hbase-env.sh ${WRKSRC}/bin/hbase ${RM} ${WRKSRC}/conf/hbase-env.sh.bak ${WRKSRC}/conf/hbase-env.sh.orig @@ -77,4 +84,4 @@ do-install: ${MKDIR} ${STAGEDIR}${HBASE_LOGDIR} ${MKDIR} ${STAGEDIR}${HBASE_RUNDIR} -.include <bsd.port.mk> +.include <bsd.port.post.mk> Added: head/databases/hbase/files/extra-patch-PoolMap.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/hbase/files/extra-patch-PoolMap.java Fri Oct 16 18:15:11 2015 (r399496) @@ -0,0 +1,17 @@ +--- hbase-client/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java.orig 2014-12-16 06:16:53 UTC ++++ hbase-client/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java +@@ -93,14 +93,6 @@ public class PoolMap<K, V> implements Ma + return null; + } + +- /** +- * @deprecated Will be removed for Java 8, use {@link #removeValue} instead +- */ +- @Deprecated +- public boolean remove(K key, V value) { +- return removeValue(key, value); +- } +- + public boolean removeValue(K key, V value) { + Pool<V> pool = pools.get(key); + boolean res = false; Added: head/databases/hbase/files/extra-patch-pom.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/hbase/files/extra-patch-pom.xml Fri Oct 16 18:15:11 2015 (r399496) @@ -0,0 +1,10 @@ +--- pom.xml.orig 2015-10-02 13:51:13.974582000 +0000 ++++ pom.xml 2015-10-02 13:51:17.416694000 +0000 +@@ -2064,6 +2064,7 @@ + <version>2.9.1</version> + <configuration> + <maxmemory>2048m</maxmemory> ++ <additionalparam>-Xdoclint:none</additionalparam> + </configuration> + <reportSets> + <reportSet>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510161815.t9GIFBAW022907>