You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/04/06 14:45:32 UTC

svn commit: r1310304 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/CHANGES.txt solr/ solr/CHANGES.txt

Author: uschindler
Date: Fri Apr  6 12:45:31 2012
New Revision: 1310304

URL: http://svn.apache.org/viewvc?rev=1310304&view=rev
Log:
Merged revision(s) 1310303 from lucene/dev/trunk:
LUCENE-3962: Fix missing entries in CHANGES.txt before release of 3.6.

Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/lucene/CHANGES.txt
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/CHANGES.txt   (contents, props changed)

Modified: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/CHANGES.txt?rev=1310304&r1=1310303&r2=1310304&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/CHANGES.txt Fri Apr  6 12:45:31 2012
@@ -367,6 +367,10 @@ Build
   directory.  The 'clean' target now removes them.
   (Steve Rowe, Robert Muir)
 
+* LUCENE-3930: Changed build system to use Apache Ivy for retrival of 3rd
+  party JAR files.  Please review BUILD.txt for instructions.
+  (Robert Muir, Chris Male, Uwe Schindler, Steven Rowe, Hossman)
+
 
 ======================= Lucene 3.5.0 =======================
 

Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1310304&r1=1310303&r2=1310304&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Fri Apr  6 12:45:31 2012
@@ -286,12 +286,6 @@ Bug Fixes
 * SOLR-3195: timeAllowed is ignored for grouping queries
   (Russell Black via Martijn van Groningen)
 
-* SOLR-3204: The packaged pre-release artifact of Commons CSV used the original
-  package name (org.apache.commons.csv). This created a compatibility issue as
-  the Apache Commons team works toward an official release of Commons CSV.
-  JARJAR (http://code.google.com/p/jarjar/) was used to change the package name
-  to org.apache.solr.internal.csv.  (Uwe Schindler, Emmanuel Bourg)  
- 
 * SOLR-2124: Do not log stack traces for "Service Disabled" / 503 Exceptions (PingRequestHandler, etc)
   (James Dyer, others)
   
@@ -334,7 +328,7 @@ Other Changes
   AppendedSolrParams into factory methods.
   (David Smiley via hossman)
   
-* Solr-3032: Deprecate logOnce from SolrException logOnce and all the supporting
+* SOLR-3032: Deprecate logOnce from SolrException logOnce and all the supporting
   structure will disappear in 4.0. Errors should be caught and logged at the
   top-most level or logged and NOT propagated up the chain. (Erick Erickson)
 
@@ -383,6 +377,18 @@ Build
 
 * SOLR-3112: Fix tests not to write to src/test-files (Luca Cavanna via Robert Muir)
 
+* LUCENE-3753: Restructure the Solr build system. (Steve Rowe)
+
+* SOLR-3204: The packaged pre-release artifact of Commons CSV used the original
+  package name (org.apache.commons.csv). This created a compatibility issue as
+  the Apache Commons team works toward an official release of Commons CSV.
+  The source of Commons CSV was added under a separate package name to the
+  Solr source code.  (Uwe Schindler, Chris Male, Emmanuel Bourg)  
+ 
+* LUCENE-3930: Changed build system to use Apache Ivy for retrival of 3rd
+  party JAR files.  Please review README.txt for instructions.
+  (Robert Muir, Chris Male, Uwe Schindler, Steven Rowe, Hossman)
+
 ==================  3.5.0  ==================
 Versions of Major Components
 ---------------------