You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2013/04/22 17:17:30 UTC
svn commit: r1470574 - in /manifoldcf/trunk: CHANGES.txt build.xml pom.xml
Author: kwright
Date: Mon Apr 22 15:17:29 2013
New Revision: 1470574
URL: http://svn.apache.org/r1470574
Log:
Fix for CONNECTORS-599. Upgrade to new version of Derby.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/build.xml
manifoldcf/trunk/pom.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1470574&r1=1470573&r2=1470574&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Apr 22 15:17:29 2013
@@ -3,6 +3,10 @@ $Id$
======================= 1.2-dev =====================
+CONNECTORS-599: Upgrade to a new version of Derby which doesn't
+stall.
+(Karl Wright)
+
CONNECTORS-675: Fix for json UTF-8 encoding, elastic search
connector.
(Karl Wright)
Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1470574&r1=1470573&r2=1470574&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Mon Apr 22 15:17:29 2013
@@ -2864,7 +2864,7 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-derby">
<mkdir dir="lib"/>
- <property name="derby-version" value="10.8.2.2"/>
+ <property name="derby-version" value="10.10.1.1"/>
<property name="derby-package" value="org/apache/derby"/>
<antcall target="download-via-maven"><param name="project-path" value="${derby-package}"/><param name="artifact-version" value="${derby-version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="derby"/>
Modified: manifoldcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1470574&r1=1470573&r2=1470574&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Mon Apr 22 15:17:29 2013
@@ -41,7 +41,7 @@
<postgresql.version>9.1-901.jdbc4</postgresql.version>
<mysql.version>5.1.18</mysql.version>
<hsqldb.version>2.2.9</hsqldb.version>
- <derby.version>10.8.2.2</derby.version>
+ <derby.version>10.10.1.1</derby.version>
<jetty.version>7.5.4.v20111024</jetty.version>
<commons-codec.version>1.5</commons-codec.version>
<commons-io.version>2.1</commons-io.version>