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 17:59:30 UTC
[1/2] lucene-solr:branch_6x: SOLR-9542: Kerberos delegation tokens
requires Jackson library
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 035750030 -> 33d8fec4e
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/ec5a53d7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ec5a53d7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ec5a53d7
Branch: refs/heads/branch_6x
Commit: ec5a53d706173046f2e0048abe2d6376a7e1a375
Parents: 09a39e1
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:29:09 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/ec5a53d7/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 2aeb2b0..cbe7579 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -80,6 +80,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/ec5a53d7/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:branch_6x: Merge remote-tracking branch
'origin/branch_6x' into branch_6x
Posted by no...@apache.org.
Merge remote-tracking branch 'origin/branch_6x' into branch_6x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/33d8fec4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/33d8fec4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/33d8fec4
Branch: refs/heads/branch_6x
Commit: 33d8fec4e2464714005b12e7a117e2f725ba0a18
Parents: ec5a53d 0357500
Author: Noble Paul <no...@apache.org>
Authored: Thu Sep 22 23:29:23 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Thu Sep 22 23:29:23 2016 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 5 ++
.../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 +-
.../component/HttpShardHandlerFactory.java | 8 +-
.../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 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 24 +-----
.../solr/servlet/StartupLoggingUtils.java | 85 ++++++++++++++++++++
.../apache/solr/update/UpdateShardHandler.java | 13 +--
.../apache/solr/cloud/HttpPartitionTest.java | 5 +-
.../solr/util/TestObjectReleaseTracker.java | 12 +--
solr/server/resources/log4j.properties | 3 +
.../solr/common/util/ObjectReleaseTracker.java | 21 +++--
.../java/org/apache/solr/SolrTestCaseJ4.java | 2 +-
26 files changed, 230 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/33d8fec4/solr/CHANGES.txt
----------------------------------------------------------------------