Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion solr/licenses/commons-codec-1.22.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/commons-codec-1.22.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
da09bcdb330deef7cfee70f30c6889fda70d5ebf
1 change: 0 additions & 1 deletion solr/licenses/commons-collections4-4.5.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/commons-collections4-4.6.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e3f46a0753e01b8397363ba0edbfb6ec38dedf0a
1 change: 0 additions & 1 deletion solr/licenses/hadoop-annotations-3.4.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/hadoop-annotations-3.4.3.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
41ae197fda7c526c699433131cf002ea632108bf
1 change: 0 additions & 1 deletion solr/licenses/hadoop-auth-3.4.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/hadoop-auth-3.4.3.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4a0c7875fa2b7d127dd121f5f3b3a7608166d757
1 change: 0 additions & 1 deletion solr/licenses/hadoop-client-api-3.4.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/hadoop-client-api-3.4.3.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d58e69f03804f4b0e48d80b911baea3fc4edf71d
1 change: 0 additions & 1 deletion solr/licenses/hadoop-client-minicluster-3.4.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/hadoop-client-minicluster-3.4.3.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9bf502730c754b24c50df5ec06116b18947ba01d
1 change: 0 additions & 1 deletion solr/licenses/hadoop-client-runtime-3.4.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/hadoop-client-runtime-3.4.3.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f966e408cfc1f42e6b888a753713cfdabd3ae794
1 change: 0 additions & 1 deletion solr/licenses/hadoop-common-3.4.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/hadoop-common-3.4.3.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
205920c1d8897ffc5b6921ee9f0be4ac4275973f
1 change: 0 additions & 1 deletion solr/licenses/hadoop-hdfs-3.4.1-tests.jar.sha1

This file was deleted.

