You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/06/02 10:56:47 UTC
[24/38] lucene-solr:jira/solr-8668: SOLR-10744: Update noggit to
newer version (0.8)
SOLR-10744: Update noggit to newer version (0.8)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/57fe80d8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/57fe80d8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/57fe80d8
Branch: refs/heads/jira/solr-8668
Commit: 57fe80d8a054d84ba15e91c9854d5adb8207f772
Parents: 38741ec
Author: Noble Paul <no...@apache.org>
Authored: Thu Jun 1 15:13:00 2017 +0930
Committer: Noble Paul <no...@apache.org>
Committed: Thu Jun 1 15:13:00 2017 +0930
----------------------------------------------------------------------
lucene/ivy-versions.properties | 2 +-
solr/CHANGES.txt | 3 +++
solr/core/src/java/org/apache/solr/handler/BlobHandler.java | 1 -
solr/licenses/noggit-0.6.jar.sha1 | 1 -
solr/licenses/noggit-0.8.jar.sha1 | 1 +
.../src/java/org/apache/solr/common/util/CommandOperation.java | 4 ++++
6 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/57fe80d8/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 3318c21..33ffb66 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -253,7 +253,7 @@ org.mortbay.jetty.version = 6.1.26
/org.mortbay.jetty/jetty = ${org.mortbay.jetty.version}
/org.mortbay.jetty/jetty-util = ${org.mortbay.jetty.version}
-/org.noggit/noggit = 0.6
+/org.noggit/noggit = 0.8
/org.objenesis/objenesis = 2.5
org.ow2.asm.version = 5.1
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/57fe80d8/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e52cf17..6d0e6c7 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -205,6 +205,9 @@ Other Changes
* SOLR-10793: BlobHandler should have a well-known permission name (noble)
+* SOLR-10744: Update noggit to newer version (0.8) (noble)
+
+
================== 6.7.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/57fe80d8/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/BlobHandler.java b/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
index 93cf80c..3d9c0a9 100644
--- a/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
@@ -71,7 +71,6 @@ import static org.apache.solr.common.params.CommonParams.JSON;
import static org.apache.solr.common.params.CommonParams.SORT;
import static org.apache.solr.common.params.CommonParams.VERSION;
import static org.apache.solr.common.util.Utils.makeMap;
-import static org.apache.solr.security.PermissionNameProvider.Name.UPDATE_PERM;
public class BlobHandler extends RequestHandlerBase implements PluginInfoInitialized , PermissionNameProvider {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/57fe80d8/solr/licenses/noggit-0.6.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/noggit-0.6.jar.sha1 b/solr/licenses/noggit-0.6.jar.sha1
deleted file mode 100644
index 09b83a7..0000000
--- a/solr/licenses/noggit-0.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fa94a59c44b39ee710f3c9451750119e432326c0
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/57fe80d8/solr/licenses/noggit-0.8.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/noggit-0.8.jar.sha1 b/solr/licenses/noggit-0.8.jar.sha1
new file mode 100644
index 0000000..6a00438
--- /dev/null
+++ b/solr/licenses/noggit-0.8.jar.sha1
@@ -0,0 +1 @@
+ba4ad65a62d7dfcf97a8d42c82ae7d8824f9087f
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/57fe80d8/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java b/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java
index 5b043e7..c80402f 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java
@@ -219,6 +219,10 @@ public class CommandOperation {
*/
public static List<CommandOperation> parse(Reader rdr) throws IOException {
JSONParser parser = new JSONParser(rdr);
+ parser.setFlags(parser.getFlags() |
+ JSONParser.ALLOW_MISSING_COLON_COMMA_BEFORE_OBJECT |
+ JSONParser.OPTIONAL_OUTER_BRACES
+ );
ObjectBuilder ob = new ObjectBuilder(parser);