This is an automated email from the ASF dual-hosted git repository.
krisden pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git.
from 71732e4 SOLR-16035: Enable spotless for prometheus-exporter
add 534cad8 SOLR-15942: Upgrade Hadoop to 3.3.1
add 0ea8a03 Revert "Revert "SOLR-15912 Update Guava to 31.0.1 (#520)""
No new revisions were added by this update.
Summary of changes:
solr/CHANGES.txt | 4 +
solr/core/build.gradle | 1 -
.../licenses/commons-configuration2-2.1.1.jar.sha1 | 1 -
solr/licenses/commons-configuration2-2.7.jar.sha1 | 1 +
solr/licenses/commons-lang3-3.12.0.jar.sha1 | 1 +
solr/licenses/commons-lang3-3.9.jar.sha1 | 1 -
solr/licenses/commons-text-1.6.jar.sha1 | 1 -
solr/licenses/commons-text-1.8.jar.sha1 | 1 +
solr/licenses/curator-client-2.13.0.jar.sha1 | 1 -
solr/licenses/curator-client-4.3.0.jar.sha1 | 1 +
solr/licenses/curator-framework-2.13.0.jar.sha1 | 1 -
solr/licenses/curator-framework-4.3.0.jar.sha1 | 1 +
solr/licenses/curator-recipes-2.13.0.jar.sha1 | 1 -
solr/licenses/curator-recipes-4.3.0.jar.sha1 | 1 +
solr/licenses/guava-25.1-jre.jar.sha1 | 1 -
solr/licenses/guava-31.0.1-jre.jar.sha1 | 1 +
solr/licenses/hadoop-annotations-3.2.0.jar.sha1 | 1 -
solr/licenses/hadoop-annotations-3.3.1.jar.sha1 | 1 +
solr/licenses/hadoop-auth-3.2.0.jar.sha1 | 1 -
solr/licenses/hadoop-auth-3.3.1.jar.sha1 | 1 +
solr/licenses/hadoop-client-api-3.3.1.jar.sha1 | 1 +
...E-ASL.txt => hadoop-client-api-LICENSE-ASL.txt} | 0
...ent-NOTICE.txt => hadoop-client-api-NOTICE.txt} | 0
.../hadoop-client-minicluster-3.3.1.jar.sha1 | 1 +
...t => hadoop-client-minicluster-LICENSE-ASL.txt} | 0
...CE.txt => hadoop-client-minicluster-NOTICE.txt} | 0
solr/licenses/hadoop-client-runtime-3.3.1.jar.sha1 | 1 +
...L.txt => hadoop-client-runtime-LICENSE-ASL.txt} | 0
...NOTICE.txt => hadoop-client-runtime-NOTICE.txt} | 0
solr/licenses/hadoop-common-3.2.0-tests.jar.sha1 | 1 -
solr/licenses/hadoop-common-3.2.0.jar.sha1 | 1 -
solr/licenses/hadoop-common-3.3.1.jar.sha1 | 1 +
solr/licenses/hadoop-hdfs-3.2.0-tests.jar.sha1 | 1 -
solr/licenses/hadoop-hdfs-3.2.0.jar.sha1 | 1 -
solr/licenses/hadoop-hdfs-3.3.1-tests.jar.sha1 | 1 +
solr/licenses/hadoop-hdfs-3.3.1.jar.sha1 | 1 +
solr/licenses/hadoop-hdfs-client-3.2.0.jar.sha1 | 1 -
solr/licenses/hadoop-minikdc-3.2.0.jar.sha1 | 1 -
solr/licenses/hadoop-minikdc-3.3.1.jar.sha1 | 1 +
solr/licenses/hadoop-shaded-guava-1.1.1.jar.sha1 | 1 +
...ASL.txt => hadoop-shaded-guava-LICENSE-ASL.txt} | 0
...c-NOTICE.txt => hadoop-shaded-guava-NOTICE.txt} | 0
solr/licenses/httpcore-4.4.14.jar.sha1 | 1 -
solr/licenses/httpcore-4.4.15.jar.sha1 | 1 +
solr/licenses/httpmime-4.5.10.jar.sha1 | 1 -
solr/licenses/httpmime-4.5.13.jar.sha1 | 1 +
solr/licenses/jersey-servlet-1.19.jar.sha1 | 1 -
solr/licenses/jersey-servlet-LICENSE-CDDL.txt | 85 -
solr/modules/hadoop-auth/build.gradle | 1 +
.../hadoop/DelegationTokenKerberosFilter.java | 5 -
.../solr/security/hadoop/HadoopAuthFilter.java | 5 -
.../solr/security/hadoop/HadoopAuthPlugin.java | 19 +-
.../solr/security/hadoop/KerberosFilter.java | 16 -
.../TestSolrCloudWithSecureImpersonation.java | 22 +-
solr/modules/hdfs/build.gradle | 48 +-
solr/modules/hdfs/src/test-files/core-site.xml | 6 +
.../src/test/org/apache/hadoop/fs/FileUtil.java | 333 +++-
.../org/apache/hadoop/fs/RawLocalFileSystem.java | 151 +-
.../datanode/fsdataset/impl/BlockPoolSlice.java | 54 +-
.../test/org/apache/hadoop/http/HttpServer2.java | 1687 --------------------
.../src/test/org/apache/hadoop/package-info.java | 5 -
.../solr/cloud/MoveReplicaHDFSFailoverTest.java | 2 +-
.../org/apache/solr/cloud/MoveReplicaHDFSTest.java | 2 +-
.../cloud/SharedFSAutoReplicaFailoverTest.java | 2 +-
.../HdfsCloudIncrementalBackupTest.java | 4 +-
.../HdfsCollectionsAPIDistributedZkTest.java | 2 +-
.../collections/TestHdfsCloudBackupRestore.java | 4 +-
.../solr/cloud/hdfs/DisableKeyStoresFactory.java} | 43 +-
.../solr/cloud/hdfs/HDFSCollectionsAPITest.java | 4 +-
.../cloud/hdfs/HdfsBasicDistributedZk2Test.java | 4 +-
.../cloud/hdfs/HdfsBasicDistributedZkTest.java | 4 +-
.../hdfs/HdfsChaosMonkeyNothingIsSafeTest.java | 4 +-
.../cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java | 4 +-
.../apache/solr/cloud/hdfs/HdfsNNFailoverTest.java | 4 +-
.../solr/cloud/hdfs/HdfsRecoverLeaseTest.java | 4 +-
.../apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java | 4 +-
.../cloud/hdfs/HdfsRestartWhileUpdatingTest.java | 4 +-
.../apache/solr/cloud/hdfs/HdfsSyncSliceTest.java | 4 +-
.../org/apache/solr/cloud/hdfs/HdfsTestUtil.java | 4 +-
.../apache/solr/cloud/hdfs/HdfsThreadLeakTest.java | 6 +-
.../HdfsTlogReplayBufferedWhileIndexingTest.java | 4 +-
.../cloud/hdfs/HdfsUnloadDistributedZkTest.java | 4 +-
.../hdfs/HdfsWriteToMultipleCollectionsTest.java | 4 +-
.../org/apache/solr/cloud/hdfs/StressHdfsTest.java | 4 +-
.../apache/solr/core/HdfsDirectoryFactoryTest.java | 4 +-
.../HdfsBackupRepositoryIntegrationTest.java | 4 +-
.../solr/handler/TestHdfsBackupRestoreCore.java | 4 +-
.../solr/hdfs}/util/BadHdfsThreadsFilter.java | 2 +-
.../apache/solr/index/hdfs/CheckHdfsIndexTest.java | 2 +-
.../org/apache/solr/search/TestRecoveryHdfs.java | 2 +-
.../solr/store/blockcache/BlockDirectoryTest.java | 1 -
.../apache/solr/store/hdfs/HdfsDirectoryTest.java | 4 +-
.../solr/store/hdfs/HdfsLockFactoryTest.java | 2 +-
.../org/apache/solr/update/TestHdfsUpdateLog.java | 2 +-
versions.lock | 64 +-
versions.props | 23 +-
96 files changed, 641 insertions(+), 2077 deletions(-)
delete mode 100644 solr/licenses/commons-configuration2-2.1.1.jar.sha1
create mode 100644 solr/licenses/commons-configuration2-2.7.jar.sha1
create mode 100644 solr/licenses/commons-lang3-3.12.0.jar.sha1
delete mode 100644 solr/licenses/commons-lang3-3.9.jar.sha1
delete mode 100644 solr/licenses/commons-text-1.6.jar.sha1
create mode 100644 solr/licenses/commons-text-1.8.jar.sha1
delete mode 100644 solr/licenses/curator-client-2.13.0.jar.sha1
create mode 100644 solr/licenses/curator-client-4.3.0.jar.sha1
delete mode 100644 solr/licenses/curator-framework-2.13.0.jar.sha1
create mode 100644 solr/licenses/curator-framework-4.3.0.jar.sha1
delete mode 100644 solr/licenses/curator-recipes-2.13.0.jar.sha1
create mode 100644 solr/licenses/curator-recipes-4.3.0.jar.sha1
delete mode 100644 solr/licenses/guava-25.1-jre.jar.sha1
create mode 100644 solr/licenses/guava-31.0.1-jre.jar.sha1
delete mode 100644 solr/licenses/hadoop-annotations-3.2.0.jar.sha1
create mode 100644 solr/licenses/hadoop-annotations-3.3.1.jar.sha1
delete mode 100644 solr/licenses/hadoop-auth-3.2.0.jar.sha1
create mode 100644 solr/licenses/hadoop-auth-3.3.1.jar.sha1
create mode 100644 solr/licenses/hadoop-client-api-3.3.1.jar.sha1
rename solr/licenses/{hadoop-hdfs-client-LICENSE-ASL.txt =>
hadoop-client-api-LICENSE-ASL.txt} (100%)
rename solr/licenses/{hadoop-hdfs-client-NOTICE.txt =>
hadoop-client-api-NOTICE.txt} (100%)
create mode 100644 solr/licenses/hadoop-client-minicluster-3.3.1.jar.sha1
copy solr/licenses/{hadoop-minikdc-LICENSE-ASL.txt =>
hadoop-client-minicluster-LICENSE-ASL.txt} (100%)
copy solr/licenses/{hadoop-minikdc-NOTICE.txt =>
hadoop-client-minicluster-NOTICE.txt} (100%)
create mode 100644 solr/licenses/hadoop-client-runtime-3.3.1.jar.sha1
copy solr/licenses/{hadoop-minikdc-LICENSE-ASL.txt =>
hadoop-client-runtime-LICENSE-ASL.txt} (100%)
copy solr/licenses/{hadoop-minikdc-NOTICE.txt =>
hadoop-client-runtime-NOTICE.txt} (100%)
delete mode 100644 solr/licenses/hadoop-common-3.2.0-tests.jar.sha1
delete mode 100644 solr/licenses/hadoop-common-3.2.0.jar.sha1
create mode 100644 solr/licenses/hadoop-common-3.3.1.jar.sha1
delete mode 100644 solr/licenses/hadoop-hdfs-3.2.0-tests.jar.sha1
delete mode 100644 solr/licenses/hadoop-hdfs-3.2.0.jar.sha1
create mode 100644 solr/licenses/hadoop-hdfs-3.3.1-tests.jar.sha1
create mode 100644 solr/licenses/hadoop-hdfs-3.3.1.jar.sha1
delete mode 100644 solr/licenses/hadoop-hdfs-client-3.2.0.jar.sha1
delete mode 100644 solr/licenses/hadoop-minikdc-3.2.0.jar.sha1
create mode 100644 solr/licenses/hadoop-minikdc-3.3.1.jar.sha1
create mode 100644 solr/licenses/hadoop-shaded-guava-1.1.1.jar.sha1
copy solr/licenses/{hadoop-minikdc-LICENSE-ASL.txt =>
hadoop-shaded-guava-LICENSE-ASL.txt} (100%)
copy solr/licenses/{hadoop-minikdc-NOTICE.txt =>
hadoop-shaded-guava-NOTICE.txt} (100%)
delete mode 100644 solr/licenses/httpcore-4.4.14.jar.sha1
create mode 100644 solr/licenses/httpcore-4.4.15.jar.sha1
delete mode 100644 solr/licenses/httpmime-4.5.10.jar.sha1
create mode 100644 solr/licenses/httpmime-4.5.13.jar.sha1
delete mode 100644 solr/licenses/jersey-servlet-1.19.jar.sha1
delete mode 100644 solr/licenses/jersey-servlet-LICENSE-CDDL.txt
delete mode 100644
solr/modules/hdfs/src/test/org/apache/hadoop/http/HttpServer2.java
copy solr/{core/src/test/org/apache/solr/search/MockSearchComponent.java =>
modules/hdfs/src/test/org/apache/solr/cloud/hdfs/DisableKeyStoresFactory.java}
(54%)
rename solr/{test-framework/src/java/org/apache/solr =>
modules/hdfs/src/test/org/apache/solr/hdfs}/util/BadHdfsThreadsFilter.java (98%)
