You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/09/22 18:01:49 UTC

[1/2] lucene-solr:master: SOLR-9542: Kerberos delegation tokens requires Jackson library

Repository: lucene-solr
Updated Branches:
  refs/heads/master 6365920a0 -> 5183b67e9


SOLR-9542: Kerberos delegation tokens requires Jackson library


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5acbcac2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5acbcac2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5acbcac2

Branch: refs/heads/master
Commit: 5acbcac274dd3f2096a3a91ee1afd2a1f03f5ed6
Parents: a9f82a1
Author: Noble Paul <no...@apache.org>
Authored: Thu Sep 22 23:29:09 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Thu Sep 22 23:30:02 2016 +0530

----------------------------------------------------------------------
 solr/CHANGES.txt  | 3 +++
 solr/core/ivy.xml | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5acbcac2/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 99bfabc..ac94d4f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -110,6 +110,9 @@ Bug Fixes
 
 * SOLR-9524: SolrIndexSearcher.getIndexFingerprint uses dubious synchronization (Mike Drob, noble)
 
+* SOLR-9542: Kerberos delegation tokens requires Jackson library (Ishan Chattopadhyaya via noble)
+
+
 Optimizations
 ----------------------
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5acbcac2/solr/core/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/core/ivy.xml b/solr/core/ivy.xml
index 08272ad..67e4379 100644
--- a/solr/core/ivy.xml
+++ b/solr/core/ivy.xml
@@ -93,8 +93,8 @@
     <dependency org="commons-collections" name="commons-collections" rev="${/commons-collections/commons-collections}" conf="test.DfsMiniCluster"/>
     <dependency org="io.netty" name="netty-all" rev="${/io.netty/netty-all}" conf="test.DfsMiniCluster"/>
     <dependency org="org.apache.htrace" name="htrace-core" rev="${/org.apache.htrace/htrace-core}" conf="test.DfsMiniCluster"/>
-    <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="${/org.codehaus.jackson/jackson-core-asl}" conf="test.DfsMiniCluster" />
-    <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="${/org.codehaus.jackson/jackson-mapper-asl}" conf="test.DfsMiniCluster" />
+    <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="${/org.codehaus.jackson/jackson-core-asl}" conf="compile" />
+    <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="${/org.codehaus.jackson/jackson-mapper-asl}" conf="compile" />
  
     <!-- Hadoop MiniKdc Dependencies-->
     <dependency org="org.apache.hadoop" name="hadoop-minikdc" rev="${/org.apache.hadoop/hadoop-minikdc}" conf="test.MiniKdc"/>


[2/2] lucene-solr:master: Merge remote-tracking branch 'origin/master'

Posted by no...@apache.org.
Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5183b67e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5183b67e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5183b67e

Branch: refs/heads/master
Commit: 5183b67e942b08a1146a88682454a63392320662
Parents: 5acbcac 6365920
Author: Noble Paul <no...@apache.org>
Authored: Thu Sep 22 23:31:42 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Thu Sep 22 23:31:42 2016 +0530

----------------------------------------------------------------------
 .../lucene/index/SortedNumericDocValues.java    |   4 +-
 solr/CHANGES.txt                                |   7 +
 .../solr/core/CachingDirectoryFactory.java      |   2 +-
 .../apache/solr/core/ConfigSetProperties.java   |   2 +-
 .../org/apache/solr/core/CoreContainer.java     |  14 +-
 .../apache/solr/core/CorePropertiesLocator.java |  12 +-
 .../org/apache/solr/core/JmxMonitoredMap.java   |  20 +-
 .../java/org/apache/solr/core/PluginBag.java    |   9 +-
 .../apache/solr/core/SchemaCodecFactory.java    |   4 +-
 .../java/org/apache/solr/core/SolrConfig.java   |  10 +-
 .../src/java/org/apache/solr/core/SolrCore.java |  24 +-
 .../apache/solr/core/SolrResourceLoader.java    |  35 +-
 .../snapshots/SolrSnapshotMetaDataManager.java  |   2 +-
 .../org/apache/solr/handler/StreamHandler.java  |   3 +-
 .../component/HttpShardHandlerFactory.java      |   2 +-
 .../apache/solr/handler/loader/XMLLoader.java   |   2 +-
 .../org/apache/solr/logging/LogWatcher.java     |   8 +-
 .../org/apache/solr/schema/CurrencyField.java   |   2 +-
 .../org/apache/solr/schema/IndexSchema.java     |  11 +-
 .../schema/OpenExchangeRatesOrgProvider.java    |   4 +-
 .../TextLogisticRegressionQParserPlugin.java    |   2 +-
 .../apache/solr/servlet/SolrDispatchFilter.java |  24 +-
 .../solr/servlet/StartupLoggingUtils.java       |  85 +++++
 .../apache/solr/update/UpdateShardHandler.java  |   2 +-
 .../apache/solr/cloud/HttpPartitionTest.java    |   5 +-
 .../solr/util/TestObjectReleaseTracker.java     |  12 +-
 solr/server/resources/log4j.properties          |   3 +
 .../client/solrj/io/stream/CommitStream.java    | 260 ++++++++++++++
 .../client/solrj/io/stream/UpdateStream.java    |   3 +-
 .../solrj/io/stream/expr/StreamFactory.java     |  35 ++
 .../solr/common/util/ObjectReleaseTracker.java  |  21 +-
 .../solrj/io/stream/StreamExpressionTest.java   | 340 +++++++++++++++++++
 .../java/org/apache/solr/SolrTestCaseJ4.java    |   2 +-
 33 files changed, 865 insertions(+), 106 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5183b67e/solr/CHANGES.txt
----------------------------------------------------------------------