This is an automated email from the ASF dual-hosted git repository.
sanjaydutt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 3deb0a44402 Bump up dependency analyze to 1.10.0 (#2643)
3deb0a44402 is described below
commit 3deb0a44402625fff140876b14b67f781c49adb0
Author: Sanjay Dutt <[email protected]>
AuthorDate: Thu Aug 22 20:35:33 2024 +0530
Bump up dependency analyze to 1.10.0 (#2643)
Upgrades the ca.cutterslade.analyze version to 1.10.0 to facilitate the
ongoing Java upgrade (SOLR-17321)
---
build.gradle | 2 +-
solr/modules/gcs-repository/build.gradle | 1 +
solr/modules/hdfs/build.gradle | 2 +-
solr/modules/s3-repository/build.gradle | 1 +
solr/modules/sql/build.gradle | 1 +
solr/prometheus-exporter/build.gradle | 1 +
solr/solrj/build.gradle | 1 +
versions.lock | 2 +-
8 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/build.gradle b/build.gradle
index caf0884e954..c758d5c8dc3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ plugins {
id 'base'
id 'com.palantir.consistent-versions' version '2.16.0'
id 'org.owasp.dependencycheck' version '9.0.8'
- id 'ca.cutterslade.analyze' version '1.9.1'
+ id 'ca.cutterslade.analyze' version '1.10.0'
id 'de.thetaphi.forbiddenapis' version '3.7' apply false
id 'de.undercouch.download' version '5.5.0' apply false
id 'net.ltgt.errorprone' version '3.1.0' apply false
diff --git a/solr/modules/gcs-repository/build.gradle
b/solr/modules/gcs-repository/build.gradle
index 6d381cfb92a..5eec865fc9d 100644
--- a/solr/modules/gcs-repository/build.gradle
+++ b/solr/modules/gcs-repository/build.gradle
@@ -29,6 +29,7 @@ dependencies {
implementation platform(group: 'com.google.cloud', name:
'google-cloud-bom')
implementation 'com.google.api:gax'
implementation 'com.google.auth:google-auth-library-oauth2-http'
+ implementation 'com.google.auth:google-auth-library-credentials'
implementation 'com.google.cloud:google-cloud-core'
implementation 'com.google.cloud:google-cloud-core-http'
implementation 'com.google.cloud:google-cloud-storage'
diff --git a/solr/modules/hdfs/build.gradle b/solr/modules/hdfs/build.gradle
index ad05e9bcd25..6ce2ee9d47f 100644
--- a/solr/modules/hdfs/build.gradle
+++ b/solr/modules/hdfs/build.gradle
@@ -32,7 +32,7 @@ dependencies {
// Guava implements Preconditions, caches, and VisibleForTesting annotations
implementation 'com.google.guava:guava'
-
+ implementation 'io.dropwizard.metrics:metrics-core'
// Caffeine cache to implement HDFS block caching
implementation 'com.github.ben-manes.caffeine:caffeine'
diff --git a/solr/modules/s3-repository/build.gradle
b/solr/modules/s3-repository/build.gradle
index 2185bf9b71f..431df0820a1 100644
--- a/solr/modules/s3-repository/build.gradle
+++ b/solr/modules/s3-repository/build.gradle
@@ -30,6 +30,7 @@ dependencies {
implementation(group: 'software.amazon.awssdk', name: 'apache-client')
implementation(group: 'software.amazon.awssdk', name: 'aws-core')
implementation(group: 'software.amazon.awssdk', name: 'regions')
+ implementation(group: 'software.amazon.awssdk', name: 'http-client-spi')
implementation(group: 'software.amazon.awssdk', name: 's3') {
exclude group: 'software.amazon.awssdk', module: 'netty-nio-client'
}
diff --git a/solr/modules/sql/build.gradle b/solr/modules/sql/build.gradle
index 5a8bf946334..cbaa3fe1312 100644
--- a/solr/modules/sql/build.gradle
+++ b/solr/modules/sql/build.gradle
@@ -26,6 +26,7 @@ dependencies {
implementation project(':solr:solrj-zookeeper')
implementation 'org.slf4j:slf4j-api'
+ implementation 'com.google.guava:guava'
// SQL Parser via Calcite
implementation ('org.apache.calcite:calcite-core', {
diff --git a/solr/prometheus-exporter/build.gradle
b/solr/prometheus-exporter/build.gradle
index 0739bdf1c53..1f257d5a5ee 100644
--- a/solr/prometheus-exporter/build.gradle
+++ b/solr/prometheus-exporter/build.gradle
@@ -54,6 +54,7 @@ dependencies {
runtimeOnly 'com.lmax:disruptor'
testImplementation project(':solr:test-framework')
+ testImplementation project(':solr:solrj-zookeeper')
testImplementation
'com.carrotsearch.randomizedtesting:randomizedtesting-runner'
testImplementation 'junit:junit'
testImplementation 'org.apache.lucene:lucene-test-framework'
diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle
index ac83fdae43f..dc1656a4624 100644
--- a/solr/solrj/build.gradle
+++ b/solr/solrj/build.gradle
@@ -93,6 +93,7 @@ dependencies {
})
testImplementation 'org.apache.commons:commons-lang3'
testImplementation 'io.dropwizard.metrics:metrics-core'
+ testImplementation 'com.fasterxml.jackson.core:jackson-core'
}
/**
diff --git a/versions.lock b/versions.lock
index 01aee9502df..cf77a4bcddf 100644
--- a/versions.lock
+++ b/versions.lock
@@ -370,7 +370,7 @@ software.amazon.awssdk:endpoints-spi:2.26.19 (5
constraints: 13415275)
software.amazon.awssdk:http-auth:2.26.19 (5 constraints: ad3ff879)
software.amazon.awssdk:http-auth-aws:2.26.19 (5 constraints: a43f775d)
software.amazon.awssdk:http-auth-spi:2.26.19 (8 constraints: d86cf7dd)
-software.amazon.awssdk:http-client-spi:2.26.19 (14 constraints: 11d5adb4)
+software.amazon.awssdk:http-client-spi:2.26.19 (15 constraints: 86da972d)
software.amazon.awssdk:identity-spi:2.26.19 (9 constraints: 0f7d43c5)
software.amazon.awssdk:json-utils:2.26.19 (5 constraints: 833fb03f)
software.amazon.awssdk:metrics-spi:2.26.19 (7 constraints: 44622f16)