1 change: 0 additions & 1 deletion solr/licenses/hadoop-hdfs-3.4.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/hadoop-hdfs-3.4.3-tests.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
273804a9a2fa4051bfd068fa2f020a3c9a4f4fae
1 change: 1 addition & 0 deletions solr/licenses/hadoop-hdfs-3.4.3.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8d707dc49d7c8907732408a8f76e03354a6ace9d
1 change: 0 additions & 1 deletion solr/licenses/hadoop-minikdc-3.4.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/hadoop-minikdc-3.4.3.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b13ee4ffdbdeeef77efb08aa530f33ecb3d8c801
1 change: 0 additions & 1 deletion solr/licenses/swagger-annotations-jakarta-2.2.52.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/swagger-annotations-jakarta-2.2.53.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8ccabf90718bd6188b470d33fb8db24bc0ff6a13
1 change: 0 additions & 1 deletion solr/licenses/tika-core-3.3.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/tika-core-3.3.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cb3323ade654469bb6f8d758d3eccbc146693f31
1 change: 0 additions & 1 deletion solr/licenses/tika-langdetect-tika-3.3.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/tika-langdetect-tika-3.3.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1788da8ed95e9cd62c2d3f8b045da0e9d9cd7636
2 changes: 1 addition & 1 deletion solr/modules/hadoop-auth/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ dependencies {
implementation ('org.apache.hadoop:hadoop-common') { transitive = false }
// transitive of hadoop-common; used by Kerberos auth
runtimeOnly 'org.apache.hadoop.thirdparty:hadoop-shaded-guava'
runtimeOnly 'commons-collections:commons-collections'
runtimeOnly 'org.apache.commons:commons-collections4'
runtimeOnly 'com.google.re2j:re2j'
runtimeOnly 'org.apache.commons:commons-configuration2'
runtimeOnly 'org.apache.kerby:kerb-core'
Expand Down
30 changes: 15 additions & 15 deletions versions.lock
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ com.fasterxml.jackson.module:jackson-module-scala_2.13:2.22.0 (2 constraints: e7
com.fasterxml.woodstox:woodstox-core:7.2.0 (3 constraints: 6235ec97)
com.github.ben-manes.caffeine:caffeine:3.2.4 (2 constraints: 0e123b17)
com.github.luben:zstd-jni:1.5.6-4 (1 constraints: 600d6236)
com.github.spotbugs:spotbugs-annotations:4.10.2 (1 constraints: 39053d3b)
com.github.spotbugs:spotbugs-annotations:4.10.3 (1 constraints: 3a053e3b)
com.github.stephenc.jcip:jcip-annotations:1.0-1 (3 constraints: c71d2c87)
com.github.virtuald:curvesapi:1.08 (1 constraints: 9f0ac8c0)
com.google.android:annotations:4.1.1.4 (4 constraints: a33b86f4)
Expand Down Expand Up @@ -78,7 +78,7 @@ com.yammer.metrics:metrics-core:2.2.0 (7 constraints: 8760e867)
com.zaxxer:SparseBitSet:1.3 (1 constraints: 0e081f75)
commons-beanutils:commons-beanutils:1.11.0 (1 constraints: e30fce93)
commons-cli:commons-cli:1.11.0 (2 constraints: d20f5dbe)
commons-codec:commons-codec:1.22.0 (11 constraints: e99f8a2f)
commons-codec:commons-codec:1.22.1 (11 constraints: ea9f4f31)
commons-collections:commons-collections:3.2.2 (3 constraints: 77242dac)
commons-digester:commons-digester:2.1 (1 constraints: 550fb664)
commons-io:commons-io:2.22.0 (11 constraints: 85863038)
Expand Down Expand Up @@ -165,7 +165,7 @@ io.prometheus:simpleclient:0.16.0 (3 constraints: 9d257513)
io.prometheus:simpleclient_common:0.16.0 (1 constraints: 1a1139c0)
io.prometheus:simpleclient_httpserver:0.16.0 (1 constraints: 3905353b)
io.sgr:s2-geometry-library-java:1.0.0 (1 constraints: b0107fb9)
io.swagger.core.v3:swagger-annotations-jakarta:2.2.52 (1 constraints: 3d053d3b)
io.swagger.core.v3:swagger-annotations-jakarta:2.2.53 (1 constraints: 3e053e3b)
jakarta.annotation:jakarta.annotation-api:2.1.1 (4 constraints: c94095a4)
jakarta.inject:jakarta.inject-api:2.0.1 (5 constraints: 1d49b79e)
jakarta.validation:jakarta.validation-api:3.0.2 (1 constraints: fe10bbc3)
Expand All @@ -180,7 +180,7 @@ org.apache.calcite:calcite-core:1.37.0 (1 constraints: 3d05463b)
org.apache.calcite:calcite-linq4j:1.37.0 (2 constraints: cf12444c)
org.apache.calcite.avatica:avatica-core:1.25.0 (3 constraints: 0121ddcc)
org.apache.calcite.avatica:avatica-metrics:1.25.0 (1 constraints: 9b104fc4)
org.apache.commons:commons-collections4:4.5.0 (3 constraints: 471880cc)
org.apache.commons:commons-collections4:4.6.0 (3 constraints: 4818bfcc)
org.apache.commons:commons-compress:1.28.0 (3 constraints: a91fa2f4)
org.apache.commons:commons-configuration2:2.15.1 (1 constraints: 3b053f3b)
org.apache.commons:commons-exec:1.6.0 (1 constraints: 09050236)
Expand All @@ -190,11 +190,11 @@ org.apache.commons:commons-text:1.15.0 (2 constraints: 681fa0e5)
org.apache.curator:curator-client:5.9.0 (2 constraints: f01434a4)
org.apache.curator:curator-framework:5.9.0 (2 constraints: 0d140f76)
org.apache.curator:curator-recipes:5.9.0 (1 constraints: 10051f36)
org.apache.hadoop:hadoop-annotations:3.4.1 (1 constraints: 0a050736)
org.apache.hadoop:hadoop-auth:3.4.1 (1 constraints: 0a050736)
org.apache.hadoop:hadoop-client-api:3.4.1 (3 constraints: 1928b25e)
org.apache.hadoop:hadoop-client-runtime:3.4.1 (2 constraints: 67170843)
org.apache.hadoop:hadoop-common:3.4.1 (1 constraints: 0a050736)
org.apache.hadoop:hadoop-annotations:3.4.3 (1 constraints: 0c050936)
org.apache.hadoop:hadoop-auth:3.4.3 (1 constraints: 0c050936)
org.apache.hadoop:hadoop-client-api:3.4.3 (3 constraints: 1f28e05f)
org.apache.hadoop:hadoop-client-runtime:3.4.3 (2 constraints: 6b177443)
org.apache.hadoop:hadoop-common:3.4.3 (1 constraints: 0c050936)
org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.5.0 (1 constraints: 0805ff35)
org.apache.httpcomponents:httpclient:4.5.14 (10 constraints: 6e9cc932)
org.apache.httpcomponents:httpcore:4.4.16 (9 constraints: a48fb4f0)
Expand Down Expand Up @@ -260,8 +260,8 @@ org.apache.poi:poi:5.5.1 (2 constraints: db0f56a8)
org.apache.poi:poi-ooxml:5.5.1 (1 constraints: 0d051436)
org.apache.poi:poi-ooxml-lite:5.5.1 (1 constraints: cf0aa7cb)
org.apache.thrift:libthrift:0.15.0 (1 constraints: 900d0334)
org.apache.tika:tika-core:3.3.1 (1 constraints: 09050436)
org.apache.tika:tika-langdetect-tika:3.3.1 (1 constraints: 09050436)
org.apache.tika:tika-core:3.3.2 (1 constraints: 0a050536)
org.apache.tika:tika-langdetect-tika:3.3.2 (1 constraints: 0a050536)
org.apache.tomcat:annotations-api:6.0.53 (1 constraints: 40054e3b)
org.apache.xmlbeans:xmlbeans:5.3.0 (2 constraints: 72173c75)
org.apache.zookeeper:zookeeper:3.9.5 (3 constraints: aa1e950b)
Expand Down Expand Up @@ -322,7 +322,7 @@ org.jetbrains.kotlin:kotlin-stdlib:2.2.21 (10 constraints: 929b3d90)
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (2 constraints: f31f0a21)
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (6 constraints: 745eefc1)
org.jspecify:jspecify:1.0.0 (8 constraints: 577d1349)
org.junit:junit-bom:6.1.0 (1 constraints: c0115ade)
org.junit:junit-bom:6.1.2 (1 constraints: c2115cde)
org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760)
org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a)
org.locationtech.proj4j:proj4j:1.2.2 (1 constraints: 5d0daf2c)
Expand Down Expand Up @@ -421,9 +421,9 @@ net.java.dev.jna:jna:5.18.1 (2 constraints: 3d1b1b62)
net.minidev:accessors-smart:2.4.9 (1 constraints: 500a92b8)
net.minidev:json-smart:2.4.10 (1 constraints: 400e9a7c)
no.nav.security:mock-oauth2-server:0.5.10 (1 constraints: 3805333b)
org.apache.hadoop:hadoop-client-minicluster:3.4.1 (1 constraints: 0a050736)
org.apache.hadoop:hadoop-hdfs:3.4.1 (1 constraints: 0a050736)
org.apache.hadoop:hadoop-minikdc:3.4.1 (1 constraints: 0a050736)
org.apache.hadoop:hadoop-client-minicluster:3.4.3 (1 constraints: 0c050936)
org.apache.hadoop:hadoop-hdfs:3.4.3 (1 constraints: 0c050936)
org.apache.hadoop:hadoop-minikdc:3.4.3 (1 constraints: 0c050936)
org.apache.kerby:kerb-admin:2.1.2 (1 constraints: 870d922f)
org.apache.kerby:kerb-client:2.1.2 (1 constraints: 870d922f)
org.apache.kerby:kerb-common:2.1.2 (3 constraints: df250cb3)
Expand Down
12 changes: 6 additions & 6 deletions versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ com.carrotsearch:hppc=0.10.0
com.cybozu.labs:langdetect=1.1-20120112
com.fasterxml.jackson:jackson-bom=2.22.0
com.github.ben-manes.caffeine:caffeine=3.2.4
com.github.spotbugs:*=4.10.2
com.github.spotbugs:*=4.10.3
com.github.stephenc.jcip:jcip-annotations=1.0-1
com.google.cloud:google-cloud-bom=0.265.0
com.google.errorprone:*=2.31.0
Expand All @@ -21,7 +21,7 @@ com.lmax:disruptor=3.4.4
com.squareup.okhttp3:*=5.4.0
com.tdunning:t-digest=3.3
commons-cli:commons-cli=1.11.0
commons-codec:commons-codec=1.22.0
commons-codec:commons-codec=1.22.1
commons-collections:commons-collections=3.2.2
commons-io:commons-io=2.22.0
dev.langchain4j:langchain4j-*=0.35.0
Expand All @@ -34,7 +34,7 @@ io.opentelemetry:opentelemetry-bom=1.63.0
io.opentracing:opentracing*=0.33.0
io.prometheus:prometheus*=1.8.0
io.prometheus:simpleclient*=0.16.0
io.swagger.core.v3:*=2.2.52
io.swagger.core.v3:*=2.2.53
jakarta.ws.rs:jakarta.ws.rs-api=3.1.0
junit:junit=4.13.2
net.bytebuddy:*=1.18.10
Expand All @@ -43,15 +43,15 @@ net.thisptr:jackson-jq=0.0.13
no.nav.security:mock-oauth2-server=0.5.10
org.apache.calcite.avatica:avatica-core=1.25.0
org.apache.calcite:*=1.37.0
org.apache.commons:commons-collections4=4.5.0
org.apache.commons:commons-collections4=4.6.0
org.apache.commons:commons-compress=1.28.0
org.apache.commons:commons-configuration2=2.15.1
org.apache.commons:commons-exec=1.6.0
org.apache.commons:commons-lang3=3.20.0
org.apache.commons:commons-math3=3.6.1
org.apache.curator:*=5.9.0
org.apache.hadoop.thirdparty:*=1.5.0
org.apache.hadoop:*=3.4.1
org.apache.hadoop:*=3.4.3
org.apache.httpcomponents:httpclient=4.5.14
org.apache.httpcomponents:httpcore=4.4.16
org.apache.httpcomponents:httpmime=4.5.14
Expand All @@ -62,7 +62,7 @@ org.apache.lucene:*=9.12.3
# Override the OpenNLP tools version that Solr would otherwise inherit from Lucene
org.apache.opennlp:opennlp-tools=1.9.5
org.apache.poi:*=5.5.1
org.apache.tika:*=3.3.1
org.apache.tika:*=3.3.2
org.apache.tomcat:annotations-api=6.0.53
org.apache.zookeeper:*=3.9.5
org.bitbucket.b_c:jose4j=0.9.6
Expand Down
Loading