Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0B70010110 for ; Thu, 17 Apr 2014 21:56:41 +0000 (UTC) Received: (qmail 87165 invoked by uid 500); 17 Apr 2014 21:56:40 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 87158 invoked by uid 99); 17 Apr 2014 21:56:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Apr 2014 21:56:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Apr 2014 21:56:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6687923888E2; Thu, 17 Apr 2014 21:56:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1588380 - in /lucene/dev/branches/lucene_solr_4_8: ./ lucene/ lucene/common-build.xml Date: Thu, 17 Apr 2014 21:56:19 -0000 To: commits@lucene.apache.org From: uschindler@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140417215619.6687923888E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: uschindler Date: Thu Apr 17 21:56:18 2014 New Revision: 1588380 URL: http://svn.apache.org/r1588380 Log: Merged revision(s) 1588379 from lucene/dev/branches/branch_4x: Merged revision(s) 1588378 from lucene/dev/trunk: Update to bugfix release of forbidden-apis to work around annotations bug (may affect lucene in the future) Modified: lucene/dev/branches/lucene_solr_4_8/ (props changed) lucene/dev/branches/lucene_solr_4_8/lucene/ (props changed) lucene/dev/branches/lucene_solr_4_8/lucene/common-build.xml (contents, props changed) Modified: lucene/dev/branches/lucene_solr_4_8/lucene/common-build.xml URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_8/lucene/common-build.xml?rev=1588380&r1=1588379&r2=1588380&view=diff ============================================================================== --- lucene/dev/branches/lucene_solr_4_8/lucene/common-build.xml (original) +++ lucene/dev/branches/lucene_solr_4_8/lucene/common-build.xml Thu Apr 17 21:56:18 2014 @@ -2213,7 +2213,7 @@ ${ant.project.name}.test.dependencies=${ -