[solr-sandbox] branch crossdc-wip updated: Update Solr version, build improvement for some envs, include missing solrj dep

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch crossdc-wip
in repository https://gitbox.apache.org/repos/asf/solr-sandbox.git


The following commit(s) were added to refs/heads/crossdc-wip by this push:
     new b385f33  Update Solr version, build improvement for some envs, include missing solrj dep
b385f33 is described below

commit b385f33529f244df202c5f67a5b249024f96f161
Author: Mark Miller <ma...@gmail.com>
AuthorDate: Thu Jun 30 15:27:41 2022 -0500

    Update Solr version, build improvement for some envs, include missing solrj dep
---
 .gitignore                    |  1 +
 crossdc-commons/build.gradle  |  2 +-
 crossdc-consumer/build.gradle | 10 +++++++++-
 crossdc-producer/build.gradle |  6 +++---
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2318ff7..1070024 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,6 @@
 # Ignore Gradle build output directory
 build
 out
+cluster
 
 logs
diff --git a/crossdc-commons/build.gradle b/crossdc-commons/build.gradle
index 550586e..a687058 100644
--- a/crossdc-commons/build.gradle
+++ b/crossdc-commons/build.gradle
@@ -34,7 +34,7 @@ sourceSets {
 }
 
 dependencies {
-    provided 'org.apache.solr:solr-solrj:8.11.1'
+    provided 'org.apache.solr:solr-solrj:8.11.2'
     implementation 'org.apache.kafka:kafka-clients:2.8.1'
     implementation 'com.google.guava:guava:14.0'
 }
diff --git a/crossdc-consumer/build.gradle b/crossdc-consumer/build.gradle
index f0ebcfc..f511721 100644
--- a/crossdc-consumer/build.gradle
+++ b/crossdc-consumer/build.gradle
@@ -29,7 +29,7 @@ application {
 }
 
 dependencies {
-    implementation group: 'org.apache.solr', name: 'solr-solrj', version: '8.11.1'
+    implementation group: 'org.apache.solr', name: 'solr-solrj', version: '8.11.2'
     implementation project(path: ':crossdc-commons', configuration: 'shadow')
 
     implementation 'org.slf4j:slf4j-api:1.7.36'
@@ -38,6 +38,7 @@ dependencies {
     implementation 'org.eclipse.jetty:jetty-servlet:9.4.41.v20210516'
     implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.2'
     runtimeOnly ('com.google.protobuf:protobuf-java-util:3.19.2')
+    runtimeOnly ('commons-codec:commons-codec:1.13')
     testImplementation 'org.hamcrest:hamcrest:2.2'
     testImplementation 'junit:junit:4.13.2'
     testImplementation('org.mockito:mockito-core:4.3.1', {
@@ -56,4 +57,11 @@ dependencies {
 
 test {
     jvmArgs '-Djava.security.egd=file:/dev/./urandom'
+}
+
+tasks.withType(Tar){
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+tasks.withType(Zip){
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
\ No newline at end of file
diff --git a/crossdc-producer/build.gradle b/crossdc-producer/build.gradle
index ad505dc..4a989e4 100644
--- a/crossdc-producer/build.gradle
+++ b/crossdc-producer/build.gradle
@@ -37,7 +37,7 @@ dependencies {
     implementation project(':crossdc-consumer')
     implementation project(path: ':crossdc-commons', configuration: 'shadow')
 
-    provided  group: 'org.apache.solr', name: 'solr-core', version: '8.11.1'
+    provided  group: 'org.apache.solr', name: 'solr-core', version: '8.11.2'
 
     testImplementation 'org.slf4j:slf4j-api'
     testImplementation 'org.hamcrest:hamcrest:2.2'
@@ -45,8 +45,8 @@ dependencies {
     testImplementation('org.mockito:mockito-core:4.3.1', {
         exclude group: "net.bytebuddy", module: "byte-buddy-agent"
     })
-    testImplementation group: 'org.apache.solr', name: 'solr-core', version: '8.11.1'
-    testImplementation group: 'org.apache.solr', name: 'solr-test-framework', version: '8.11.1'
+    testImplementation group: 'org.apache.solr', name: 'solr-core', version: '8.11.2'
+    testImplementation group: 'org.apache.solr', name: 'solr-test-framework', version: '8.11.2'
 
     testImplementation 'org.apache.kafka:kafka_2.13:2.8.1'
     testImplementation 'org.apache.kafka:kafka-streams:2.8.1'