Skip to content

Commit db36284

Browse files
authored
SOLR-18208: Replace abandoned langdetect dependency with maintained fork (#4326)
1 parent 95b15d5 commit db36284

71 files changed

Lines changed: 115 additions & 170 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
title: Replace abandoned com.cybozu.labs:langdetect with maintained io.github.azagniotov:language-detection in the langid module
2+
type: dependency_update
3+
authors:
4+
- name: Jan Høydahl
5+
url: https://home.apache.org/phonebook.html?uid=janhoy
6+
links:
7+
- name: SOLR-18208
8+
url: https://issues.apache.org/jira/browse/SOLR-18208

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ apiguardian = "1.1.2"
4848
asciidoctor-mathjax = "0.0.9"
4949
# @keep Asciidoctor tabs version used in ref-guide
5050
asciidoctor-tabs = "1.0.0-beta.6"
51+
azagniotov-langdetect = "12.5.2"
5152
# @keep bats-assert (node) version used in packaging
5253
bats-assert = "2.0.0"
5354
# @keep bats-core (node) version used in packaging
@@ -74,7 +75,6 @@ compose = "1.10.3"
7475
cutterslade-analyze = "1.10.0"
7576
cuvs-java = "25.10.0"
7677
cuvs-lucene = "25.10.0"
77-
cybozulabs-langdetect = "1.1-20120112"
7878
decompose = "3.4.0"
7979
diffplug-spotless = "8.3.0"
8080
# @keep Use for dockerfile JRE version
@@ -295,6 +295,7 @@ apache-zookeeper-jute = { module = "org.apache.zookeeper:zookeeper-jute", versio
295295
apache-zookeeper-zookeeper = { module = "org.apache.zookeeper:zookeeper", version.ref = "apache-zookeeper" }
296296
# @keep transitive dependency for version alignment
297297
apiguardian-api = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" }
298+
azagniotov-langdetect = { module = "io.github.azagniotov:language-detection", version.ref = "azagniotov-langdetect" }
298299
bc-jose4j = { module = "org.bitbucket.b_c:jose4j", version.ref = "bc-jose4j" }
299300
benmanes-caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "benmanes-caffeine" }
300301
bouncycastle-bcpkix = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "bouncycastle" }
@@ -319,7 +320,6 @@ compose-uiTest = { module = "org.jetbrains.compose.ui:ui-test", version.ref = "c
319320
compose-uiToolingPreview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "compose" }
320321
cuvs-java = { module = "com.nvidia.cuvs:cuvs-java", version.ref = "cuvs-java" }
321322
cuvs-lucene = { module = "com.nvidia.cuvs.lucene:cuvs-lucene", version.ref = "cuvs-lucene" }
322-
cybozulabs-langdetect = { module = "com.cybozu.labs:langdetect", version.ref = "cybozulabs-langdetect" }
323323
decompose-decompose = { module = "com.arkivanov.decompose:decompose", version.ref = "decompose" }
324324
decompose-extensions-compose = { module = "com.arkivanov.decompose:extensions-compose", version.ref = "decompose" }
325325
dropwizard-metrics-core = { module = "io.dropwizard.metrics:metrics-core", version.ref = "dropwizard-metrics" }

gradle/validation/rat-sources.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ allprojects {
112112
exclude "src/test-files/META-INF/services/*"
113113
break
114114

115-
case ":solr:modules:langid":
116-
exclude "**/langdetect-profiles/*"
117-
break
118115

119116
case ":solr:modules:ltr":
120117
// TODO: SOLR-15601: Some of these should carry the license, perhaps?

solr/licenses/jsonic-1.2.7.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

solr/licenses/jsonic-NOTICE.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

solr/licenses/langdetect-1.1-20120112.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

solr/licenses/langdetect-LICENSE-ASL.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.

solr/licenses/langdetect-NOTICE.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bdd4001508593ab775fa2f78b55b1dc6ada80467

solr/licenses/jsonic-LICENSE-ASL.txt renamed to solr/licenses/language-detection-LICENSE-ASL.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Apache License
1+
Apache License
22
Version 2.0, January 2004
33
http://www.apache.org/licenses/
44

0 commit comments

Comments
 (0)