Return-Path: 
 <java-commits-return-4699-apmail-lucene-java-commits-archive=lucene.apache.org@lucene.apache.org>
Delivered-To: apmail-lucene-java-commits-archive@www.apache.org
Received: (qmail 84430 invoked from network); 17 Jan 2010 14:47:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 17 Jan 2010 14:47:55 -0000
Received: (qmail 75133 invoked by uid 500); 17 Jan 2010 14:47:55 -0000
Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org
Received: (qmail 75065 invoked by uid 500); 17 Jan 2010 14:47:55 -0000
Mailing-List: contact java-commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:java-commits-help@lucene.apache.org>
List-Unsubscribe: <mailto:java-commits-unsubscribe@lucene.apache.org>
List-Post: <mailto:java-commits@lucene.apache.org>
List-Id: <java-commits.lucene.apache.org>
Reply-To: java-dev@lucene.apache.org
Delivered-To: mailing list java-commits@lucene.apache.org
Received: (qmail 75056 invoked by uid 99); 17 Jan 2010 14:47:55 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Jan 2010 14:47:55 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sun, 17 Jan 2010 14:47:43 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 102D523888E8; Sun, 17 Jan 2010 14:47:22 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r900153 - in /lucene/java/trunk:
 contrib/db/bdb-je/build.xml
 contrib/db/bdb-je/pom.xml.template lucene-contrib-pom.xml.template
Date: Sun, 17 Jan 2010 14:47:21 -0000
To: java-commits@lucene.apache.org
From: mikemccand@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100117144722.102D523888E8@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: mikemccand
Date: Sun Jan 17 14:47:21 2010
New Revision: 900153

URL: http://svn.apache.org/viewvc?rev=900153&view=rev
Log:
LUCENE-1845: upgrade to bdb-je version 3.3.93; download the JAR from maven (still from download.oracle.com) instead; download JAR directly, not full zip

Modified:
    lucene/java/trunk/contrib/db/bdb-je/build.xml
    lucene/java/trunk/contrib/db/bdb-je/pom.xml.template
    lucene/java/trunk/lucene-contrib-pom.xml.template

Modified: lucene/java/trunk/contrib/db/bdb-je/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/db/bdb-je/build.xml?rev=900153&r1=900152&r2=900153&view=diff
==============================================================================
--- lucene/java/trunk/contrib/db/bdb-je/build.xml (original)
+++ lucene/java/trunk/contrib/db/bdb-je/build.xml Sun Jan 17 14:47:21 2010
@@ -21,10 +21,10 @@
     Lucene Berkeley DB Java Edition integration
   </description>
 
-  <property name="je.version" value="3.3.69" />
+  <property name="je.version" value="3.3.93" />
 
   <path id="je.jar">
-    <pathelement location="lib/je-${je.version}/lib/je-${je.version}.jar" />
+    <pathelement location="lib/je-${je.version}.jar" />
   </path>
 
   <available classname="com.sleepycat.je.Database" property="je.jar.exists">
@@ -48,13 +48,8 @@
 
   <target name="get-je-jar" unless="je.jar.exists">
     <mkdir dir="lib" />
-    <get src="http://download.oracle.com/berkeley-db/je-${je.version}.zip"
-         dest="lib/je-${je.version}.zip" />
-    <unzip src="lib/je-${je.version}.zip" dest="lib">
-      <patternset>
-        <include name="je-${je.version}/lib/je-${je.version}.jar" />
-      </patternset>
-    </unzip>
+    <get src="http://download.oracle.com/maven/com/sleepycat/je/${je.version}/je-${je.version}.jar"
+         dest="lib/je-${je.version}.jar" />
   </target>
 
   <target name="check-and-get-je-jar" depends="get-je-jar" />

Modified: lucene/java/trunk/contrib/db/bdb-je/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/db/bdb-je/pom.xml.template?rev=900153&r1=900152&r2=900153&view=diff
==============================================================================
--- lucene/java/trunk/contrib/db/bdb-je/pom.xml.template (original)
+++ lucene/java/trunk/contrib/db/bdb-je/pom.xml.template Sun Jan 17 14:47:21 2010
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>sleepycat</groupId>
       <artifactId>je</artifactId>
-      <version>1.7.0</version>
+      <version>${sleepycat-je-version}</version>
     </dependency>
   </dependencies>
 </project>

Modified: lucene/java/trunk/lucene-contrib-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/java/trunk/lucene-contrib-pom.xml.template?rev=900153&r1=900152&r2=900153&view=diff
==============================================================================
--- lucene/java/trunk/lucene-contrib-pom.xml.template (original)
+++ lucene/java/trunk/lucene-contrib-pom.xml.template Sun Jan 17 14:47:21 2010
@@ -44,6 +44,7 @@
     <commons-collections-version>3.1</commons-collections-version>
     <commons-beanutils-version>1.7.0</commons-beanutils-version>
     <jakarta-regexp-version>1.4</jakarta-regexp-version>
+    <sleepycat-je-version>3.3.93</sleepycat-je-version>
     <icu-version>4.0</icu-version>
   </properties>
 </project>