From owner-svn-ports-head@freebsd.org Fri Oct 16 19:41:58 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 502BDA16FAF; Fri, 16 Oct 2015 19:41:58 +0000 (UTC) (envelope-from trtrmitya@gmail.com) Received: from mail-lb0-x230.google.com (mail-lb0-x230.google.com [IPv6:2a00:1450:4010:c04::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E4A0F1147; Fri, 16 Oct 2015 19:41:57 +0000 (UTC) (envelope-from trtrmitya@gmail.com) Received: by lbcao8 with SMTP id ao8so107087558lbc.3; Fri, 16 Oct 2015 12:41:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=uF5QXl9Q+jXVhmN19qCcfoCv5W9/01e7EX936YPXmPc=; b=GKDrHGxmRRVJD7KFT+0EyDpnhAcIo48+KRXX2xSCoh24v5/u9ZocbDvF6C/2ZlwE7a vlk15i0TfwfquYLpkRDIT6mSCR6D2Q1r7ZTrRoznLndF1O0iYbwcaX9N43/0P7pkJmKy iHVQaTO7QwrbPDA0K9OUghxo3NsfzlpWQOfx6oPbLYbx5X9L28FvhBnTLyE4Fdpm0OSc htlKWuFVb2SLj8LIDarqy/ISVq5Qdr8BvAYF7Qb5CW0JcVig5RSFM7zao7B/0/3F14Lz 14d6GQGvonm0BLsBdmrWEuv1gcOGxDB6X2MlB/7EGdbvghp42pgGzhmVyZIvIViWkbVw KVUw== X-Received: by 10.112.12.3 with SMTP id u3mr7257883lbb.30.1445024515408; Fri, 16 Oct 2015 12:41:55 -0700 (PDT) Received: from [10.0.1.4] (broadband-5-228-251-240.nationalcablenetworks.ru. [5.228.251.240]) by smtp.gmail.com with ESMTPSA id li2sm336350lbc.37.2015.10.16.12.41.54 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 16 Oct 2015 12:41:54 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 9.0 \(3094\)) Subject: Re: svn commit: r399496 - in head/databases/hbase: . files From: Dmitry Sivachenko In-Reply-To: <201510161815.t9GIFBAW022907@repo.freebsd.org> Date: Fri, 16 Oct 2015 22:41:54 +0300 Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <201510161815.t9GIFBAW022907@repo.freebsd.org> To: Steve Wills X-Mailer: Apple Mail (2.3094) X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Oct 2015 19:41:58 -0000 > On 16 =D0=BE=D0=BA=D1=82. 2015 =D0=B3., at 21:15, Steve Wills = wrote: >=20 > Author: swills > Date: Fri Oct 16 18:15:11 2015 > New Revision: 399496 > URL: https://svnweb.freebsd.org/changeset/ports/399496 >=20 > Log: > databases/hbase: fix build with OpenJDK8 >=20 > PR: 203506 > Approved by: maintainer timeout (demon, >2 weeks) Thanks!=20 >=20 > 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 >=20 > Modified: head/databases/hbase/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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=3D HBASE_USER=3D${HBASE_USER} \ > HBASE_RUNDIR=3D${HBASE_RUNDIR} \ > PORTVERSION=3D"${PORTVERSION}" >=20 > +.include > + > +.if ${JAVA_PORT_VERSION:M1.8.*} > +EXTRA_PATCHES=3D ${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} >=20 > -.include > +.include >=20 > Added: head/databases/hbase/files/extra-patch-PoolMap.java > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- /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 implements Ma > + return null; > + } > +=20 > +- /** > +- * @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 pool =3D pools.get(key); > + boolean res =3D false; >=20 > Added: head/databases/hbase/files/extra-patch-pom.xml > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- /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 @@ > + 2.9.1 > + > + 2048m > ++ -Xdoclint:none > + > + > + >=20