From 82748f97dc288a084642d782ca571822fe379705 Mon Sep 17 00:00:00 2001 From: Christos Malliaridis Date: Fri, 19 Sep 2025 23:05:44 +0300 Subject: [PATCH 01/10] Update Apache Tika to 2.9.4 and log4j to 2.25.1 --- .../signatures/commons-io-unsafe-2.19.0.txt | 17 + gradle/libs.versions.toml | 8 +- solr/api/gradle.lockfile | 6 +- solr/benchmark/gradle.lockfile | 6 +- solr/core/gradle.lockfile | 15 +- solr/cross-dc-manager/gradle.lockfile | 12 +- solr/licenses/SparseBitSet-1.2.jar.sha1 | 1 - solr/licenses/SparseBitSet-1.3.jar.sha1 | 1 + .../apache-mime4j-core-0.8.12.jar.sha1 | 1 + .../apache-mime4j-core-0.8.4.jar.sha1 | 1 - .../apache-mime4j-dom-0.8.12.jar.sha1 | 1 + .../licenses/apache-mime4j-dom-0.8.4.jar.sha1 | 1 - solr/licenses/bcmail-jdk15on-1.70.jar.sha1 | 1 - solr/licenses/bcmail-jdk18on-1.80.jar.sha1 | 1 + .../biz.aQute.bnd.annotation-6.4.1.jar.sha1 | 1 - .../biz.aQute.bnd.annotation-7.1.0.jar.sha1 | 1 + solr/licenses/boilerpipe-1.1.0.jar.sha1 | 1 - solr/licenses/bzip2-0.9.1.jar.sha1 | 1 - solr/licenses/c3p0-0.9.5.5.jar.sha1 | 1 - solr/licenses/cdm-4.5.5.jar.sha1 | 1 - .../licenses/commons-compress-1.26.1.jar.sha1 | 1 - .../licenses/commons-compress-1.27.1.jar.sha1 | 1 + solr/licenses/commons-csv-1.14.0.jar.sha1 | 1 + solr/licenses/commons-csv-1.9.0.jar.sha1 | 1 - solr/licenses/commons-io-2.19.0.jar.sha1 | 1 + solr/licenses/curvesapi-1.07.jar.sha1 | 1 - solr/licenses/curvesapi-1.08.jar.sha1 | 1 + solr/licenses/dd-plist-1.24.jar.sha1 | 1 - solr/licenses/dd-plist-1.28.jar.sha1 | 1 + solr/licenses/ehcache-core-2.6.2.jar.sha1 | 1 - solr/licenses/fontbox-2.0.26.jar.sha1 | 1 - solr/licenses/fontbox-2.0.34.jar.sha1 | 1 + solr/licenses/geoapi-3.0.1.jar.sha1 | 1 - solr/licenses/grib-4.5.5.jar.sha1 | 1 - solr/licenses/httpservices-4.5.5.jar.sha1 | 1 - solr/licenses/isoparser-1.9.41.7.jar.sha1 | 1 - solr/licenses/jackcess-4.0.2.jar.sha1 | 1 - solr/licenses/jackcess-4.0.8.jar.sha1 | 1 + solr/licenses/jackcess-encrypt-4.0.1.jar.sha1 | 1 - solr/licenses/jackcess-encrypt-4.0.3.jar.sha1 | 1 + .../jakarta.activation-api-1.2.2.jar.sha1 | 1 - solr/licenses/jcommander-1.82.jar.sha1 | 1 - solr/licenses/jempbox-1.8.16.jar.sha1 | 1 - solr/licenses/jempbox-1.8.17.jar.sha1 | 1 + solr/licenses/jna-5.12.1.jar.sha1 | 1 - .../licenses/juniversalchardet-1.0.3.jar.sha1 | 1 - .../licenses/juniversalchardet-2.5.0.jar.sha1 | 1 + solr/licenses/junrar-7.5.3.jar.sha1 | 1 - solr/licenses/junrar-7.5.5.jar.sha1 | 1 + solr/licenses/jwarc-0.31.1.jar.sha1 | 1 + ...-LICENSE-ASL.txt => jwarc-LICENSE-ASL.txt} | 42 +- solr/licenses/jwarc-NOTICE.txt | 0 solr/licenses/log4j-1.2-api-2.21.0.jar.sha1 | 1 - solr/licenses/log4j-1.2-api-2.25.1.jar.sha1 | 1 + solr/licenses/log4j-api-2.21.0.jar.sha1 | 1 - solr/licenses/log4j-api-2.25.1.jar.sha1 | 1 + solr/licenses/log4j-core-2.21.0.jar.sha1 | 1 - solr/licenses/log4j-core-2.25.1.jar.sha1 | 1 + ...log4j-layout-template-json-2.21.0.jar.sha1 | 1 - ...log4j-layout-template-json-2.25.1.jar.sha1 | 1 + .../log4j-slf4j2-impl-2.21.0.jar.sha1 | 1 - .../log4j-slf4j2-impl-2.25.1.jar.sha1 | 1 + solr/licenses/log4j-web-2.21.0.jar.sha1 | 1 - solr/licenses/log4j-web-2.25.1.jar.sha1 | 1 + .../mchange-commons-java-0.2.19.jar.sha1 | 1 - .../metadata-extractor-2.17.1.0.jar.sha1 | 1 - .../metadata-extractor-2.19.0.jar.sha1 | 1 + solr/licenses/netcdf4-4.5.5.jar.sha1 | 1 - solr/licenses/openjson-1.0.12.jar.sha1 | 1 - .../org.osgi.annotation.bundle-2.0.0.jar.sha1 | 1 + ...org.osgi.annotation.bundle-LICENSE-ASL.txt | 201 +++++++ .../org.osgi.annotation.bundle-NOTICE.txt | 46 ++ ....osgi.annotation.versioning-1.1.2.jar.sha1 | 1 + ...osgi.annotation.versioning-LICENSE-ASL.txt | 201 +++++++ .../org.osgi.annotation.versioning-NOTICE.txt | 46 ++ solr/licenses/pdfbox-2.0.26.jar.sha1 | 1 - solr/licenses/pdfbox-2.0.34.jar.sha1 | 1 + solr/licenses/pdfbox-tools-2.0.26.jar.sha1 | 1 - solr/licenses/pdfbox-tools-2.0.34.jar.sha1 | 1 + solr/licenses/poi-5.2.2.jar.sha1 | 1 - solr/licenses/poi-5.4.1.jar.sha1 | 1 + solr/licenses/poi-ooxml-5.2.2.jar.sha1 | 1 - solr/licenses/poi-ooxml-5.4.1.jar.sha1 | 1 + solr/licenses/poi-ooxml-lite-5.2.2.jar.sha1 | 1 - solr/licenses/poi-ooxml-lite-5.4.1.jar.sha1 | 1 + solr/licenses/poi-scratchpad-5.2.2.jar.sha1 | 1 - solr/licenses/poi-scratchpad-5.4.1.jar.sha1 | 1 + solr/licenses/preflight-2.0.26.jar.sha1 | 1 - solr/licenses/rome-1.18.0.jar.sha1 | 1 - solr/licenses/rome-2.1.0.jar.sha1 | 1 + solr/licenses/rome-utils-1.18.0.jar.sha1 | 1 - solr/licenses/rome-utils-2.1.0.jar.sha1 | 1 + .../sentiment-analysis-parser-0.1.jar.sha1 | 1 - solr/licenses/sis-feature-1.2.jar.sha1 | 1 - solr/licenses/sis-metadata-1.2.jar.sha1 | 1 - solr/licenses/sis-netcdf-1.2.jar.sha1 | 1 - solr/licenses/sis-referencing-1.2.jar.sha1 | 1 - solr/licenses/sis-storage-1.2.jar.sha1 | 1 - solr/licenses/sis-utility-1.2.jar.sha1 | 1 - .../spotbugs-annotations-4.9.4.jar.sha1 | 1 + .../spotbugs-annotations-LICENSE-ASL.txt | 504 ++++++++++++++++++ solr/licenses/spotbugs-annotations-NOTICE.txt | 504 ++++++++++++++++++ ...e-LICENSE-ASL.txt => tika-LICENSE-ASL.txt} | 0 .../{tika-core-NOTICE.txt => tika-NOTICE.txt} | 0 solr/licenses/tika-core-1.28.5.jar.sha1 | 1 - solr/licenses/tika-core-2.9.4.jar.sha1 | 1 + .../tika-parser-apple-module-2.9.4.jar.sha1 | 1 + ...ka-parser-audiovideo-module-2.9.4.jar.sha1 | 1 + .../tika-parser-cad-module-2.9.4.jar.sha1 | 1 + .../tika-parser-code-module-2.9.4.jar.sha1 | 1 + .../tika-parser-crypto-module-2.9.4.jar.sha1 | 1 + .../tika-parser-digest-commons-2.9.4.jar.sha1 | 1 + .../tika-parser-font-module-2.9.4.jar.sha1 | 1 + .../tika-parser-html-module-2.9.4.jar.sha1 | 1 + .../tika-parser-image-module-2.9.4.jar.sha1 | 1 + .../tika-parser-mail-commons-2.9.4.jar.sha1 | 1 + .../tika-parser-mail-module-2.9.4.jar.sha1 | 1 + ...ika-parser-microsoft-module-2.9.4.jar.sha1 | 1 + ...ka-parser-miscoffice-module-2.9.4.jar.sha1 | 1 + .../tika-parser-news-module-2.9.4.jar.sha1 | 1 + .../tika-parser-ocr-module-2.9.4.jar.sha1 | 1 + .../tika-parser-pdf-module-2.9.4.jar.sha1 | 1 + .../tika-parser-pkg-module-2.9.4.jar.sha1 | 1 + .../tika-parser-text-module-2.9.4.jar.sha1 | 1 + ...ka-parser-webarchive-module-2.9.4.jar.sha1 | 1 + .../tika-parser-xml-module-2.9.4.jar.sha1 | 1 + .../tika-parser-xmp-commons-2.9.4.jar.sha1 | 1 + .../tika-parser-zip-commons-2.9.4.jar.sha1 | 1 + solr/licenses/tika-parsers-1.28.5.jar.sha1 | 1 - solr/licenses/tika-parsers-NOTICE.txt | 12 - ...ka-parsers-standard-package-2.9.4.jar.sha1 | 1 + solr/licenses/udunits-4.5.5.jar.sha1 | 1 - solr/licenses/unit-api-1.0.jar.sha1 | 1 - solr/licenses/xmlbeans-5.0.3.jar.sha1 | 1 - solr/licenses/xmlbeans-5.3.0.jar.sha1 | 1 + solr/licenses/xmpbox-2.0.26.jar.sha1 | 1 - solr/licenses/xmpbox-2.0.34.jar.sha1 | 1 + solr/licenses/xmpcore-6.1.10.jar.sha1 | 1 - solr/licenses/xmpcore-6.1.11.jar.sha1 | 1 + solr/licenses/xmpcore-shaded-6.1.10.jar.sha1 | 1 - solr/licenses/xz-1.10.jar.sha1 | 1 + solr/licenses/xz-1.9.jar.sha1 | 1 - solr/modules/analysis-extras/gradle.lockfile | 12 +- solr/modules/clustering/gradle.lockfile | 12 +- solr/modules/cross-dc/gradle.lockfile | 12 +- solr/modules/extraction/build.gradle | 4 +- solr/modules/extraction/gradle.lockfile | 210 ++++---- solr/modules/gcs-repository/gradle.lockfile | 12 +- solr/modules/jwt-auth/gradle.lockfile | 12 +- solr/modules/langid/build.gradle | 1 + solr/modules/langid/gradle.lockfile | 15 +- solr/modules/llm/gradle.lockfile | 12 +- solr/modules/ltr/gradle.lockfile | 12 +- solr/modules/opentelemetry/gradle.lockfile | 12 +- solr/modules/s3-repository/gradle.lockfile | 12 +- solr/modules/scripting/gradle.lockfile | 12 +- solr/modules/sql/gradle.lockfile | 12 +- solr/prometheus-exporter/gradle.lockfile | 12 +- solr/server/gradle.lockfile | 12 +- solr/solr-ref-guide/gradle.lockfile | 6 +- solr/solrj-streaming/gradle.lockfile | 6 +- solr/solrj-zookeeper/gradle.lockfile | 6 +- solr/solrj/gradle.lockfile | 6 +- solr/test-framework/gradle.lockfile | 13 +- solr/webapp/gradle.lockfile | 12 +- 165 files changed, 1840 insertions(+), 340 deletions(-) create mode 100644 forbidden-apis/signatures/commons-io-unsafe-2.19.0.txt delete mode 100644 solr/licenses/SparseBitSet-1.2.jar.sha1 create mode 100644 solr/licenses/SparseBitSet-1.3.jar.sha1 create mode 100644 solr/licenses/apache-mime4j-core-0.8.12.jar.sha1 delete mode 100644 solr/licenses/apache-mime4j-core-0.8.4.jar.sha1 create mode 100644 solr/licenses/apache-mime4j-dom-0.8.12.jar.sha1 delete mode 100644 solr/licenses/apache-mime4j-dom-0.8.4.jar.sha1 delete mode 100644 solr/licenses/bcmail-jdk15on-1.70.jar.sha1 create mode 100644 solr/licenses/bcmail-jdk18on-1.80.jar.sha1 delete mode 100644 solr/licenses/biz.aQute.bnd.annotation-6.4.1.jar.sha1 create mode 100644 solr/licenses/biz.aQute.bnd.annotation-7.1.0.jar.sha1 delete mode 100644 solr/licenses/boilerpipe-1.1.0.jar.sha1 delete mode 100644 solr/licenses/bzip2-0.9.1.jar.sha1 delete mode 100644 solr/licenses/c3p0-0.9.5.5.jar.sha1 delete mode 100644 solr/licenses/cdm-4.5.5.jar.sha1 delete mode 100644 solr/licenses/commons-compress-1.26.1.jar.sha1 create mode 100644 solr/licenses/commons-compress-1.27.1.jar.sha1 create mode 100644 solr/licenses/commons-csv-1.14.0.jar.sha1 delete mode 100644 solr/licenses/commons-csv-1.9.0.jar.sha1 create mode 100644 solr/licenses/commons-io-2.19.0.jar.sha1 delete mode 100644 solr/licenses/curvesapi-1.07.jar.sha1 create mode 100644 solr/licenses/curvesapi-1.08.jar.sha1 delete mode 100644 solr/licenses/dd-plist-1.24.jar.sha1 create mode 100644 solr/licenses/dd-plist-1.28.jar.sha1 delete mode 100644 solr/licenses/ehcache-core-2.6.2.jar.sha1 delete mode 100644 solr/licenses/fontbox-2.0.26.jar.sha1 create mode 100644 solr/licenses/fontbox-2.0.34.jar.sha1 delete mode 100644 solr/licenses/geoapi-3.0.1.jar.sha1 delete mode 100644 solr/licenses/grib-4.5.5.jar.sha1 delete mode 100644 solr/licenses/httpservices-4.5.5.jar.sha1 delete mode 100644 solr/licenses/isoparser-1.9.41.7.jar.sha1 delete mode 100644 solr/licenses/jackcess-4.0.2.jar.sha1 create mode 100644 solr/licenses/jackcess-4.0.8.jar.sha1 delete mode 100644 solr/licenses/jackcess-encrypt-4.0.1.jar.sha1 create mode 100644 solr/licenses/jackcess-encrypt-4.0.3.jar.sha1 delete mode 100644 solr/licenses/jakarta.activation-api-1.2.2.jar.sha1 delete mode 100644 solr/licenses/jcommander-1.82.jar.sha1 delete mode 100644 solr/licenses/jempbox-1.8.16.jar.sha1 create mode 100644 solr/licenses/jempbox-1.8.17.jar.sha1 delete mode 100644 solr/licenses/jna-5.12.1.jar.sha1 delete mode 100644 solr/licenses/juniversalchardet-1.0.3.jar.sha1 create mode 100644 solr/licenses/juniversalchardet-2.5.0.jar.sha1 delete mode 100644 solr/licenses/junrar-7.5.3.jar.sha1 create mode 100644 solr/licenses/junrar-7.5.5.jar.sha1 create mode 100644 solr/licenses/jwarc-0.31.1.jar.sha1 rename solr/licenses/{tika-parsers-LICENSE-ASL.txt => jwarc-LICENSE-ASL.txt} (85%) create mode 100644 solr/licenses/jwarc-NOTICE.txt delete mode 100644 solr/licenses/log4j-1.2-api-2.21.0.jar.sha1 create mode 100644 solr/licenses/log4j-1.2-api-2.25.1.jar.sha1 delete mode 100644 solr/licenses/log4j-api-2.21.0.jar.sha1 create mode 100644 solr/licenses/log4j-api-2.25.1.jar.sha1 delete mode 100644 solr/licenses/log4j-core-2.21.0.jar.sha1 create mode 100644 solr/licenses/log4j-core-2.25.1.jar.sha1 delete mode 100644 solr/licenses/log4j-layout-template-json-2.21.0.jar.sha1 create mode 100644 solr/licenses/log4j-layout-template-json-2.25.1.jar.sha1 delete mode 100644 solr/licenses/log4j-slf4j2-impl-2.21.0.jar.sha1 create mode 100644 solr/licenses/log4j-slf4j2-impl-2.25.1.jar.sha1 delete mode 100644 solr/licenses/log4j-web-2.21.0.jar.sha1 create mode 100644 solr/licenses/log4j-web-2.25.1.jar.sha1 delete mode 100644 solr/licenses/mchange-commons-java-0.2.19.jar.sha1 delete mode 100644 solr/licenses/metadata-extractor-2.17.1.0.jar.sha1 create mode 100644 solr/licenses/metadata-extractor-2.19.0.jar.sha1 delete mode 100644 solr/licenses/netcdf4-4.5.5.jar.sha1 delete mode 100644 solr/licenses/openjson-1.0.12.jar.sha1 create mode 100644 solr/licenses/org.osgi.annotation.bundle-2.0.0.jar.sha1 create mode 100644 solr/licenses/org.osgi.annotation.bundle-LICENSE-ASL.txt create mode 100644 solr/licenses/org.osgi.annotation.bundle-NOTICE.txt create mode 100644 solr/licenses/org.osgi.annotation.versioning-1.1.2.jar.sha1 create mode 100644 solr/licenses/org.osgi.annotation.versioning-LICENSE-ASL.txt create mode 100644 solr/licenses/org.osgi.annotation.versioning-NOTICE.txt delete mode 100644 solr/licenses/pdfbox-2.0.26.jar.sha1 create mode 100644 solr/licenses/pdfbox-2.0.34.jar.sha1 delete mode 100644 solr/licenses/pdfbox-tools-2.0.26.jar.sha1 create mode 100644 solr/licenses/pdfbox-tools-2.0.34.jar.sha1 delete mode 100644 solr/licenses/poi-5.2.2.jar.sha1 create mode 100644 solr/licenses/poi-5.4.1.jar.sha1 delete mode 100644 solr/licenses/poi-ooxml-5.2.2.jar.sha1 create mode 100644 solr/licenses/poi-ooxml-5.4.1.jar.sha1 delete mode 100644 solr/licenses/poi-ooxml-lite-5.2.2.jar.sha1 create mode 100644 solr/licenses/poi-ooxml-lite-5.4.1.jar.sha1 delete mode 100644 solr/licenses/poi-scratchpad-5.2.2.jar.sha1 create mode 100644 solr/licenses/poi-scratchpad-5.4.1.jar.sha1 delete mode 100644 solr/licenses/preflight-2.0.26.jar.sha1 delete mode 100644 solr/licenses/rome-1.18.0.jar.sha1 create mode 100644 solr/licenses/rome-2.1.0.jar.sha1 delete mode 100644 solr/licenses/rome-utils-1.18.0.jar.sha1 create mode 100644 solr/licenses/rome-utils-2.1.0.jar.sha1 delete mode 100644 solr/licenses/sentiment-analysis-parser-0.1.jar.sha1 delete mode 100644 solr/licenses/sis-feature-1.2.jar.sha1 delete mode 100644 solr/licenses/sis-metadata-1.2.jar.sha1 delete mode 100644 solr/licenses/sis-netcdf-1.2.jar.sha1 delete mode 100644 solr/licenses/sis-referencing-1.2.jar.sha1 delete mode 100644 solr/licenses/sis-storage-1.2.jar.sha1 delete mode 100644 solr/licenses/sis-utility-1.2.jar.sha1 create mode 100644 solr/licenses/spotbugs-annotations-4.9.4.jar.sha1 create mode 100644 solr/licenses/spotbugs-annotations-LICENSE-ASL.txt create mode 100644 solr/licenses/spotbugs-annotations-NOTICE.txt rename solr/licenses/{tika-core-LICENSE-ASL.txt => tika-LICENSE-ASL.txt} (100%) rename solr/licenses/{tika-core-NOTICE.txt => tika-NOTICE.txt} (100%) delete mode 100644 solr/licenses/tika-core-1.28.5.jar.sha1 create mode 100644 solr/licenses/tika-core-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-apple-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-audiovideo-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-cad-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-code-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-crypto-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-digest-commons-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-font-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-html-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-image-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-mail-commons-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-mail-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-microsoft-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-miscoffice-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-news-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-ocr-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-pdf-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-pkg-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-text-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-webarchive-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-xml-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-xmp-commons-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-zip-commons-2.9.4.jar.sha1 delete mode 100644 solr/licenses/tika-parsers-1.28.5.jar.sha1 delete mode 100644 solr/licenses/tika-parsers-NOTICE.txt create mode 100644 solr/licenses/tika-parsers-standard-package-2.9.4.jar.sha1 delete mode 100644 solr/licenses/udunits-4.5.5.jar.sha1 delete mode 100644 solr/licenses/unit-api-1.0.jar.sha1 delete mode 100644 solr/licenses/xmlbeans-5.0.3.jar.sha1 create mode 100644 solr/licenses/xmlbeans-5.3.0.jar.sha1 delete mode 100644 solr/licenses/xmpbox-2.0.26.jar.sha1 create mode 100644 solr/licenses/xmpbox-2.0.34.jar.sha1 delete mode 100644 solr/licenses/xmpcore-6.1.10.jar.sha1 create mode 100644 solr/licenses/xmpcore-6.1.11.jar.sha1 delete mode 100644 solr/licenses/xmpcore-shaded-6.1.10.jar.sha1 create mode 100644 solr/licenses/xz-1.10.jar.sha1 delete mode 100644 solr/licenses/xz-1.9.jar.sha1 diff --git a/forbidden-apis/signatures/commons-io-unsafe-2.19.0.txt b/forbidden-apis/signatures/commons-io-unsafe-2.19.0.txt new file mode 100644 index 000000000000..9220ee0fd73b --- /dev/null +++ b/forbidden-apis/signatures/commons-io-unsafe-2.19.0.txt @@ -0,0 +1,17 @@ +# (C) Copyright Uwe Schindler (Generics Policeman) and others. +# Parts of this work are licensed to the Apache Software Foundation (ASF) +# under one or more contributor license agreements. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +@includeBundled commons-io-unsafe-2.18.0 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ea14d91ce6b8..54b4ecb04605 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,12 +36,12 @@ apache-httpcomponents-httpclient = "4.5.14" apache-httpcomponents-httpcore = "4.4.16" apache-httpcomponents-httpmime = "4.5.14" apache-kafka = "3.9.1" -apache-log4j = "2.21.0" +apache-log4j = "2.25.1" apache-lucene = "10.2.1" apache-opennlp = "2.5.4" apache-poi = "5.2.2" apache-rat = "0.15" -apache-tika = "1.28.5" +apache-tika = "2.9.4" apache-tomcat = "6.0.53" apache-zookeeper = "3.9.4" # @keep for version alignment @@ -292,7 +292,9 @@ apache-poi-ooxml = { module = "org.apache.poi:poi-ooxml", version.ref = "apache- apache-poi-poi = { module = "org.apache.poi:poi", version.ref = "apache-poi" } apache-rat-rat = { module = "org.apache.rat:apache-rat", version.ref = "apache-rat" } apache-tika-core = { module = "org.apache.tika:tika-core", version.ref = "apache-tika" } -apache-tika-parsers = { module = "org.apache.tika:tika-parsers", version.ref = "apache-tika" } +apache-tika-langdetect = { module = "org.apache.tika:tika-langdetect", version.ref = "apache-tika" } +apache-tika-parser-html-module = { module = "org.apache.tika:tika-parser-html-module", version.ref = "apache-tika" } +apache-tika-parsers-standard-package = { module = "org.apache.tika:tika-parsers-standard-package", version.ref = "apache-tika" } apache-tomcat-annotationsapi = { module = "org.apache.tomcat:annotations-api", version.ref = "apache-tomcat" } apache-zookeeper-jute = { module = "org.apache.zookeeper:zookeeper-jute", version.ref = "apache-zookeeper" } apache-zookeeper-zookeeper = { module = "org.apache.zookeeper:zookeeper", version.ref = "apache-zookeeper" } diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfile index 02fc1d47a612..ddb8519601b9 100644 --- a/solr/api/gradle.lockfile +++ b/solr/api/gradle.lockfile @@ -87,9 +87,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,testRuntimeClasspath -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-common:10.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,testRuntimeClasspath diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfile index 0cbf483951d9..232750d1c1e6 100644 --- a/solr/benchmark/gradle.lockfile +++ b/solr/benchmark/gradle.lockfile @@ -78,9 +78,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,runtimeClasspath,testRuntime org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,testRuntimeClasspath diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile index 8360201ee824..9e459ba527ef 100644 --- a/solr/core/gradle.lockfile +++ b/solr/core/gradle.lockfile @@ -1,7 +1,8 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -biz.aQute.bnd:biz.aQute.bnd.annotation:6.4.1=compileClasspath,compileOnlyHelper,jarValidation +biz.aQute.bnd:biz.aQute.bnd.annotation:6.4.1=compileOnlyHelper,jarValidation +biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0=compileClasspath,testCompileClasspath com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.3=jarValidation,testCompileClasspath,testRuntimeClasspath com.carrotsearch:hppc:0.10.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.20=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath @@ -85,9 +86,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testCompileClasspath,testRun org.apache.httpcomponents:httpclient:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-common:10.2.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-icu:10.2.1=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath @@ -169,8 +170,10 @@ org.mockito:mockito-core:5.19.0=jarValidation,testCompileClasspath,testRuntimeCl org.mockito:mockito-subclass:5.19.0=jarValidation,testRuntimeClasspath org.objenesis:objenesis:3.3=jarValidation,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=jarValidation,testCompileClasspath,testRuntimeClasspath -org.osgi:org.osgi.resource:1.0.0=compileClasspath,compileOnlyHelper,jarValidation -org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,compileOnlyHelper,jarValidation +org.osgi:org.osgi.annotation.bundle:2.0.0=compileClasspath,testCompileClasspath +org.osgi:org.osgi.annotation.versioning:1.1.2=compileClasspath,testCompileClasspath +org.osgi:org.osgi.resource:1.0.0=compileClasspath,compileOnlyHelper,jarValidation,testCompileClasspath +org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,compileOnlyHelper,jarValidation,testCompileClasspath org.osgi:osgi.annotation:8.1.0=compileClasspath,compileOnlyHelper,jarValidation org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index 951f30888134..1834aedfac45 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -111,12 +111,12 @@ org.apache.kafka:kafka-streams:3.9.1=jarValidation,runtimeClasspath,runtimeLibs, org.apache.kafka:kafka-tools-api:3.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.apache.kafka:kafka-transaction-coordinator:3.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.apache.kafka:kafka_2.13:3.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.1=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/licenses/SparseBitSet-1.2.jar.sha1 b/solr/licenses/SparseBitSet-1.2.jar.sha1 deleted file mode 100644 index f71e9afe0051..000000000000 --- a/solr/licenses/SparseBitSet-1.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8467c813d442837fcaeddbc42cf5c5359fab4933 diff --git a/solr/licenses/SparseBitSet-1.3.jar.sha1 b/solr/licenses/SparseBitSet-1.3.jar.sha1 new file mode 100644 index 000000000000..3797b5c2cf82 --- /dev/null +++ b/solr/licenses/SparseBitSet-1.3.jar.sha1 @@ -0,0 +1 @@ +533eac055afe3d5f614ea95e333afd6c2bde8f26 diff --git a/solr/licenses/apache-mime4j-core-0.8.12.jar.sha1 b/solr/licenses/apache-mime4j-core-0.8.12.jar.sha1 new file mode 100644 index 000000000000..34070342d627 --- /dev/null +++ b/solr/licenses/apache-mime4j-core-0.8.12.jar.sha1 @@ -0,0 +1 @@ +042ad2e9bfc1c0afaf04aefba080079c7e1f4c15 diff --git a/solr/licenses/apache-mime4j-core-0.8.4.jar.sha1 b/solr/licenses/apache-mime4j-core-0.8.4.jar.sha1 deleted file mode 100644 index 772814cf4c67..000000000000 --- a/solr/licenses/apache-mime4j-core-0.8.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a7e552628c6587bdd1e2036045f1e06c4d513e32 diff --git a/solr/licenses/apache-mime4j-dom-0.8.12.jar.sha1 b/solr/licenses/apache-mime4j-dom-0.8.12.jar.sha1 new file mode 100644 index 000000000000..7c25f6938dcd --- /dev/null +++ b/solr/licenses/apache-mime4j-dom-0.8.12.jar.sha1 @@ -0,0 +1 @@ +7bb72605bf69bed1cb2393b9677b61e96c932b4f diff --git a/solr/licenses/apache-mime4j-dom-0.8.4.jar.sha1 b/solr/licenses/apache-mime4j-dom-0.8.4.jar.sha1 deleted file mode 100644 index c1ffee7987a6..000000000000 --- a/solr/licenses/apache-mime4j-dom-0.8.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dfdfdbc095017ffbaef308e80ff7ca53b1a6ff08 diff --git a/solr/licenses/bcmail-jdk15on-1.70.jar.sha1 b/solr/licenses/bcmail-jdk15on-1.70.jar.sha1 deleted file mode 100644 index acc49ba80180..000000000000 --- a/solr/licenses/bcmail-jdk15on-1.70.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -08f4aafad90f6cc7f16b9992279828ae848c9e0d diff --git a/solr/licenses/bcmail-jdk18on-1.80.jar.sha1 b/solr/licenses/bcmail-jdk18on-1.80.jar.sha1 new file mode 100644 index 000000000000..96583349d91a --- /dev/null +++ b/solr/licenses/bcmail-jdk18on-1.80.jar.sha1 @@ -0,0 +1 @@ +11ef5aa0e7a151c054859a39b2af4443884757c7 diff --git a/solr/licenses/biz.aQute.bnd.annotation-6.4.1.jar.sha1 b/solr/licenses/biz.aQute.bnd.annotation-6.4.1.jar.sha1 deleted file mode 100644 index 3046cf2dbf20..000000000000 --- a/solr/licenses/biz.aQute.bnd.annotation-6.4.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -381d53a2e2f48c2623e04990f4a2b06b6885cab1 diff --git a/solr/licenses/biz.aQute.bnd.annotation-7.1.0.jar.sha1 b/solr/licenses/biz.aQute.bnd.annotation-7.1.0.jar.sha1 new file mode 100644 index 000000000000..c8dceb1bd471 --- /dev/null +++ b/solr/licenses/biz.aQute.bnd.annotation-7.1.0.jar.sha1 @@ -0,0 +1 @@ +2f2be18c936d08cf46ea6cfa0043f34afdf38705 diff --git a/solr/licenses/boilerpipe-1.1.0.jar.sha1 b/solr/licenses/boilerpipe-1.1.0.jar.sha1 deleted file mode 100644 index 8891306099ec..000000000000 --- a/solr/licenses/boilerpipe-1.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f62cb75ed52455a9e68d1d05b84c500673340eb2 diff --git a/solr/licenses/bzip2-0.9.1.jar.sha1 b/solr/licenses/bzip2-0.9.1.jar.sha1 deleted file mode 100644 index 702b4f4b2c5d..000000000000 --- a/solr/licenses/bzip2-0.9.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -47ca95f71e3ccae756c4a24354d48069c58f475c diff --git a/solr/licenses/c3p0-0.9.5.5.jar.sha1 b/solr/licenses/c3p0-0.9.5.5.jar.sha1 deleted file mode 100644 index 0e8953f7fde7..000000000000 --- a/solr/licenses/c3p0-0.9.5.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -37dfc3021e5589d65ff2ae0becf811510b87ab01 diff --git a/solr/licenses/cdm-4.5.5.jar.sha1 b/solr/licenses/cdm-4.5.5.jar.sha1 deleted file mode 100644 index eb0744ff30ed..000000000000 --- a/solr/licenses/cdm-4.5.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -af1748a3d024069cb7fd3fc2591efe806c914589 diff --git a/solr/licenses/commons-compress-1.26.1.jar.sha1 b/solr/licenses/commons-compress-1.26.1.jar.sha1 deleted file mode 100644 index 6a8ed034e35f..000000000000 --- a/solr/licenses/commons-compress-1.26.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -44331c1130c370e726a2e1a3e6fba6d2558ef04a diff --git a/solr/licenses/commons-compress-1.27.1.jar.sha1 b/solr/licenses/commons-compress-1.27.1.jar.sha1 new file mode 100644 index 000000000000..f68a8f44c791 --- /dev/null +++ b/solr/licenses/commons-compress-1.27.1.jar.sha1 @@ -0,0 +1 @@ +a19151084758e2fbb6b41eddaa88e7b8ff4e6599 diff --git a/solr/licenses/commons-csv-1.14.0.jar.sha1 b/solr/licenses/commons-csv-1.14.0.jar.sha1 new file mode 100644 index 000000000000..2695af775a2e --- /dev/null +++ b/solr/licenses/commons-csv-1.14.0.jar.sha1 @@ -0,0 +1 @@ +c7cc057084126ea93617b2b809abf82432d8f9f5 diff --git a/solr/licenses/commons-csv-1.9.0.jar.sha1 b/solr/licenses/commons-csv-1.9.0.jar.sha1 deleted file mode 100644 index ccb2c86d2b92..000000000000 --- a/solr/licenses/commons-csv-1.9.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b59d8f64cd0b83ee1c04ff1748de2504457018c1 diff --git a/solr/licenses/commons-io-2.19.0.jar.sha1 b/solr/licenses/commons-io-2.19.0.jar.sha1 new file mode 100644 index 000000000000..d91b69574ed0 --- /dev/null +++ b/solr/licenses/commons-io-2.19.0.jar.sha1 @@ -0,0 +1 @@ +1f8d4a99ba72b77aa69101175efc79b0c7dcdd7e diff --git a/solr/licenses/curvesapi-1.07.jar.sha1 b/solr/licenses/curvesapi-1.07.jar.sha1 deleted file mode 100644 index 986ca00b3fb3..000000000000 --- a/solr/licenses/curvesapi-1.07.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -863654849995f9d4f0ed2ed1a3870da3a108473c diff --git a/solr/licenses/curvesapi-1.08.jar.sha1 b/solr/licenses/curvesapi-1.08.jar.sha1 new file mode 100644 index 000000000000..fbd72d5a3ec9 --- /dev/null +++ b/solr/licenses/curvesapi-1.08.jar.sha1 @@ -0,0 +1 @@ +3d3d36568154059825089b289dcfca481fe44e2c diff --git a/solr/licenses/dd-plist-1.24.jar.sha1 b/solr/licenses/dd-plist-1.24.jar.sha1 deleted file mode 100644 index 2f063a51dc4d..000000000000 --- a/solr/licenses/dd-plist-1.24.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3b4a32e0837359c06daf1f188cf849238ae2ed82 diff --git a/solr/licenses/dd-plist-1.28.jar.sha1 b/solr/licenses/dd-plist-1.28.jar.sha1 new file mode 100644 index 000000000000..78ace8a91878 --- /dev/null +++ b/solr/licenses/dd-plist-1.28.jar.sha1 @@ -0,0 +1 @@ +617d08cc6e9c800e4b77266087cc9294b6d87e11 diff --git a/solr/licenses/ehcache-core-2.6.2.jar.sha1 b/solr/licenses/ehcache-core-2.6.2.jar.sha1 deleted file mode 100644 index 4eb0ff6ed2ea..000000000000 --- a/solr/licenses/ehcache-core-2.6.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3baecd92015a9f8fe4cf51c8b5d3a5bddcdd3e86 diff --git a/solr/licenses/fontbox-2.0.26.jar.sha1 b/solr/licenses/fontbox-2.0.26.jar.sha1 deleted file mode 100644 index 6bb26c582c20..000000000000 --- a/solr/licenses/fontbox-2.0.26.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4e416198adde54b753e41d3312f799640dac5687 diff --git a/solr/licenses/fontbox-2.0.34.jar.sha1 b/solr/licenses/fontbox-2.0.34.jar.sha1 new file mode 100644 index 000000000000..dfe70b1bfec1 --- /dev/null +++ b/solr/licenses/fontbox-2.0.34.jar.sha1 @@ -0,0 +1 @@ +8be3275e863ccac56cb21511d5135c10aedae621 diff --git a/solr/licenses/geoapi-3.0.1.jar.sha1 b/solr/licenses/geoapi-3.0.1.jar.sha1 deleted file mode 100644 index 3e90496a6726..000000000000 --- a/solr/licenses/geoapi-3.0.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a69b261841b0794b82b8d42fcd6e9a370eb62809 diff --git a/solr/licenses/grib-4.5.5.jar.sha1 b/solr/licenses/grib-4.5.5.jar.sha1 deleted file mode 100644 index 7a40e0172ec3..000000000000 --- a/solr/licenses/grib-4.5.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cfe552910e9a8d57ce71134796abb281a74ead16 diff --git a/solr/licenses/httpservices-4.5.5.jar.sha1 b/solr/licenses/httpservices-4.5.5.jar.sha1 deleted file mode 100644 index da1e4fd2be6f..000000000000 --- a/solr/licenses/httpservices-4.5.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ee5f217be599e5e03f7f0e55e03f9e721a154f62 diff --git a/solr/licenses/isoparser-1.9.41.7.jar.sha1 b/solr/licenses/isoparser-1.9.41.7.jar.sha1 deleted file mode 100644 index 22a66e4d21a6..000000000000 --- a/solr/licenses/isoparser-1.9.41.7.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -97c87c0ab2c435e16380e6377bbe0c819f7eb9a1 diff --git a/solr/licenses/jackcess-4.0.2.jar.sha1 b/solr/licenses/jackcess-4.0.2.jar.sha1 deleted file mode 100644 index e449a734055f..000000000000 --- a/solr/licenses/jackcess-4.0.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1eb5a3a9a7c6fcf348aec33a18f0026315d4a7fa diff --git a/solr/licenses/jackcess-4.0.8.jar.sha1 b/solr/licenses/jackcess-4.0.8.jar.sha1 new file mode 100644 index 000000000000..d03ab81ba643 --- /dev/null +++ b/solr/licenses/jackcess-4.0.8.jar.sha1 @@ -0,0 +1 @@ +f5942e0c45233b7a521cdb3ae0253dfd658a46ab diff --git a/solr/licenses/jackcess-encrypt-4.0.1.jar.sha1 b/solr/licenses/jackcess-encrypt-4.0.1.jar.sha1 deleted file mode 100644 index 5859aa4bde52..000000000000 --- a/solr/licenses/jackcess-encrypt-4.0.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2fbb076c291767197b5b8202bfebdcd4b4a7199e diff --git a/solr/licenses/jackcess-encrypt-4.0.3.jar.sha1 b/solr/licenses/jackcess-encrypt-4.0.3.jar.sha1 new file mode 100644 index 000000000000..ba9de8481aeb --- /dev/null +++ b/solr/licenses/jackcess-encrypt-4.0.3.jar.sha1 @@ -0,0 +1 @@ +23ed17cb81b0a6ef37371a483df850885d8414a4 diff --git a/solr/licenses/jakarta.activation-api-1.2.2.jar.sha1 b/solr/licenses/jakarta.activation-api-1.2.2.jar.sha1 deleted file mode 100644 index f243d2ef492f..000000000000 --- a/solr/licenses/jakarta.activation-api-1.2.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -99f53adba383cb1bf7c3862844488574b559621f diff --git a/solr/licenses/jcommander-1.82.jar.sha1 b/solr/licenses/jcommander-1.82.jar.sha1 deleted file mode 100644 index 4c0eb66091c4..000000000000 --- a/solr/licenses/jcommander-1.82.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0a7c5fef184d238065de38f81bbc6ee50cca2e21 diff --git a/solr/licenses/jempbox-1.8.16.jar.sha1 b/solr/licenses/jempbox-1.8.16.jar.sha1 deleted file mode 100644 index 9f6f793c44a5..000000000000 --- a/solr/licenses/jempbox-1.8.16.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1f41de81768ef84ca2d8cda4cb79e9272c8ee966 diff --git a/solr/licenses/jempbox-1.8.17.jar.sha1 b/solr/licenses/jempbox-1.8.17.jar.sha1 new file mode 100644 index 000000000000..43be085da9a5 --- /dev/null +++ b/solr/licenses/jempbox-1.8.17.jar.sha1 @@ -0,0 +1 @@ +388997fbd1b57f8e424c4447e3fc8ce5dd2fc665 diff --git a/solr/licenses/jna-5.12.1.jar.sha1 b/solr/licenses/jna-5.12.1.jar.sha1 deleted file mode 100644 index 648c9d576db7..000000000000 --- a/solr/licenses/jna-5.12.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b1e93a735caea94f503e95e6fe79bf9cdc1e985d diff --git a/solr/licenses/juniversalchardet-1.0.3.jar.sha1 b/solr/licenses/juniversalchardet-1.0.3.jar.sha1 deleted file mode 100644 index 6b06952678fb..000000000000 --- a/solr/licenses/juniversalchardet-1.0.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cd49678784c46aa8789c060538e0154013bb421b diff --git a/solr/licenses/juniversalchardet-2.5.0.jar.sha1 b/solr/licenses/juniversalchardet-2.5.0.jar.sha1 new file mode 100644 index 000000000000..bbc83e9fe300 --- /dev/null +++ b/solr/licenses/juniversalchardet-2.5.0.jar.sha1 @@ -0,0 +1 @@ +423123a1ddfe458d07948bc09cfa0170037a9e3d diff --git a/solr/licenses/junrar-7.5.3.jar.sha1 b/solr/licenses/junrar-7.5.3.jar.sha1 deleted file mode 100644 index 4549d2a43e70..000000000000 --- a/solr/licenses/junrar-7.5.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ba487b90cda9dc551ed31f7100e2d420aa8d219b diff --git a/solr/licenses/junrar-7.5.5.jar.sha1 b/solr/licenses/junrar-7.5.5.jar.sha1 new file mode 100644 index 000000000000..caef94b95af8 --- /dev/null +++ b/solr/licenses/junrar-7.5.5.jar.sha1 @@ -0,0 +1 @@ +4b1300aa087b8c4e5e9bbb988e609bbaddfda283 diff --git a/solr/licenses/jwarc-0.31.1.jar.sha1 b/solr/licenses/jwarc-0.31.1.jar.sha1 new file mode 100644 index 000000000000..70e61b34744c --- /dev/null +++ b/solr/licenses/jwarc-0.31.1.jar.sha1 @@ -0,0 +1 @@ +8b74f9ffc6922bc6e9353c148e8d6b916fb13b8a diff --git a/solr/licenses/tika-parsers-LICENSE-ASL.txt b/solr/licenses/jwarc-LICENSE-ASL.txt similarity index 85% rename from solr/licenses/tika-parsers-LICENSE-ASL.txt rename to solr/licenses/jwarc-LICENSE-ASL.txt index 8ba51ef6fac5..8dada3edaf50 100644 --- a/solr/licenses/tika-parsers-LICENSE-ASL.txt +++ b/solr/licenses/jwarc-LICENSE-ASL.txt @@ -1,4 +1,3 @@ - Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -179,7 +178,7 @@ APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" + boilerplate notice, with the fields enclosed by brackets "{}" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -187,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright {yyyy} {name of copyright owner} Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -200,40 +199,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -APACHE TIKA SUBCOMPONENTS - -Apache Tika includes a number of subcomponents with separate copyright notices -and license terms. Your use of these subcomponents is subject to the terms and -conditions of the following licenses. - -Charset detection code from ICU4J (http://site.icu-project.org/) - - Copyright (c) 1995-2009 International Business Machines Corporation - and others - - All rights reserved. - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, and/or sell copies of the Software, and to permit persons - to whom the Software is furnished to do so, provided that the above - copyright notice(s) and this permission notice appear in all copies - of the Software and that both the above copyright notice(s) and this - permission notice appear in supporting documentation. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE - BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, - OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, - ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - SOFTWARE. - - Except as contained in this notice, the name of a copyright holder shall - not be used in advertising or otherwise to promote the sale, use or other - dealings in this Software without prior written authorization of the - copyright holder. diff --git a/solr/licenses/jwarc-NOTICE.txt b/solr/licenses/jwarc-NOTICE.txt new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/solr/licenses/log4j-1.2-api-2.21.0.jar.sha1 b/solr/licenses/log4j-1.2-api-2.21.0.jar.sha1 deleted file mode 100644 index 41761161aba3..000000000000 --- a/solr/licenses/log4j-1.2-api-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -12bad3819a9570807f3c97315930699584c12152 diff --git a/solr/licenses/log4j-1.2-api-2.25.1.jar.sha1 b/solr/licenses/log4j-1.2-api-2.25.1.jar.sha1 new file mode 100644 index 000000000000..e02159df02cb --- /dev/null +++ b/solr/licenses/log4j-1.2-api-2.25.1.jar.sha1 @@ -0,0 +1 @@ +08b3667ec8ee781429169b612b7ca6d6a30682b9 diff --git a/solr/licenses/log4j-api-2.21.0.jar.sha1 b/solr/licenses/log4j-api-2.21.0.jar.sha1 deleted file mode 100644 index 6a05a4e5cb05..000000000000 --- a/solr/licenses/log4j-api-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -760192f2b69eacf4a4afc78e5a1d7a8de054fcbd diff --git a/solr/licenses/log4j-api-2.25.1.jar.sha1 b/solr/licenses/log4j-api-2.25.1.jar.sha1 new file mode 100644 index 000000000000..c7b80497f69f --- /dev/null +++ b/solr/licenses/log4j-api-2.25.1.jar.sha1 @@ -0,0 +1 @@ +c7acbbd6f110cd1457c628da46245e355b1ee57a diff --git a/solr/licenses/log4j-core-2.21.0.jar.sha1 b/solr/licenses/log4j-core-2.21.0.jar.sha1 deleted file mode 100644 index 0a2615fc4780..000000000000 --- a/solr/licenses/log4j-core-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -122e1a9e0603cc9eae07b0846a6ff01f2454bc49 diff --git a/solr/licenses/log4j-core-2.25.1.jar.sha1 b/solr/licenses/log4j-core-2.25.1.jar.sha1 new file mode 100644 index 000000000000..62e0ed1e27d8 --- /dev/null +++ b/solr/licenses/log4j-core-2.25.1.jar.sha1 @@ -0,0 +1 @@ +32b3a228d5a30a4528b6c7354fe6cff9524d89e7 diff --git a/solr/licenses/log4j-layout-template-json-2.21.0.jar.sha1 b/solr/licenses/log4j-layout-template-json-2.21.0.jar.sha1 deleted file mode 100644 index f7ee63037a52..000000000000 --- a/solr/licenses/log4j-layout-template-json-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c90f410a98ddbbfe90b4ebe7f1e23526d72c0c96 diff --git a/solr/licenses/log4j-layout-template-json-2.25.1.jar.sha1 b/solr/licenses/log4j-layout-template-json-2.25.1.jar.sha1 new file mode 100644 index 000000000000..f10cc7248ebe --- /dev/null +++ b/solr/licenses/log4j-layout-template-json-2.25.1.jar.sha1 @@ -0,0 +1 @@ +263c54fd8f2bb69b4f4cd34667a1b95353c5d95b diff --git a/solr/licenses/log4j-slf4j2-impl-2.21.0.jar.sha1 b/solr/licenses/log4j-slf4j2-impl-2.21.0.jar.sha1 deleted file mode 100644 index f5d1f87d8f10..000000000000 --- a/solr/licenses/log4j-slf4j2-impl-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -070c38c479f4c495cab11da8396348eebffefcb2 diff --git a/solr/licenses/log4j-slf4j2-impl-2.25.1.jar.sha1 b/solr/licenses/log4j-slf4j2-impl-2.25.1.jar.sha1 new file mode 100644 index 000000000000..fa1ab8b985f2 --- /dev/null +++ b/solr/licenses/log4j-slf4j2-impl-2.25.1.jar.sha1 @@ -0,0 +1 @@ +a5ed4c3e2effa2575a4dde13f9101bfe23ccfb1a diff --git a/solr/licenses/log4j-web-2.21.0.jar.sha1 b/solr/licenses/log4j-web-2.21.0.jar.sha1 deleted file mode 100644 index f2ae414b1ed0..000000000000 --- a/solr/licenses/log4j-web-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5b6f3db6a2b00b033ec2c9ca8eabb08a00728df2 diff --git a/solr/licenses/log4j-web-2.25.1.jar.sha1 b/solr/licenses/log4j-web-2.25.1.jar.sha1 new file mode 100644 index 000000000000..3e97484b9e6a --- /dev/null +++ b/solr/licenses/log4j-web-2.25.1.jar.sha1 @@ -0,0 +1 @@ +dce89bd45afd0259f56dfc825c41a26c4d1f9c5c diff --git a/solr/licenses/mchange-commons-java-0.2.19.jar.sha1 b/solr/licenses/mchange-commons-java-0.2.19.jar.sha1 deleted file mode 100644 index 7fb10e559990..000000000000 --- a/solr/licenses/mchange-commons-java-0.2.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7a4bee38ea02bd7dee776869b19fb3f6861d6acf diff --git a/solr/licenses/metadata-extractor-2.17.1.0.jar.sha1 b/solr/licenses/metadata-extractor-2.17.1.0.jar.sha1 deleted file mode 100644 index fd8c3f291b5a..000000000000 --- a/solr/licenses/metadata-extractor-2.17.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -62401276745fc186ea44e94fcd54502fce2e22f6 diff --git a/solr/licenses/metadata-extractor-2.19.0.jar.sha1 b/solr/licenses/metadata-extractor-2.19.0.jar.sha1 new file mode 100644 index 000000000000..f957c69a7fee --- /dev/null +++ b/solr/licenses/metadata-extractor-2.19.0.jar.sha1 @@ -0,0 +1 @@ +4d3ab42dd9965b8f2b8bd1b7572e028d6f90a34f diff --git a/solr/licenses/netcdf4-4.5.5.jar.sha1 b/solr/licenses/netcdf4-4.5.5.jar.sha1 deleted file mode 100644 index fdc5680f8563..000000000000 --- a/solr/licenses/netcdf4-4.5.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0675d63ecc857c50dd50858011b670160aa30b62 diff --git a/solr/licenses/openjson-1.0.12.jar.sha1 b/solr/licenses/openjson-1.0.12.jar.sha1 deleted file mode 100644 index c113e6aeec34..000000000000 --- a/solr/licenses/openjson-1.0.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9c0663c10b48a889709a2d125580a3f22b975769 diff --git a/solr/licenses/org.osgi.annotation.bundle-2.0.0.jar.sha1 b/solr/licenses/org.osgi.annotation.bundle-2.0.0.jar.sha1 new file mode 100644 index 000000000000..cf2ff8d99b89 --- /dev/null +++ b/solr/licenses/org.osgi.annotation.bundle-2.0.0.jar.sha1 @@ -0,0 +1 @@ +f5c2cd6e670c3c5d440d3003efd5ef2ead5c68eb diff --git a/solr/licenses/org.osgi.annotation.bundle-LICENSE-ASL.txt b/solr/licenses/org.osgi.annotation.bundle-LICENSE-ASL.txt new file mode 100644 index 000000000000..8dada3edaf50 --- /dev/null +++ b/solr/licenses/org.osgi.annotation.bundle-LICENSE-ASL.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/solr/licenses/org.osgi.annotation.bundle-NOTICE.txt b/solr/licenses/org.osgi.annotation.bundle-NOTICE.txt new file mode 100644 index 000000000000..0dddb2913083 --- /dev/null +++ b/solr/licenses/org.osgi.annotation.bundle-NOTICE.txt @@ -0,0 +1,46 @@ +# Notices for osgi + +This content is produced and maintained by the OSGi Specification Project. + + * Project home: https://projects.eclipse.org/projects/technology.osgi + +## Trademarks + +OSGi and the OSGi Logo are trademarks of the Eclipse Foundation. Eclipse and +the Eclipse Logo are registered trademarks of the Eclipse Foundation. + +## Copyright + +All content is the property of the respective authors or their employers. +For more information regarding authorship of content, please consult the +listed source code repository logs. + +## Declared Project Licenses + +This program and the accompanying materials are made available under the terms +of the Apache License, Version 2.0 which is available at +http://www.apache.org/licenses/LICENSE-2.0 + +SPDX-License-Identifier: Apache-2.0 + +## Source Code + +The project maintains the following source code repositories: + + * https://github.com/osgi/osgi.git + +## Third-party Content + +The Content may include items that have been sourced from third parties as follows:

+ +JUnit + + * License: CPL-1.0 (JUnit 3), EPL-1.0 (JUnit 4), EPL-2.0 (JUnit 5) + * Project: https://junit.org/ + * Source: https://github.com/junit-team + +Apache Software Foundation + + * License: Apache-2.0 + * Project: https://apache.org/ + * Source: https://github.com/apache/ diff --git a/solr/licenses/org.osgi.annotation.versioning-1.1.2.jar.sha1 b/solr/licenses/org.osgi.annotation.versioning-1.1.2.jar.sha1 new file mode 100644 index 000000000000..6bcb6a4c3ca3 --- /dev/null +++ b/solr/licenses/org.osgi.annotation.versioning-1.1.2.jar.sha1 @@ -0,0 +1 @@ +dc3cd4ec96c0b3c5459fe00694bd73a816ecf93e diff --git a/solr/licenses/org.osgi.annotation.versioning-LICENSE-ASL.txt b/solr/licenses/org.osgi.annotation.versioning-LICENSE-ASL.txt new file mode 100644 index 000000000000..8dada3edaf50 --- /dev/null +++ b/solr/licenses/org.osgi.annotation.versioning-LICENSE-ASL.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/solr/licenses/org.osgi.annotation.versioning-NOTICE.txt b/solr/licenses/org.osgi.annotation.versioning-NOTICE.txt new file mode 100644 index 000000000000..0dddb2913083 --- /dev/null +++ b/solr/licenses/org.osgi.annotation.versioning-NOTICE.txt @@ -0,0 +1,46 @@ +# Notices for osgi + +This content is produced and maintained by the OSGi Specification Project. + + * Project home: https://projects.eclipse.org/projects/technology.osgi + +## Trademarks + +OSGi and the OSGi Logo are trademarks of the Eclipse Foundation. Eclipse and +the Eclipse Logo are registered trademarks of the Eclipse Foundation. + +## Copyright + +All content is the property of the respective authors or their employers. +For more information regarding authorship of content, please consult the +listed source code repository logs. + +## Declared Project Licenses + +This program and the accompanying materials are made available under the terms +of the Apache License, Version 2.0 which is available at +http://www.apache.org/licenses/LICENSE-2.0 + +SPDX-License-Identifier: Apache-2.0 + +## Source Code + +The project maintains the following source code repositories: + + * https://github.com/osgi/osgi.git + +## Third-party Content + +The Content may include items that have been sourced from third parties as follows:

+ +JUnit + + * License: CPL-1.0 (JUnit 3), EPL-1.0 (JUnit 4), EPL-2.0 (JUnit 5) + * Project: https://junit.org/ + * Source: https://github.com/junit-team + +Apache Software Foundation + + * License: Apache-2.0 + * Project: https://apache.org/ + * Source: https://github.com/apache/ diff --git a/solr/licenses/pdfbox-2.0.26.jar.sha1 b/solr/licenses/pdfbox-2.0.26.jar.sha1 deleted file mode 100644 index 13f322ae96fb..000000000000 --- a/solr/licenses/pdfbox-2.0.26.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -67b85a6aea4a1c846448e3513161d6c260d6e0d9 diff --git a/solr/licenses/pdfbox-2.0.34.jar.sha1 b/solr/licenses/pdfbox-2.0.34.jar.sha1 new file mode 100644 index 000000000000..096dd8837165 --- /dev/null +++ b/solr/licenses/pdfbox-2.0.34.jar.sha1 @@ -0,0 +1 @@ +b281d4339844e7614e425e84c2570687b18dc4ba diff --git a/solr/licenses/pdfbox-tools-2.0.26.jar.sha1 b/solr/licenses/pdfbox-tools-2.0.26.jar.sha1 deleted file mode 100644 index 32f7c336b0ff..000000000000 --- a/solr/licenses/pdfbox-tools-2.0.26.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c8a812df7d025dd39c84bd88500a3ad2c2fca8f3 diff --git a/solr/licenses/pdfbox-tools-2.0.34.jar.sha1 b/solr/licenses/pdfbox-tools-2.0.34.jar.sha1 new file mode 100644 index 000000000000..b2ddcce9e8d4 --- /dev/null +++ b/solr/licenses/pdfbox-tools-2.0.34.jar.sha1 @@ -0,0 +1 @@ +ddc7e88c9add7ed5b123a5f07f9968110f5b3174 diff --git a/solr/licenses/poi-5.2.2.jar.sha1 b/solr/licenses/poi-5.2.2.jar.sha1 deleted file mode 100644 index 6f1dfdc50269..000000000000 --- a/solr/licenses/poi-5.2.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5513d31545085c33809c4b6553c2009fd19a6016 diff --git a/solr/licenses/poi-5.4.1.jar.sha1 b/solr/licenses/poi-5.4.1.jar.sha1 new file mode 100644 index 000000000000..817e65fd714a --- /dev/null +++ b/solr/licenses/poi-5.4.1.jar.sha1 @@ -0,0 +1 @@ +e4c74c59e13f62d8edd215756d14ce55566c6efe diff --git a/solr/licenses/poi-ooxml-5.2.2.jar.sha1 b/solr/licenses/poi-ooxml-5.2.2.jar.sha1 deleted file mode 100644 index ed9d49f18714..000000000000 --- a/solr/licenses/poi-ooxml-5.2.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a201b5bdc92c0fae4bed4b8e5546388c4c2f9eb0 diff --git a/solr/licenses/poi-ooxml-5.4.1.jar.sha1 b/solr/licenses/poi-ooxml-5.4.1.jar.sha1 new file mode 100644 index 000000000000..3473b17c8742 --- /dev/null +++ b/solr/licenses/poi-ooxml-5.4.1.jar.sha1 @@ -0,0 +1 @@ +508ed3e7fcc775738415870d0bc6d27196317fe3 diff --git a/solr/licenses/poi-ooxml-lite-5.2.2.jar.sha1 b/solr/licenses/poi-ooxml-lite-5.2.2.jar.sha1 deleted file mode 100644 index 0d2c9578c373..000000000000 --- a/solr/licenses/poi-ooxml-lite-5.2.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5df31b69375131fc2163a5557093cb112be90ce1 diff --git a/solr/licenses/poi-ooxml-lite-5.4.1.jar.sha1 b/solr/licenses/poi-ooxml-lite-5.4.1.jar.sha1 new file mode 100644 index 000000000000..bb559e80fa20 --- /dev/null +++ b/solr/licenses/poi-ooxml-lite-5.4.1.jar.sha1 @@ -0,0 +1 @@ +0ed2246f88254ba40fc2e7999c8f8e4e9031208a diff --git a/solr/licenses/poi-scratchpad-5.2.2.jar.sha1 b/solr/licenses/poi-scratchpad-5.2.2.jar.sha1 deleted file mode 100644 index f413092ab200..000000000000 --- a/solr/licenses/poi-scratchpad-5.2.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8c5cd5f1b3e7b3656ab983b73bbbf8bf5f14f793 diff --git a/solr/licenses/poi-scratchpad-5.4.1.jar.sha1 b/solr/licenses/poi-scratchpad-5.4.1.jar.sha1 new file mode 100644 index 000000000000..f64b627ca191 --- /dev/null +++ b/solr/licenses/poi-scratchpad-5.4.1.jar.sha1 @@ -0,0 +1 @@ +ba43fb23ab262865b349d58d6ef1218755eef228 diff --git a/solr/licenses/preflight-2.0.26.jar.sha1 b/solr/licenses/preflight-2.0.26.jar.sha1 deleted file mode 100644 index 1f0b8ea4bf22..000000000000 --- a/solr/licenses/preflight-2.0.26.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cb7c63b5bf0ad010d76cd56dbb4c136a096a78c7 diff --git a/solr/licenses/rome-1.18.0.jar.sha1 b/solr/licenses/rome-1.18.0.jar.sha1 deleted file mode 100644 index 2a2abf71125a..000000000000 --- a/solr/licenses/rome-1.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bdc2933175bb9d92b41e4ace771f645f524d75d3 diff --git a/solr/licenses/rome-2.1.0.jar.sha1 b/solr/licenses/rome-2.1.0.jar.sha1 new file mode 100644 index 000000000000..14befb8d8130 --- /dev/null +++ b/solr/licenses/rome-2.1.0.jar.sha1 @@ -0,0 +1 @@ +be1642a0d29daef84db51344151877161e22b07e diff --git a/solr/licenses/rome-utils-1.18.0.jar.sha1 b/solr/licenses/rome-utils-1.18.0.jar.sha1 deleted file mode 100644 index 0a3be5ca457f..000000000000 --- a/solr/licenses/rome-utils-1.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3dc676ae59ab0be7ccd2bd6d2214779b97eec7db diff --git a/solr/licenses/rome-utils-2.1.0.jar.sha1 b/solr/licenses/rome-utils-2.1.0.jar.sha1 new file mode 100644 index 000000000000..23cbfb958caf --- /dev/null +++ b/solr/licenses/rome-utils-2.1.0.jar.sha1 @@ -0,0 +1 @@ +970519368c1406108191ac19e6bf7939a9018df1 diff --git a/solr/licenses/sentiment-analysis-parser-0.1.jar.sha1 b/solr/licenses/sentiment-analysis-parser-0.1.jar.sha1 deleted file mode 100644 index 12f830e6c617..000000000000 --- a/solr/licenses/sentiment-analysis-parser-0.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -20d1524a1270c1d26e3314d2ee71a12e6a29a27d diff --git a/solr/licenses/sis-feature-1.2.jar.sha1 b/solr/licenses/sis-feature-1.2.jar.sha1 deleted file mode 100644 index 45f59c44f30e..000000000000 --- a/solr/licenses/sis-feature-1.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8450c2e644e68442835e73e52280e3ee02e1eeb3 diff --git a/solr/licenses/sis-metadata-1.2.jar.sha1 b/solr/licenses/sis-metadata-1.2.jar.sha1 deleted file mode 100644 index c7083b97423e..000000000000 --- a/solr/licenses/sis-metadata-1.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0061bf6428547d3c4d721df4a2855fe09b2452f5 diff --git a/solr/licenses/sis-netcdf-1.2.jar.sha1 b/solr/licenses/sis-netcdf-1.2.jar.sha1 deleted file mode 100644 index e9c8e3c0d9f2..000000000000 --- a/solr/licenses/sis-netcdf-1.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ebddba8b6f4d120dda1f994fa0291d5bede0b4c5 diff --git a/solr/licenses/sis-referencing-1.2.jar.sha1 b/solr/licenses/sis-referencing-1.2.jar.sha1 deleted file mode 100644 index e135c29433c3..000000000000 --- a/solr/licenses/sis-referencing-1.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ef855fe6d91b6f30cb4da753c6506926b8d19164 diff --git a/solr/licenses/sis-storage-1.2.jar.sha1 b/solr/licenses/sis-storage-1.2.jar.sha1 deleted file mode 100644 index be9e1d54724b..000000000000 --- a/solr/licenses/sis-storage-1.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -68a072b6bef666ea82c080beaf25a70c6eb7b684 diff --git a/solr/licenses/sis-utility-1.2.jar.sha1 b/solr/licenses/sis-utility-1.2.jar.sha1 deleted file mode 100644 index 6c5522d729e1..000000000000 --- a/solr/licenses/sis-utility-1.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b733c53021023a05a3aea756a53f0abdbb88ceef diff --git a/solr/licenses/spotbugs-annotations-4.9.4.jar.sha1 b/solr/licenses/spotbugs-annotations-4.9.4.jar.sha1 new file mode 100644 index 000000000000..2ae5ce9496a6 --- /dev/null +++ b/solr/licenses/spotbugs-annotations-4.9.4.jar.sha1 @@ -0,0 +1 @@ +071d1be50e7c79317f2cb599b1da571dc5fcd8bf diff --git a/solr/licenses/spotbugs-annotations-LICENSE-ASL.txt b/solr/licenses/spotbugs-annotations-LICENSE-ASL.txt new file mode 100644 index 000000000000..19e307187ac8 --- /dev/null +++ b/solr/licenses/spotbugs-annotations-LICENSE-ASL.txt @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +(This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.) + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + {description} + Copyright (C) {year} {fullname} + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random + Hacker. + + {signature of Ty Coon}, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/solr/licenses/spotbugs-annotations-NOTICE.txt b/solr/licenses/spotbugs-annotations-NOTICE.txt new file mode 100644 index 000000000000..19e307187ac8 --- /dev/null +++ b/solr/licenses/spotbugs-annotations-NOTICE.txt @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +(This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.) + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + {description} + Copyright (C) {year} {fullname} + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random + Hacker. + + {signature of Ty Coon}, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/solr/licenses/tika-core-LICENSE-ASL.txt b/solr/licenses/tika-LICENSE-ASL.txt similarity index 100% rename from solr/licenses/tika-core-LICENSE-ASL.txt rename to solr/licenses/tika-LICENSE-ASL.txt diff --git a/solr/licenses/tika-core-NOTICE.txt b/solr/licenses/tika-NOTICE.txt similarity index 100% rename from solr/licenses/tika-core-NOTICE.txt rename to solr/licenses/tika-NOTICE.txt diff --git a/solr/licenses/tika-core-1.28.5.jar.sha1 b/solr/licenses/tika-core-1.28.5.jar.sha1 deleted file mode 100644 index 2085aeed4299..000000000000 --- a/solr/licenses/tika-core-1.28.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -eb7c7d4b2e159e03dca986c41b79dfb2ed82005b diff --git a/solr/licenses/tika-core-2.9.4.jar.sha1 b/solr/licenses/tika-core-2.9.4.jar.sha1 new file mode 100644 index 000000000000..c595971dd969 --- /dev/null +++ b/solr/licenses/tika-core-2.9.4.jar.sha1 @@ -0,0 +1 @@ +4bdd0defbd302b3cf93eadede429cac06d278639 diff --git a/solr/licenses/tika-parser-apple-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-apple-module-2.9.4.jar.sha1 new file mode 100644 index 000000000000..ca1d9d16350a --- /dev/null +++ b/solr/licenses/tika-parser-apple-module-2.9.4.jar.sha1 @@ -0,0 +1 @@ +cdf8b2045baf159dcb62f30a7e9236ad1096cd3b diff --git a/solr/licenses/tika-parser-audiovideo-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-audiovideo-module-2.9.4.jar.sha1 new file mode 100644 index 000000000000..d27fd837aa29 --- /dev/null +++ b/solr/licenses/tika-parser-audiovideo-module-2.9.4.jar.sha1 @@ -0,0 +1 @@ +6a1e110f80d105cc539b07aa497905e6ada07ed2 diff --git a/solr/licenses/tika-parser-cad-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-cad-module-2.9.4.jar.sha1 new file mode 100644 index 000000000000..21250a92413f --- /dev/null +++ b/solr/licenses/tika-parser-cad-module-2.9.4.jar.sha1 @@ -0,0 +1 @@ +9adaf41d1695629f28e127240a5488009f6319c5 diff --git a/solr/licenses/tika-parser-code-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-code-module-2.9.4.jar.sha1 new file mode 100644 index 000000000000..4695bbea1167 --- /dev/null +++ b/solr/licenses/tika-parser-code-module-2.9.4.jar.sha1 @@ -0,0 +1 @@ +9ead684d29df6da371184ed7cec855449ce5d70e diff --git a/solr/licenses/tika-parser-crypto-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-crypto-module-2.9.4.jar.sha1 new file mode 100644 index 000000000000..1cc3362fce15 --- /dev/null +++ b/solr/licenses/tika-parser-crypto-module-2.9.4.jar.sha1 @@ -0,0 +1 @@ +8d5861e6e00108ff69434c17ef8a1c0232f52c50 diff --git a/solr/licenses/tika-parser-digest-commons-2.9.4.jar.sha1 b/solr/licenses/tika-parser-digest-commons-2.9.4.jar.sha1 new file mode 100644 index 000000000000..b147e973907b --- /dev/null +++ b/solr/licenses/tika-parser-digest-commons-2.9.4.jar.sha1 @@ -0,0 +1 @@ +21ddd181b559b2734eb25c4e7a3132ae66c6c8af diff --git a/solr/licenses/tika-parser-font-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-font-module-2.9.4.jar.sha1 new file mode 100644 index 000000000000..ba6566955e46 --- /dev/null +++ b/solr/licenses/tika-parser-font-module-2.9.4.jar.sha1 @@ -0,0 +1 @@ +ded1c7fd14319a7c4162b556d0f70cc14b01200c diff --git a/solr/licenses/tika-parser-html-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-html-module-2.9.4.jar.sha1 new file mode 100644 index 000000000000..8862579db378 --- /dev/null +++ b/solr/licenses/tika-parser-html-module-2.9.4.jar.sha1 @@ -0,0 +1 @@ +d01f8d79ae2551be1c65c8e1e0d92e1b4799e0f3 diff --git a/solr/licenses/tika-parser-image-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-image-module-2.9.4.jar.sha1 new file mode 100644 index 000000000000..ac0cee163a30 --- /dev/null +++ b/solr/licenses/tika-parser-image-module-2.9.4.jar.sha1 @@ -0,0 +1 @@ +42c0b629b65cf585a3b386539f365935fe5a0879 diff --git a/solr/licenses/tika-parser-mail-commons-2.9.4.jar.sha1 b/solr/licenses/tika-parser-mail-commons-2.9.4.jar.sha1 new file mode 100644 index 000000000000..fc7a7ef28e3c --- /dev/null +++ b/solr/licenses/tika-parser-mail-commons-2.9.4.jar.sha1 @@ -0,0 +1 @@ +eabea7eecc857872990fd298244a60ead586cb49 diff --git a/solr/licenses/tika-parser-mail-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-mail-module-2.9.4.jar.sha1 new file mode 100644 index 000000000000..5cbb75f7d893 --- /dev/null +++ b/solr/licenses/tika-parser-mail-module-2.9.4.jar.sha1 @@ -0,0 +1 @@ +aaef1b39b1b76d99f254bc1e13b937b3ba0e59cf diff --git a/solr/licenses/tika-parser-microsoft-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-microsoft-module-2.9.4.jar.sha1 new file mode 100644 index 000000000000..77a1c7dc5be0 --- /dev/null +++ b/solr/licenses/tika-parser-microsoft-module-2.9.4.jar.sha1 @@ -0,0 +1 @@ +818f3baee8765400c5836c36b66e1b6ba38875d5 diff --git a/solr/licenses/tika-parser-miscoffice-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-miscoffice-module-2.9.4.jar.sha1 new file mode 100644 index 000000000000..b1a482a213be --- /dev/null +++ b/solr/licenses/tika-parser-miscoffice-module-2.9.4.jar.sha1 @@ -0,0 +1 @@ +3ad33d6a4530f75f27fd014f5f841de01d8aa4af diff --git a/solr/licenses/tika-parser-news-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-news-module-2.9.4.jar.sha1 new file mode 100644 index 000000000000..ab4cc3454fca --- /dev/null +++ b/solr/licenses/tika-parser-news-module-2.9.4.jar.sha1 @@ -0,0 +1 @@ +82d8f899ba997c65faa4ad92c7921aaa4d43d004 diff --git a/solr/licenses/tika-parser-ocr-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-ocr-module-2.9.4.jar.sha1 new file mode 100644 index 000000000000..9275f2b05a3f --- /dev/null +++ b/solr/licenses/tika-parser-ocr-module-2.9.4.jar.sha1 @@ -0,0 +1 @@ +4f48fee50698b5820e222363654fc27e23b1ce7a diff --git a/solr/licenses/tika-parser-pdf-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-pdf-module-2.9.4.jar.sha1 new file mode 100644 index 000000000000..d639e0009839 --- /dev/null +++ b/solr/licenses/tika-parser-pdf-module-2.9.4.jar.sha1 @@ -0,0 +1 @@ +50a6c3835aab4789721e81912cd84ca309ea1640 diff --git a/solr/licenses/tika-parser-pkg-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-pkg-module-2.9.4.jar.sha1 new file mode 100644 index 000000000000..660aee35ca76 --- /dev/null +++ b/solr/licenses/tika-parser-pkg-module-2.9.4.jar.sha1 @@ -0,0 +1 @@ +0758b28eef96817bcbb6aff506db70c7959f41bc diff --git a/solr/licenses/tika-parser-text-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-text-module-2.9.4.jar.sha1 new file mode 100644 index 000000000000..f2d43d69d771 --- /dev/null +++ b/solr/licenses/tika-parser-text-module-2.9.4.jar.sha1 @@ -0,0 +1 @@ +1e3e434dfb14809025c8447001a06d6f2b8ecab7 diff --git a/solr/licenses/tika-parser-webarchive-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-webarchive-module-2.9.4.jar.sha1 new file mode 100644 index 000000000000..07a897cc401b --- /dev/null +++ b/solr/licenses/tika-parser-webarchive-module-2.9.4.jar.sha1 @@ -0,0 +1 @@ +7243dafc296eab4d24a69395c6340975a141ebb7 diff --git a/solr/licenses/tika-parser-xml-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-xml-module-2.9.4.jar.sha1 new file mode 100644 index 000000000000..c22cd24b701a --- /dev/null +++ b/solr/licenses/tika-parser-xml-module-2.9.4.jar.sha1 @@ -0,0 +1 @@ +785786bf9f0e161868ed0ca35d4d68e774de7c94 diff --git a/solr/licenses/tika-parser-xmp-commons-2.9.4.jar.sha1 b/solr/licenses/tika-parser-xmp-commons-2.9.4.jar.sha1 new file mode 100644 index 000000000000..7534c7678f90 --- /dev/null +++ b/solr/licenses/tika-parser-xmp-commons-2.9.4.jar.sha1 @@ -0,0 +1 @@ +e250a0d48e8a15eea64e4cad2b090da72fb4035a diff --git a/solr/licenses/tika-parser-zip-commons-2.9.4.jar.sha1 b/solr/licenses/tika-parser-zip-commons-2.9.4.jar.sha1 new file mode 100644 index 000000000000..c360903139a4 --- /dev/null +++ b/solr/licenses/tika-parser-zip-commons-2.9.4.jar.sha1 @@ -0,0 +1 @@ +bacc10f4d5637cf9efe56d111ef74c8838368a79 diff --git a/solr/licenses/tika-parsers-1.28.5.jar.sha1 b/solr/licenses/tika-parsers-1.28.5.jar.sha1 deleted file mode 100644 index a1ddde323689..000000000000 --- a/solr/licenses/tika-parsers-1.28.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -19aec6d3994f23109f8836dabd56a6b3657f8de3 diff --git a/solr/licenses/tika-parsers-NOTICE.txt b/solr/licenses/tika-parsers-NOTICE.txt deleted file mode 100644 index e490b9ee4fef..000000000000 --- a/solr/licenses/tika-parsers-NOTICE.txt +++ /dev/null @@ -1,12 +0,0 @@ -Apache Tika parsers -Copyright 2015 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -Tika-server compoment uses CDDL-licensed dependencies: jersey (http://jersey.java.net/) and -Grizzly (http://grizzly.java.net/) - -OpenCSV: Copyright 2005 Bytecode Pty Ltd. Licensed under the Apache License, Version 2.0 - -IPTC Photo Metadata descriptions Copyright 2010 International Press Telecommunications Council. diff --git a/solr/licenses/tika-parsers-standard-package-2.9.4.jar.sha1 b/solr/licenses/tika-parsers-standard-package-2.9.4.jar.sha1 new file mode 100644 index 000000000000..132c2cc90302 --- /dev/null +++ b/solr/licenses/tika-parsers-standard-package-2.9.4.jar.sha1 @@ -0,0 +1 @@ +00351eee6dda0b75110a804412a1bb3023422faf diff --git a/solr/licenses/udunits-4.5.5.jar.sha1 b/solr/licenses/udunits-4.5.5.jar.sha1 deleted file mode 100644 index 7b097f25f45e..000000000000 --- a/solr/licenses/udunits-4.5.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d8c8d65ade13666eedcf764889c69321c247f153 diff --git a/solr/licenses/unit-api-1.0.jar.sha1 b/solr/licenses/unit-api-1.0.jar.sha1 deleted file mode 100644 index 164d8d725fae..000000000000 --- a/solr/licenses/unit-api-1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6b960260278588d7ff02fe376e5aad39a9c7440b diff --git a/solr/licenses/xmlbeans-5.0.3.jar.sha1 b/solr/licenses/xmlbeans-5.0.3.jar.sha1 deleted file mode 100644 index e0d684e8cc9c..000000000000 --- a/solr/licenses/xmlbeans-5.0.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e1ef1382ae9dfb2438b82b6dd575566355c2f30f diff --git a/solr/licenses/xmlbeans-5.3.0.jar.sha1 b/solr/licenses/xmlbeans-5.3.0.jar.sha1 new file mode 100644 index 000000000000..687be1c3a004 --- /dev/null +++ b/solr/licenses/xmlbeans-5.3.0.jar.sha1 @@ -0,0 +1 @@ +f93c3ba820d7240b7fec4ec5bc35e7223cc6fc1f diff --git a/solr/licenses/xmpbox-2.0.26.jar.sha1 b/solr/licenses/xmpbox-2.0.26.jar.sha1 deleted file mode 100644 index 8b0cebddf80a..000000000000 --- a/solr/licenses/xmpbox-2.0.26.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7ca4ee67fd06f822467daa08749ba3c2874cf44e diff --git a/solr/licenses/xmpbox-2.0.34.jar.sha1 b/solr/licenses/xmpbox-2.0.34.jar.sha1 new file mode 100644 index 000000000000..ffe43721f516 --- /dev/null +++ b/solr/licenses/xmpbox-2.0.34.jar.sha1 @@ -0,0 +1 @@ +58f9a6ff00cc4b46c590b7d234bce70637db12d4 diff --git a/solr/licenses/xmpcore-6.1.10.jar.sha1 b/solr/licenses/xmpcore-6.1.10.jar.sha1 deleted file mode 100644 index 7d5225eefd8d..000000000000 --- a/solr/licenses/xmpcore-6.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7703eea153ccf2f43b6962521c5ad67485cd5272 diff --git a/solr/licenses/xmpcore-6.1.11.jar.sha1 b/solr/licenses/xmpcore-6.1.11.jar.sha1 new file mode 100644 index 000000000000..937634fc4f26 --- /dev/null +++ b/solr/licenses/xmpcore-6.1.11.jar.sha1 @@ -0,0 +1 @@ +852f14101381e527e6d43339d7db1698c970436c diff --git a/solr/licenses/xmpcore-shaded-6.1.10.jar.sha1 b/solr/licenses/xmpcore-shaded-6.1.10.jar.sha1 deleted file mode 100644 index 3756deaf7e28..000000000000 --- a/solr/licenses/xmpcore-shaded-6.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4f3c0f614c5efc78661c1adb5922eccd47d99bcc diff --git a/solr/licenses/xz-1.10.jar.sha1 b/solr/licenses/xz-1.10.jar.sha1 new file mode 100644 index 000000000000..ab0285954fe1 --- /dev/null +++ b/solr/licenses/xz-1.10.jar.sha1 @@ -0,0 +1 @@ +1be8166f89e035a56c6bfc67dbc423996fe577e2 diff --git a/solr/licenses/xz-1.9.jar.sha1 b/solr/licenses/xz-1.9.jar.sha1 deleted file mode 100644 index 34f7f2b486ce..000000000000 --- a/solr/licenses/xz-1.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1ea4bec1a921180164852c65006d928617bd2caf diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile index 81cf82aa29a2..97dd5a9adbd3 100644 --- a/solr/modules/analysis-extras/gradle.lockfile +++ b/solr/modules/analysis-extras/gradle.lockfile @@ -80,12 +80,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.1=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-icu:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfile index d8f8da4550d4..8af164aa78c5 100644 --- a/solr/modules/clustering/gradle.lockfile +++ b/solr/modules/clustering/gradle.lockfile @@ -77,12 +77,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.1=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile index 3e84ff417433..ec5f3d42aba2 100644 --- a/solr/modules/cross-dc/gradle.lockfile +++ b/solr/modules/cross-dc/gradle.lockfile @@ -81,12 +81,12 @@ org.apache.httpcomponents:httpclient:4.5.14=apiHelper,jarValidation,runtimeClass org.apache.httpcomponents:httpcore:4.4.16=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.kafka:kafka-clients:3.9.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.1=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/extraction/build.gradle b/solr/modules/extraction/build.gradle index da6ebaccd68a..d9dd52e197dc 100644 --- a/solr/modules/extraction/build.gradle +++ b/solr/modules/extraction/build.gradle @@ -30,11 +30,13 @@ dependencies { implementation libs.apache.poi.poi implementation libs.apache.poi.ooxml implementation libs.apache.tika.core - implementation (libs.apache.tika.parsers, { + implementation (libs.apache.tika.parsers.standard.package, { exclude group: 'org.apache.cxf', module: 'cxf-rt-rs-client' exclude group: 'org.quartz-scheduler', module: 'quartz' exclude group: 'xml-apis', module: 'xml-apis' }) + permitUnusedDeclared libs.apache.tika.parsers.standard.package + implementation libs.apache.tika.parser.html.module implementation (libs.xerces.impl, { exclude group: 'xml-apis', module: 'xml-apis' }) diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile index 458aae19c399..688f514ff8bf 100644 --- a/solr/modules/extraction/gradle.lockfile +++ b/solr/modules/extraction/gradle.lockfile @@ -1,29 +1,34 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -com.adobe.xmp:xmpcore:6.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.beust:jcommander:1.82=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0=compileClasspath,testCompileClasspath +com.adobe.xmp:xmpcore:6.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.3=jarValidation,testCompileClasspath,testRuntimeClasspath com.carrotsearch:hppc:0.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -com.epam:parso:2.0.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.drewnoakes:metadata-extractor:2.19.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.epam:parso:2.0.14=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.19.0=permitUnusedDeclared com.fasterxml.jackson.core:jackson-annotations:2.20=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.19.0=permitUnusedDeclared com.fasterxml.jackson.core:jackson-core:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.19.0=permitUnusedDeclared com.fasterxml.jackson.core:jackson-databind:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.19.0=permitUnusedDeclared com.fasterxml.jackson:jackson-bom:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -com.fasterxml.woodstox:woodstox-core:7.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.github.albfernandez:juniversalchardet:2.5.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.2.2=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath -com.github.jai-imageio:jai-imageio-core:1.4.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.github.junrar:junrar:7.5.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.github.jai-imageio:jai-imageio-core:1.4.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.github.junrar:junrar:7.5.5=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor -com.github.openjson:openjson:1.0.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.github.virtuald:curvesapi:1.07=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.4=compileClasspath,testCompileClasspath +com.github.virtuald:curvesapi:1.08=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor -com.google.code.gson:gson:2.13.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor @@ -33,34 +38,27 @@ com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorp com.google.guava:guava:33.4.8-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.googlecode.json-simple:json-simple:1.1.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.googlecode.juniversalchardet:juniversalchardet:1.0.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.googlecode.plist:dd-plist:1.24=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.healthmarketscience.jackcess:jackcess-encrypt:4.0.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.healthmarketscience.jackcess:jackcess:4.0.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor +com.googlecode.plist:dd-plist:1.28=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.healthmarketscience.jackcess:jackcess-encrypt:4.0.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.healthmarketscience.jackcess:jackcess:4.0.8=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs -com.mchange:c3p0:0.9.5.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.mchange:mchange-commons-java:0.2.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.pff:java-libpst:0.9.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.rometools:rome-utils:1.18.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.rometools:rome:1.18.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.sun.activation:jakarta.activation:1.2.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -com.sun.istack:istack-commons-runtime:3.0.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.pff:java-libpst:0.9.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.rometools:rome-utils:2.1.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.rometools:rome:2.1.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.sun.activation:jakarta.activation:1.2.2=jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.sun.istack:istack-commons-runtime:3.0.12=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -com.zaxxer:SparseBitSet:1.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.zaxxer:SparseBitSet:1.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +commons-codec:commons-codec:1.18.0=permitUnusedDeclared commons-codec:commons-codec:1.19.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -de.l3s.boilerpipe:boilerpipe:1.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -edu.ucar:cdm:4.5.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -edu.ucar:grib:4.5.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -edu.ucar:httpservices:4.5.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -edu.ucar:netcdf4:4.5.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -edu.ucar:udunits:4.5.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -edu.usc.ir:sentiment-analysis-parser:0.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.17.0=solrPlatformLibs +commons-io:commons-io:2.18.0=permitUnusedDeclared +commons-io:commons-io:2.19.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +commons-logging:commons-logging:1.3.5=permitUnusedDeclared io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -88,40 +86,38 @@ io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeC io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -jakarta.activation:jakarta.activation-api:1.2.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor -javax.measure:unit-api:1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -joda-time:joda-time:2.14.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath -net.java.dev.jna:jna:5.12.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -net.sf.ehcache:ehcache-core:2.6.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.commons:commons-collections4:4.5.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.commons:commons-compress:1.26.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.commons:commons-csv:1.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-collections4:4.5.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-compress:1.27.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-csv:1.14.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-exec:1.4.0=permitUnusedDeclared org.apache.commons:commons-exec:1.5.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.17.0=permitUnusedDeclared org.apache.commons:commons-lang3:3.18.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.commons:commons-math3:3.6.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-math3:3.6.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath -org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.james:apache-mime4j-core:0.8.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.james:apache-mime4j-dom:0.8.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.james:apache-mime4j-core:0.8.12=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.james:apache-mime4j-dom:0.8.12=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-1.2-api:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.24.3=permitUnusedDeclared +org.apache.logging.log4j:log4j-api:2.25.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.1=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -144,38 +140,55 @@ org.apache.lucene:lucene-spatial-extras:10.2.1=jarValidation,runtimeClasspath,ru org.apache.lucene:lucene-spatial3d:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-suggest:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-test-framework:10.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath -org.apache.opennlp:opennlp-tools:2.5.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.pdfbox:fontbox:2.0.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.pdfbox:jbig2-imageio:3.0.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.pdfbox:jempbox:1.8.16=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.pdfbox:pdfbox-tools:2.0.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.pdfbox:pdfbox:2.0.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.pdfbox:preflight:2.0.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.pdfbox:xmpbox:2.0.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.poi:poi-ooxml-lite:5.2.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.poi:poi-ooxml:5.2.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.poi:poi-scratchpad:5.2.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.poi:poi:5.2.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.sis.core:sis-feature:1.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.sis.core:sis-metadata:1.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.sis.core:sis-referencing:1.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.sis.core:sis-utility:1.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.sis.storage:sis-netcdf:1.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.sis.storage:sis-storage:1.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-core:1.28.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parsers:1.28.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.xmlbeans:xmlbeans:5.0.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.pdfbox:fontbox:2.0.34=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.pdfbox:jbig2-imageio:3.0.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.pdfbox:jempbox:1.8.17=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.pdfbox:pdfbox-tools:2.0.34=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.pdfbox:pdfbox:2.0.34=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.pdfbox:xmpbox:2.0.34=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.poi:poi-ooxml-lite:5.4.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.poi:poi-ooxml:5.4.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.poi:poi-scratchpad:5.4.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.poi:poi:5.4.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-core:2.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-apple-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-audiovideo-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-cad-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-code-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-crypto-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-digest-commons:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-font-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-html-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-image-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-mail-commons:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-mail-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-microsoft-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-miscoffice-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-news-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-ocr-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-pdf-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-pkg-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-text-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-webarchive-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-xml-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-xmp-commons:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-zip-commons:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parsers-standard-package:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.xmlbeans:xmlbeans:5.3.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath -org.bouncycastle:bcmail-jdk15on:1.70=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.bouncycastle:bcpkix-jdk15on:1.70=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.bouncycastle:bcprov-jdk15on:1.70=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.bouncycastle:bcutil-jdk15on:1.70=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.brotli:dec:0.1.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.ccil.cowan.tagsoup:tagsoup:1.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.codehaus.woodstox:stax2-api:4.2.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.codelibs:jhighlight:1.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.bouncycastle:bcmail-jdk18on:1.80=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.bouncycastle:bcpkix-jdk18on:1.80=permitUnusedDeclared +org.bouncycastle:bcpkix-jdk18on:1.81=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.bouncycastle:bcprov-jdk18on:1.80=permitUnusedDeclared +org.bouncycastle:bcprov-jdk18on:1.81=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.bouncycastle:bcutil-jdk18on:1.80=permitUnusedDeclared +org.bouncycastle:bcutil-jdk18on:1.81=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.brotli:dec:0.1.2=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.ccil.cowan.tagsoup:tagsoup:1.2.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.codelibs:jhighlight:1.1.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty.http2:jetty-http2-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -195,14 +208,16 @@ org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,test org.eclipse.jetty:jetty-server:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.gagravarr:vorbis-java-core:0.8=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.gagravarr:vorbis-java-tika:0.8=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.gagravarr:vorbis-java-core:0.8=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.gagravarr:vorbis-java-tika:0.8=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-utils:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:1.0.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:2.3.6=permitUnusedDeclared org.glassfish.jaxb:jaxb-runtime:2.3.9=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:2.3.6=permitUnusedDeclared org.glassfish.jaxb:txw2:2.3.9=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -212,29 +227,30 @@ org.glassfish.jersey.ext:jersey-entity-filtering:3.1.11=jarValidation,runtimeCla org.glassfish.jersey.inject:jersey-hk2:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath -org.itadaki:bzip2:0.9.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.jdom:jdom2:2.0.6.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.jdom:jdom2:2.0.6.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.opengis:geoapi:3.0.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.netpreserve:jwarc:0.31.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath +org.osgi:org.osgi.annotation.bundle:2.0.0=compileClasspath,testCompileClasspath +org.osgi:org.osgi.annotation.versioning:1.1.2=compileClasspath,testCompileClasspath +org.osgi:org.osgi.resource:1.0.0=compileClasspath,testCompileClasspath +org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,testCompileClasspath org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.ow2.asm:asm:9.8=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm:9.8=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.slf4j:jcl-over-slf4j:2.0.17=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.slf4j:jul-to-slf4j:2.0.17=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.17=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.tallison.xmp:xmpcore-shaded:6.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.tallison:isoparser:1.9.41.7=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.tallison:jmatio:1.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.tallison:metadata-extractor:2.17.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.tukaani:xz:1.9=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.slf4j:jcl-over-slf4j:2.0.17=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs +org.slf4j:slf4j-api:2.0.17=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.tallison:jmatio:1.5=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.tukaani:xz:1.10=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.10.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -xerces:xercesImpl:2.12.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -empty=apiHelper,apiHelperTest,compileOnlyHelper,compileOnlyHelperTest,missingdoclet,packaging,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUnusedDeclared,permitUsedUndeclared,signatures +xerces:xercesImpl:2.12.2=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +xml-apis:xml-apis:1.4.01=permitUnusedDeclared +empty=apiHelper,apiHelperTest,compileOnlyHelper,compileOnlyHelperTest,missingdoclet,packaging,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUsedUndeclared,signatures diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile index f3fc3915d8fa..9929a4804fd6 100644 --- a/solr/modules/gcs-repository/gradle.lockfile +++ b/solr/modules/gcs-repository/gradle.lockfile @@ -128,12 +128,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.1=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index f4ed44e375a3..4bc4ad65294e 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -95,12 +95,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.1=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/langid/build.gradle b/solr/modules/langid/build.gradle index dc63a9f9bbc6..773461a4243a 100644 --- a/solr/modules/langid/build.gradle +++ b/solr/modules/langid/build.gradle @@ -24,6 +24,7 @@ dependencies { implementation project(':solr:solrj') implementation(libs.apache.tika.core) { transitive = false } + implementation(libs.apache.tika.langdetect) implementation libs.commonsio.commonsio implementation libs.cybozulabs.langdetect implementation libs.apache.opennlp.tools diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile index 7c6514de7926..8f54351fc238 100644 --- a/solr/modules/langid/gradle.lockfile +++ b/solr/modules/langid/gradle.lockfile @@ -79,12 +79,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.1=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -108,7 +108,8 @@ org.apache.lucene:lucene-spatial3d:10.2.1=jarValidation,runtimeClasspath,runtime org.apache.lucene:lucene-suggest:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-test-framework:10.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.opennlp:opennlp-tools:2.5.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-core:1.28.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-core:2.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-langdetect:2.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/llm/gradle.lockfile b/solr/modules/llm/gradle.lockfile index 90a78ebfdb74..254154d75177 100644 --- a/solr/modules/llm/gradle.lockfile +++ b/solr/modules/llm/gradle.lockfile @@ -92,12 +92,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.1=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile index 78d4968ae4d7..5aa0e2e3fa8e 100644 --- a/solr/modules/ltr/gradle.lockfile +++ b/solr/modules/ltr/gradle.lockfile @@ -78,12 +78,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.1=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index 94dd50a5d866..f7f7bacd6aae 100644 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@ -113,12 +113,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.1=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile index 2c6870fcb07f..194dc0c7e783 100644 --- a/solr/modules/s3-repository/gradle.lockfile +++ b/solr/modules/s3-repository/gradle.lockfile @@ -104,12 +104,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.1=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfile index a3db409bbe8c..2fb5161a0b12 100644 --- a/solr/modules/scripting/gradle.lockfile +++ b/solr/modules/scripting/gradle.lockfile @@ -77,12 +77,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.1=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile index a4c493bc7e6f..5b42aa0f19fa 100644 --- a/solr/modules/sql/gradle.lockfile +++ b/solr/modules/sql/gradle.lockfile @@ -88,12 +88,12 @@ org.apache.httpcomponents.core5:httpcore5:5.2.3=jarValidation,permitUnusedDeclar org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.1=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-icu:10.2.1=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/prometheus-exporter/gradle.lockfile b/solr/prometheus-exporter/gradle.lockfile index b1a7bc865de1..0330a8961574 100644 --- a/solr/prometheus-exporter/gradle.lockfile +++ b/solr/prometheus-exporter/gradle.lockfile @@ -81,12 +81,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.1=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.1=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=jarValidation,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfile index d00de86e5cdc..5463d460d9db 100644 --- a/solr/server/gradle.lockfile +++ b/solr/server/gradle.lockfile @@ -74,12 +74,12 @@ org.apache.curator:curator-framework:5.9.0=jarValidation,runtimeClasspath,solrCo org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,solrCore org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,solrCore org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,solrCore -org.apache.logging.log4j:log4j-1.2-api:2.21.0=jarValidation,libExt,runtimeClasspath -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,libExt,runtimeClasspath,solrCore -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,libExt,runtimeClasspath,solrCore -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=jarValidation,libExt,runtimeClasspath -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,libExt,runtimeClasspath,solrCore -org.apache.logging.log4j:log4j-web:2.21.0=jarValidation,libExt,runtimeClasspath +org.apache.logging.log4j:log4j-1.2-api:2.25.1=jarValidation,libExt,runtimeClasspath +org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,libExt,runtimeClasspath,solrCore +org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,libExt,runtimeClasspath,solrCore +org.apache.logging.log4j:log4j-layout-template-json:2.25.1=jarValidation,libExt,runtimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,libExt,runtimeClasspath,solrCore +org.apache.logging.log4j:log4j-web:2.25.1=jarValidation,libExt,runtimeClasspath org.apache.lucene:lucene-analysis-common:10.2.1=jarValidation,runtimeClasspath,solrCore org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,solrCore org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,solrCore diff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfile index 7bee0141f47e..b933eea16332 100644 --- a/solr/solr-ref-guide/gradle.lockfile +++ b/solr/solr-ref-guide/gradle.lockfile @@ -76,9 +76,9 @@ org.apache.curator:curator-test:5.9.0=testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.21.0=testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=testRuntimeClasspath -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.1=testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=testRuntimeClasspath org.apache.lucene:lucene-analysis-common:10.2.1=localJavadocs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=testRuntimeClasspath diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile index 58921c8bae38..f2c57833944a 100644 --- a/solr/solrj-streaming/gradle.lockfile +++ b/solr/solrj-streaming/gradle.lockfile @@ -94,9 +94,9 @@ org.apache.httpcomponents.core5:httpcore5:5.2.3=jarValidation,testRuntimeClasspa org.apache.httpcomponents:httpclient:4.5.14=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,testRuntimeClasspath -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-common:10.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,testRuntimeClasspath diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfile index eb3ca84c1fca..8df8a2b58f9b 100644 --- a/solr/solrj-zookeeper/gradle.lockfile +++ b/solr/solrj-zookeeper/gradle.lockfile @@ -91,9 +91,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,testRuntimeClasspath -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-common:10.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,testRuntimeClasspath diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile index 6a2b4401caa7..6284d324a755 100644 --- a/solr/solrj/gradle.lockfile +++ b/solr/solrj/gradle.lockfile @@ -87,9 +87,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,testRuntimeClasspath -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-common:10.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,testRuntimeClasspath diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfile index 7ad0abf72e7b..23c06e31b526 100644 --- a/solr/test-framework/gradle.lockfile +++ b/solr/test-framework/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0=compileClasspath,testCompileClasspath com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.3=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.carrotsearch:hppc:0.10.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.20=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -13,7 +14,7 @@ com.fasterxml.jackson:jackson-bom:2.20.0=apiHelper,compileClasspath,jarValidatio com.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.2.2=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor -com.github.spotbugs:spotbugs-annotations:4.9.4=compileClasspath,compileOnlyHelper,permitUnusedDeclared +com.github.spotbugs:spotbugs-annotations:4.9.4=compileClasspath,compileOnlyHelper,permitUnusedDeclared,testCompileClasspath com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor @@ -78,9 +79,9 @@ org.apache.curator:curator-test:5.9.0=compileClasspath,jarValidation,runtimeClas org.apache.httpcomponents:httpclient:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-common:10.2.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath @@ -147,6 +148,10 @@ org.junit:junit-bom:5.13.4=compileOnlyHelper,permitUnusedDeclared org.junit:junit-bom:5.6.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.osgi:org.osgi.annotation.bundle:2.0.0=compileClasspath,testCompileClasspath +org.osgi:org.osgi.annotation.versioning:1.1.2=compileClasspath,testCompileClasspath +org.osgi:org.osgi.resource:1.0.0=compileClasspath,testCompileClasspath +org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,testCompileClasspath org.ow2.asm:asm-commons:9.8=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-tree:9.8=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:9.8=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath diff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfile index d3194d19777a..389640548caf 100644 --- a/solr/webapp/gradle.lockfile +++ b/solr/webapp/gradle.lockfile @@ -74,12 +74,12 @@ org.apache.curator:curator-framework:5.9.0=permitUnusedDeclared,solrCore org.apache.httpcomponents:httpclient:4.5.14=permitUnusedDeclared,solrCore org.apache.httpcomponents:httpcore:4.4.16=permitUnusedDeclared,solrCore org.apache.httpcomponents:httpmime:4.5.14=permitUnusedDeclared,solrCore -org.apache.logging.log4j:log4j-1.2-api:2.21.0=serverLib -org.apache.logging.log4j:log4j-api:2.21.0=permitUnusedDeclared,serverLib,solrCore -org.apache.logging.log4j:log4j-core:2.21.0=permitUnusedDeclared,serverLib,solrCore -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=serverLib -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=permitUnusedDeclared,serverLib,solrCore -org.apache.logging.log4j:log4j-web:2.21.0=serverLib +org.apache.logging.log4j:log4j-1.2-api:2.25.1=serverLib +org.apache.logging.log4j:log4j-api:2.25.1=permitUnusedDeclared,serverLib,solrCore +org.apache.logging.log4j:log4j-core:2.25.1=permitUnusedDeclared,serverLib,solrCore +org.apache.logging.log4j:log4j-layout-template-json:2.25.1=serverLib +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=permitUnusedDeclared,serverLib,solrCore +org.apache.logging.log4j:log4j-web:2.25.1=serverLib org.apache.lucene:lucene-analysis-common:10.2.1=permitUnusedDeclared,solrCore org.apache.lucene:lucene-analysis-kuromoji:10.2.1=permitUnusedDeclared,solrCore org.apache.lucene:lucene-analysis-nori:10.2.1=permitUnusedDeclared,solrCore From 880f811e9b9d2beea1713edc8939dc124c155569 Mon Sep 17 00:00:00 2001 From: Christos Malliaridis Date: Fri, 19 Sep 2025 23:05:58 +0300 Subject: [PATCH 02/10] Bypass forbidden-apis limitation --- gradle/validation/forbidden-apis.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle/validation/forbidden-apis.gradle b/gradle/validation/forbidden-apis.gradle index 90f385755c8b..b7acca0a76ee 100644 --- a/gradle/validation/forbidden-apis.gradle +++ b/gradle/validation/forbidden-apis.gradle @@ -49,10 +49,11 @@ allprojects { prj -> logger.debug("Signature file omitted (does not exist): ${sig}") } } - + // commons-io is special: forbiddenapis has a versioned bundledSignature. bundledSignatures += resolvedMods .findAll { id -> id.group == 'commons-io' && id.name == 'commons-io' } + .findAll { id -> id.version != "2.19.0" } .collect { id -> "${id.name}-unsafe-${id.version}" as String } } From f6dcc06806a06c3efdc72a1985cbe57baac7cadf Mon Sep 17 00:00:00 2001 From: Christos Malliaridis Date: Fri, 19 Sep 2025 23:07:40 +0300 Subject: [PATCH 03/10] Update TikaMetadataKeys to TikaCoreProperties --- .../solr/handler/extraction/ExtractingDocumentLoader.java | 4 ++-- .../solr/handler/extraction/RegexRulesPasswordProvider.java | 4 ++-- .../apache/solr/handler/extraction/SolrContentHandler.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java index 014d56caae40..6464da1ae839 100644 --- a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java +++ b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java @@ -37,7 +37,7 @@ import org.apache.tika.exception.TikaException; import org.apache.tika.metadata.HttpHeaders; import org.apache.tika.metadata.Metadata; -import org.apache.tika.metadata.TikaMetadataKeys; +import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AutoDetectParser; import org.apache.tika.parser.DefaultParser; @@ -147,7 +147,7 @@ public void load( // then Tika can make use of it in guessing the appropriate MIME type: String resourceName = req.getParams().get(ExtractingParams.RESOURCE_NAME, null); if (resourceName != null) { - metadata.add(TikaMetadataKeys.RESOURCE_NAME_KEY, resourceName); + metadata.add(TikaCoreProperties.RESOURCE_NAME_KEY, resourceName); } // Provide stream's content type as hint for auto detection if (stream.getContentType() != null) { diff --git a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.java index 84b4e94171cb..d309b32cea01 100644 --- a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.java +++ b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.java @@ -27,7 +27,7 @@ import java.util.regex.PatternSyntaxException; import org.apache.lucene.util.IOUtils; import org.apache.tika.metadata.Metadata; -import org.apache.tika.metadata.TikaMetadataKeys; +import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.parser.PasswordProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,7 +50,7 @@ public String getPassword(Metadata meta) { } if (passwordMap.size() > 0) - return lookupPasswordFromMap(meta.get(TikaMetadataKeys.RESOURCE_NAME_KEY)); + return lookupPasswordFromMap(meta.get(TikaCoreProperties.RESOURCE_NAME_KEY)); return null; } diff --git a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java index 9edba0e925ed..f4caff8feb01 100644 --- a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java +++ b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java @@ -31,7 +31,7 @@ import org.apache.solr.schema.IndexSchema; import org.apache.solr.schema.SchemaField; import org.apache.tika.metadata.Metadata; -import org.apache.tika.metadata.TikaMetadataKeys; +import org.apache.tika.metadata.TikaCoreProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.Attributes; @@ -200,7 +200,7 @@ protected void addField(String fname, String fval, String[] vals) { sf = schema.getFieldOrNull(name); } else if (sf == null && defaultField.length() > 0 - && name.equals(TikaMetadataKeys.RESOURCE_NAME_KEY) + && name.equals(TikaCoreProperties.RESOURCE_NAME_KEY) == false /*let the fall through below handle this*/) { name = defaultField; sf = schema.getFieldOrNull(name); @@ -213,7 +213,7 @@ protected void addField(String fname, String fval, String[] vals) { // you? if (sf == null && unknownFieldPrefix.length() == 0 - && Objects.equals(name, TikaMetadataKeys.RESOURCE_NAME_KEY)) { + && Objects.equals(name, TikaCoreProperties.RESOURCE_NAME_KEY)) { return; } From 6b88395c334b1c84587015e642ce95df5c169060 Mon Sep 17 00:00:00 2001 From: Christos Malliaridis Date: Fri, 19 Sep 2025 23:08:07 +0300 Subject: [PATCH 04/10] Remove deprecation warnings --- .../solr/handler/extraction/ExtractingDocumentLoader.java | 8 +------- .../solr/handler/extraction/ExtractingRequestHandler.java | 4 ---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java index 6464da1ae839..f5cce1faec2e 100644 --- a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java +++ b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java @@ -58,13 +58,7 @@ import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; -/** - * The class responsible for loading extracted content into Solr. - * - * @deprecated Will be replaced with something similar that calls out to a separate Tika Server - * process running in its own JVM. - */ -@Deprecated(since = "9.10.0") +/** The class responsible for loading extracted content into Solr. */ public class ExtractingDocumentLoader extends ContentStreamLoader { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java index c9a319bc0bb2..6caef96cf62f 100644 --- a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java +++ b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java @@ -33,11 +33,7 @@ /** * Handler for rich documents like PDF or Word or any other file format that Tika handles that need * the text to be extracted first from the document. - * - * @deprecated Will be replaced with something similar that calls out to a separate Tika Server - * process running in its own JVM. */ -@Deprecated(since = "9.10.0") public class ExtractingRequestHandler extends ContentStreamHandlerBase implements SolrCoreAware, PermissionNameProvider { From c7548c4a800fa0ee9cfe649b92c0ac25c793c51b Mon Sep 17 00:00:00 2001 From: Christos Malliaridis Date: Fri, 19 Sep 2025 23:08:20 +0300 Subject: [PATCH 05/10] Fix renaming of pdfParserConfig --- .../apache/solr/handler/extraction/ParseContextConfigTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ParseContextConfigTest.java b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ParseContextConfigTest.java index 7ea5df5471f7..61f90b835a97 100644 --- a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ParseContextConfigTest.java +++ b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ParseContextConfigTest.java @@ -47,6 +47,6 @@ public void testAll() throws Exception { PDFParserConfig pdfParserConfig = parseContext.get(PDFParserConfig.class); - assertTrue(pdfParserConfig.getExtractInlineImages()); + assertTrue(pdfParserConfig.isExtractInlineImages()); } } From 604f1b1e64b67911f747eb72c1fb0f6654995da3 Mon Sep 17 00:00:00 2001 From: Christos Malliaridis Date: Sat, 20 Sep 2025 15:32:19 +0300 Subject: [PATCH 06/10] Fix mappings of changed metadata in tests --- .../ExtractingRequestHandlerTest.java | 128 ++++++++++-------- 1 file changed, 71 insertions(+), 57 deletions(-) diff --git a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java index 0097b86e818a..38e8a120ed7d 100644 --- a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java +++ b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java @@ -76,13 +76,15 @@ public void testExtraction() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.meta:keyword", "extractedKeywords", - "fmap.Creation-Date", + "fmap.dcterms:created", "extractedDate", + "fmap.dc:title", + "title", "uprefix", "ignored_", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", "fmap.content", "extractedContent", @@ -102,12 +104,14 @@ public void testExtraction() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.meta:keyword", "extractedKeywords", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", "fmap.language", "extractedLanguage", + "fmap.dc:title", + "title", "literal.id", "two", "uprefix", @@ -190,9 +194,9 @@ public void testExtraction() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.meta:keyword", "extractedKeywords", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", "literal.id", "three", @@ -216,10 +220,12 @@ public void testExtraction() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.meta:keyword", "extractedKeywords", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", + "fmap.dc:title", + "title", "literal.id", "four", "uprefix", @@ -253,9 +259,9 @@ public void testExtraction() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.meta:keyword", "extractedKeywords", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", "uprefix", "ignored_", @@ -414,9 +420,9 @@ public void testLiterals() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.meta:keyword", "extractedKeywords", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", "fmap.content", "extractedContent", @@ -449,9 +455,9 @@ public void testLiterals() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.meta:keyword", "extractedKeywords", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", "fmap.content", "extractedContent", @@ -463,8 +469,10 @@ public void testLiterals() throws Exception { "one", "literal.extractionLiteral", "two", - "fmap.X-Parsed-By", + "fmap.X-TIKA:Parsed-By", "ignored_parser", + "fmap.X-TIKA:Parsed-By-Full-Set", + "ignored_parser_set", "fmap.Last-Modified", "extractedDate"); // TODO: original author did not specify why an exception should be thrown... how to fix? @@ -481,9 +489,9 @@ public void testLiterals() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.meta:keyword", "extractedKeywords", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", "fmap.content", "extractedContent", @@ -493,8 +501,10 @@ public void testLiterals() throws Exception { "extractedLanguage", "literal.extractionLiteral", "one", - "fmap.X-Parsed-By", + "fmap.X-TIKA:Parsed-By", "ignored_parser", + "fmap.X-TIKA:Parsed-By-Full-Set", + "ignored_parser_set", "fmap.Last-Modified", "extractedDate"); assertU(commit()); @@ -591,15 +601,15 @@ public void testPlainTextSpecifyingMimeType() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.meta:keyword", "extractedKeywords", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", "literal.id", "one", "fmap.language", "extractedLanguage", - "fmap.X-Parsed-By", + "fmap.X-TIKA:Parsed-By", "ignored_parser", "fmap.content", "extractedContent", @@ -625,16 +635,18 @@ public void testPlainTextSpecifyingResourceName() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.meta:keyword", "extractedKeywords", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", "literal.id", "one", "fmap.language", "extractedLanguage", - "fmap.X-Parsed-By", + "fmap.X-TIKA:Parsed-By", "ignored_parser", + "fmap.X-TIKA:Parsed-By-Full-Set", + "ignored_parser_set", "fmap.content", "extractedContent", ExtractingParams.RESOURCE_NAME, @@ -692,7 +704,7 @@ public void testExtractOnly() throws Exception { NamedList nl = (NamedList) list.get("solr-word.pdf_metadata"); assertNotNull("nl is null and it shouldn't be", nl); - Object title = nl.get("title"); + Object title = nl.get("dc:title"); assertNotNull("title is null and it shouldn't be", title); assertTrue(extraction.contains(") list.get("solr-word.pdf_metadata"); assertNotNull("nl is null and it shouldn't be", nl); - title = nl.get("title"); + title = nl.get("dc:title"); assertNotNull("title is null and it shouldn't be", title); } @@ -770,11 +782,11 @@ public void testArabicPDF() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.meta:keyword", "extractedKeywords", - "fmap.Creation-Date", + "fmap.dcterms:created", "extractedDate", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", "uprefix", "ignored_", @@ -812,13 +824,13 @@ public void testTikaExceptionHandling() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.meta:keyword", "extractedKeywords", - "fmap.Creation-Date", + "fmap.dcterms:created", "extractedDate", "uprefix", "ignored_", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", "fmap.content", "wdf_nocase", @@ -882,17 +894,19 @@ public void testLiteralsOverride() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.dc:subject", "extractedKeywords", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", + "fmap.dc:title", + "title", "literal.id", "three", "fmap.content", "extractedContent", "fmap.language", "extractedLanguage", - "fmap.Creation-Date", + "fmap.dcterms:created", "extractedDate", "uprefix", "ignored_", @@ -910,9 +924,9 @@ public void testLiteralsOverride() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.dc:subject", "extractedKeywords", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", "literal.id", "four", @@ -920,7 +934,7 @@ public void testLiteralsOverride() throws Exception { "extractedContent", "fmap.language", "extractedLanguage", - "fmap.Creation-Date", + "fmap.dcterms:created", "extractedDate", "uprefix", "ignored_", @@ -946,9 +960,9 @@ public void testLiteralsOverride() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.dc:subject", "extractedKeywords", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", "literal.id", "five", @@ -956,7 +970,7 @@ public void testLiteralsOverride() throws Exception { "extractedContent", "fmap.language", "extractedLanguage", - "fmap.Creation-Date", + "fmap.dcterms:created", "extractedDate", "uprefix", "ignored_", @@ -982,13 +996,13 @@ public void testPdfWithImages() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.meta:keyword", "extractedKeywords", - "fmap.Creation-Date", + "fmap.dcterms:created", "extractedDate", "uprefix", "ignored_", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", "fmap.content", "wdf_nocase", @@ -1017,13 +1031,13 @@ public void testPasswordProtected() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.meta:keyword", "extractedKeywords", - "fmap.Creation-Date", + "fmap.dcterms:created", "extractedDate", "uprefix", "ignored_", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", "fmap.content", "wdf_nocase", @@ -1045,13 +1059,13 @@ public void testPasswordProtected() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.meta:keyword", "extractedKeywords", - "fmap.Creation-Date", + "fmap.dcterms:created", "extractedDate", "uprefix", "ignored_", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", "fmap.content", "wdf_nocase", @@ -1073,11 +1087,11 @@ public void testPasswordProtected() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.meta:keyword", "extractedKeywords", - "fmap.Creation-Date", + "fmap.dcterms:created", "extractedDate", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", "fmap.content", "wdf_nocase", @@ -1101,13 +1115,13 @@ public void testPasswordProtected() throws Exception { "extractedProducer", "fmap.creator", "extractedCreator", - "fmap.Keywords", + "fmap.meta:keyword", "extractedKeywords", - "fmap.Creation-Date", + "fmap.dcterms:created", "extractedDate", "uprefix", "ignored_", - "fmap.Author", + "fmap.dc:creator", "extractedAuthor", "fmap.content", "wdf_nocase", From dcd7cbb2448adb806b957028a5ec79f37f6eb383 Mon Sep 17 00:00:00 2001 From: Christos Malliaridis Date: Sat, 20 Sep 2025 19:28:09 +0300 Subject: [PATCH 07/10] Update apache tika to 3.2.3 and commons-io to 2.20.0 --- gradle/libs.versions.toml | 4 +- gradle/validation/forbidden-apis.gradle | 2 +- solr/api/gradle.lockfile | 2 +- solr/benchmark/gradle.lockfile | 2 +- solr/core/gradle.lockfile | 2 +- solr/cross-dc-manager/gradle.lockfile | 2 +- .../apache-mime4j-core-0.8.12.jar.sha1 | 1 - .../apache-mime4j-core-0.8.13.jar.sha1 | 1 + .../apache-mime4j-dom-0.8.12.jar.sha1 | 1 - .../apache-mime4j-dom-0.8.13.jar.sha1 | 1 + solr/licenses/bcjmail-LICENSE-MIT.txt | 13 + solr/licenses/bcjmail-NOTICE.txt | 0 solr/licenses/bcjmail-jdk18on-1.81.jar.sha1 | 1 + solr/licenses/bcmail-jdk18on-1.80.jar.sha1 | 1 - .../licenses/commons-compress-1.27.1.jar.sha1 | 1 - .../licenses/commons-compress-1.28.0.jar.sha1 | 1 + solr/licenses/commons-csv-1.14.0.jar.sha1 | 1 - solr/licenses/commons-csv-1.14.1.jar.sha1 | 1 + solr/licenses/commons-io-2.17.0.jar.sha1 | 1 - solr/licenses/commons-io-2.19.0.jar.sha1 | 1 - solr/licenses/commons-io-2.20.0.jar.sha1 | 1 + solr/licenses/fontbox-2.0.34.jar.sha1 | 1 - solr/licenses/fontbox-3.0.5.jar.sha1 | 1 + .../istack-commons-runtime-3.0.12.jar.sha1 | 1 - .../jakarta.activation-1.2.2.jar.sha1 | 1 - .../jakarta.xml.bind-api-2.3.3.jar.sha1 | 1 - solr/licenses/jaxb-runtime-2.3.9.jar.sha1 | 1 - solr/licenses/jsoup-1.21.2.jar.sha1 | 1 + solr/licenses/jsoup-LICENSE-MIT.txt | 21 ++ solr/licenses/jsoup-NOTICE.txt | 0 solr/licenses/jwarc-0.31.1.jar.sha1 | 1 - solr/licenses/jwarc-0.32.0.jar.sha1 | 1 + solr/licenses/pdfbox-2.0.34.jar.sha1 | 1 - solr/licenses/pdfbox-3.0.5.jar.sha1 | 1 + solr/licenses/pdfbox-io-3.0.5.jar.sha1 | 1 + solr/licenses/pdfbox-tools-2.0.34.jar.sha1 | 1 - solr/licenses/pdfbox-tools-3.0.5.jar.sha1 | 1 + solr/licenses/picocli-4.7.6.jar.sha1 | 1 + solr/licenses/picocli-LICENSE-ASL.txt | 201 ++++++++++ solr/licenses/picocli-NOTICE.txt | 351 ++++++++++++++++++ solr/licenses/tagsoup-1.2.1.jar.sha1 | 1 - solr/licenses/tika-core-2.9.4.jar.sha1 | 1 - solr/licenses/tika-core-3.2.3.jar.sha1 | 1 + .../tika-parser-apple-module-2.9.4.jar.sha1 | 1 - .../tika-parser-apple-module-3.2.3.jar.sha1 | 1 + ...ka-parser-audiovideo-module-2.9.4.jar.sha1 | 1 - ...ka-parser-audiovideo-module-3.2.3.jar.sha1 | 1 + .../tika-parser-cad-module-2.9.4.jar.sha1 | 1 - .../tika-parser-cad-module-3.2.3.jar.sha1 | 1 + .../tika-parser-code-module-2.9.4.jar.sha1 | 1 - .../tika-parser-code-module-3.2.3.jar.sha1 | 1 + .../tika-parser-crypto-module-2.9.4.jar.sha1 | 1 - .../tika-parser-crypto-module-3.2.3.jar.sha1 | 1 + .../tika-parser-digest-commons-2.9.4.jar.sha1 | 1 - .../tika-parser-digest-commons-3.2.3.jar.sha1 | 1 + .../tika-parser-font-module-2.9.4.jar.sha1 | 1 - .../tika-parser-font-module-3.2.3.jar.sha1 | 1 + .../tika-parser-html-module-2.9.4.jar.sha1 | 1 - .../tika-parser-html-module-3.2.3.jar.sha1 | 1 + .../tika-parser-image-module-2.9.4.jar.sha1 | 1 - .../tika-parser-image-module-3.2.3.jar.sha1 | 1 + .../tika-parser-mail-commons-2.9.4.jar.sha1 | 1 - .../tika-parser-mail-commons-3.2.3.jar.sha1 | 1 + .../tika-parser-mail-module-2.9.4.jar.sha1 | 1 - .../tika-parser-mail-module-3.2.3.jar.sha1 | 1 + ...ika-parser-microsoft-module-2.9.4.jar.sha1 | 1 - ...ika-parser-microsoft-module-3.2.3.jar.sha1 | 1 + ...ka-parser-miscoffice-module-2.9.4.jar.sha1 | 1 - ...ka-parser-miscoffice-module-3.2.3.jar.sha1 | 1 + .../tika-parser-news-module-2.9.4.jar.sha1 | 1 - .../tika-parser-news-module-3.2.3.jar.sha1 | 1 + .../tika-parser-ocr-module-2.9.4.jar.sha1 | 1 - .../tika-parser-ocr-module-3.2.3.jar.sha1 | 1 + .../tika-parser-pdf-module-2.9.4.jar.sha1 | 1 - .../tika-parser-pdf-module-3.2.3.jar.sha1 | 1 + .../tika-parser-pkg-module-2.9.4.jar.sha1 | 1 - .../tika-parser-pkg-module-3.2.3.jar.sha1 | 1 + .../tika-parser-text-module-2.9.4.jar.sha1 | 1 - .../tika-parser-text-module-3.2.3.jar.sha1 | 1 + ...ka-parser-webarchive-module-2.9.4.jar.sha1 | 1 - ...ka-parser-webarchive-module-3.2.3.jar.sha1 | 1 + .../tika-parser-xml-module-2.9.4.jar.sha1 | 1 - .../tika-parser-xml-module-3.2.3.jar.sha1 | 1 + .../tika-parser-xmp-commons-2.9.4.jar.sha1 | 1 - .../tika-parser-xmp-commons-3.2.3.jar.sha1 | 1 + .../tika-parser-zip-commons-2.9.4.jar.sha1 | 1 - .../tika-parser-zip-commons-3.2.3.jar.sha1 | 1 + ...ka-parsers-standard-package-2.9.4.jar.sha1 | 1 - ...ka-parsers-standard-package-3.2.3.jar.sha1 | 1 + solr/licenses/txw2-2.3.9.jar.sha1 | 1 - solr/licenses/xmpbox-2.0.34.jar.sha1 | 1 - solr/licenses/xmpbox-3.0.5.jar.sha1 | 1 + solr/modules/analysis-extras/gradle.lockfile | 2 +- solr/modules/clustering/gradle.lockfile | 2 +- solr/modules/cross-dc/gradle.lockfile | 2 +- solr/modules/extraction/gradle.lockfile | 123 +++--- solr/modules/gcs-repository/gradle.lockfile | 2 +- solr/modules/jwt-auth/gradle.lockfile | 2 +- solr/modules/langid/gradle.lockfile | 6 +- solr/modules/llm/gradle.lockfile | 2 +- solr/modules/ltr/gradle.lockfile | 2 +- solr/modules/opentelemetry/gradle.lockfile | 2 +- solr/modules/s3-repository/gradle.lockfile | 2 +- solr/modules/scripting/gradle.lockfile | 2 +- solr/modules/sql/gradle.lockfile | 2 +- solr/prometheus-exporter/gradle.lockfile | 2 +- solr/server/gradle.lockfile | 2 +- solr/solr-ref-guide/gradle.lockfile | 2 +- solr/solrj-streaming/gradle.lockfile | 3 +- solr/solrj-zookeeper/gradle.lockfile | 3 +- solr/solrj/gradle.lockfile | 3 +- solr/test-framework/gradle.lockfile | 2 +- solr/webapp/gradle.lockfile | 2 +- 113 files changed, 712 insertions(+), 138 deletions(-) delete mode 100644 solr/licenses/apache-mime4j-core-0.8.12.jar.sha1 create mode 100644 solr/licenses/apache-mime4j-core-0.8.13.jar.sha1 delete mode 100644 solr/licenses/apache-mime4j-dom-0.8.12.jar.sha1 create mode 100644 solr/licenses/apache-mime4j-dom-0.8.13.jar.sha1 create mode 100644 solr/licenses/bcjmail-LICENSE-MIT.txt create mode 100644 solr/licenses/bcjmail-NOTICE.txt create mode 100644 solr/licenses/bcjmail-jdk18on-1.81.jar.sha1 delete mode 100644 solr/licenses/bcmail-jdk18on-1.80.jar.sha1 delete mode 100644 solr/licenses/commons-compress-1.27.1.jar.sha1 create mode 100644 solr/licenses/commons-compress-1.28.0.jar.sha1 delete mode 100644 solr/licenses/commons-csv-1.14.0.jar.sha1 create mode 100644 solr/licenses/commons-csv-1.14.1.jar.sha1 delete mode 100644 solr/licenses/commons-io-2.17.0.jar.sha1 delete mode 100644 solr/licenses/commons-io-2.19.0.jar.sha1 create mode 100644 solr/licenses/commons-io-2.20.0.jar.sha1 delete mode 100644 solr/licenses/fontbox-2.0.34.jar.sha1 create mode 100644 solr/licenses/fontbox-3.0.5.jar.sha1 delete mode 100644 solr/licenses/istack-commons-runtime-3.0.12.jar.sha1 delete mode 100644 solr/licenses/jakarta.activation-1.2.2.jar.sha1 delete mode 100644 solr/licenses/jakarta.xml.bind-api-2.3.3.jar.sha1 delete mode 100644 solr/licenses/jaxb-runtime-2.3.9.jar.sha1 create mode 100644 solr/licenses/jsoup-1.21.2.jar.sha1 create mode 100644 solr/licenses/jsoup-LICENSE-MIT.txt create mode 100644 solr/licenses/jsoup-NOTICE.txt delete mode 100644 solr/licenses/jwarc-0.31.1.jar.sha1 create mode 100644 solr/licenses/jwarc-0.32.0.jar.sha1 delete mode 100644 solr/licenses/pdfbox-2.0.34.jar.sha1 create mode 100644 solr/licenses/pdfbox-3.0.5.jar.sha1 create mode 100644 solr/licenses/pdfbox-io-3.0.5.jar.sha1 delete mode 100644 solr/licenses/pdfbox-tools-2.0.34.jar.sha1 create mode 100644 solr/licenses/pdfbox-tools-3.0.5.jar.sha1 create mode 100644 solr/licenses/picocli-4.7.6.jar.sha1 create mode 100644 solr/licenses/picocli-LICENSE-ASL.txt create mode 100644 solr/licenses/picocli-NOTICE.txt delete mode 100644 solr/licenses/tagsoup-1.2.1.jar.sha1 delete mode 100644 solr/licenses/tika-core-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-core-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-apple-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-apple-module-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-audiovideo-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-audiovideo-module-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-cad-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-cad-module-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-code-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-code-module-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-crypto-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-crypto-module-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-digest-commons-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-digest-commons-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-font-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-font-module-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-html-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-html-module-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-image-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-image-module-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-mail-commons-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-mail-commons-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-mail-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-mail-module-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-microsoft-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-microsoft-module-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-miscoffice-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-miscoffice-module-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-news-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-news-module-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-ocr-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-ocr-module-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-pdf-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-pdf-module-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-pkg-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-pkg-module-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-text-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-text-module-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-webarchive-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-webarchive-module-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-xml-module-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-xml-module-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-xmp-commons-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-xmp-commons-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parser-zip-commons-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parser-zip-commons-3.2.3.jar.sha1 delete mode 100644 solr/licenses/tika-parsers-standard-package-2.9.4.jar.sha1 create mode 100644 solr/licenses/tika-parsers-standard-package-3.2.3.jar.sha1 delete mode 100644 solr/licenses/txw2-2.3.9.jar.sha1 delete mode 100644 solr/licenses/xmpbox-2.0.34.jar.sha1 create mode 100644 solr/licenses/xmpbox-3.0.5.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 54b4ecb04605..aa817cf7befb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -41,7 +41,7 @@ apache-lucene = "10.2.1" apache-opennlp = "2.5.4" apache-poi = "5.2.2" apache-rat = "0.15" -apache-tika = "2.9.4" +apache-tika = "3.2.3" apache-tomcat = "6.0.53" apache-zookeeper = "3.9.4" # @keep for version alignment @@ -72,7 +72,7 @@ checkerframework = "3.44.0" codehaus-woodstox = "4.2.2" commons-cli = "1.10.0" commons-codec = "1.19.0" -commons-io = "2.15.1" +commons-io = "2.20.0" compose = "1.8.2" cutterslade-analyze = "1.10.0" cybozulabs-langdetect = "1.1-20120112" diff --git a/gradle/validation/forbidden-apis.gradle b/gradle/validation/forbidden-apis.gradle index b7acca0a76ee..2feeef390895 100644 --- a/gradle/validation/forbidden-apis.gradle +++ b/gradle/validation/forbidden-apis.gradle @@ -53,7 +53,7 @@ allprojects { prj -> // commons-io is special: forbiddenapis has a versioned bundledSignature. bundledSignatures += resolvedMods .findAll { id -> id.group == 'commons-io' && id.name == 'commons-io' } - .findAll { id -> id.version != "2.19.0" } + .findAll { id -> id.version != "2.19.0" && id.version != "2.20.0" } .collect { id -> "${id.name}-unsafe-${id.version}" as String } } diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfile index ddb8519601b9..7ee01ca13f42 100644 --- a/solr/api/gradle.lockfile +++ b/solr/api/gradle.lockfile @@ -36,7 +36,7 @@ com.sun.activation:jakarta.activation:2.0.1=swaggerBuild com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,testRuntimeClasspath -commons-io:commons-io:2.17.0=jarValidation,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=jarValidation,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,testRuntimeClasspath diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfile index 232750d1c1e6..5e807754926d 100644 --- a/solr/benchmark/gradle.lockfile +++ b/solr/benchmark/gradle.lockfile @@ -32,7 +32,7 @@ com.lmax:disruptor:3.4.4=jarValidation,runtimeClasspath,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,testRuntimeClasspath -commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile index 9e459ba527ef..4307a4bcd9c7 100644 --- a/solr/core/gradle.lockfile +++ b/solr/core/gradle.lockfile @@ -38,7 +38,7 @@ com.microsoft.onnxruntime:onnxruntime:1.22.0=jarValidation,testRuntimeClasspath com.tdunning:t-digest:3.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath commons-cli:commons-cli:1.10.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath commons-codec:commons-codec:1.19.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.17.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index 1834aedfac45..ad5d948583ba 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -45,7 +45,7 @@ commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPl commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-collections:commons-collections:3.2.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath commons-digester:commons-digester:2.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath commons-validator:commons-validator:1.7=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/licenses/apache-mime4j-core-0.8.12.jar.sha1 b/solr/licenses/apache-mime4j-core-0.8.12.jar.sha1 deleted file mode 100644 index 34070342d627..000000000000 --- a/solr/licenses/apache-mime4j-core-0.8.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -042ad2e9bfc1c0afaf04aefba080079c7e1f4c15 diff --git a/solr/licenses/apache-mime4j-core-0.8.13.jar.sha1 b/solr/licenses/apache-mime4j-core-0.8.13.jar.sha1 new file mode 100644 index 000000000000..1016158420ed --- /dev/null +++ b/solr/licenses/apache-mime4j-core-0.8.13.jar.sha1 @@ -0,0 +1 @@ +ef536e762f426a6943653a90aa59463b43fe45b1 diff --git a/solr/licenses/apache-mime4j-dom-0.8.12.jar.sha1 b/solr/licenses/apache-mime4j-dom-0.8.12.jar.sha1 deleted file mode 100644 index 7c25f6938dcd..000000000000 --- a/solr/licenses/apache-mime4j-dom-0.8.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7bb72605bf69bed1cb2393b9677b61e96c932b4f diff --git a/solr/licenses/apache-mime4j-dom-0.8.13.jar.sha1 b/solr/licenses/apache-mime4j-dom-0.8.13.jar.sha1 new file mode 100644 index 000000000000..225fdc701af1 --- /dev/null +++ b/solr/licenses/apache-mime4j-dom-0.8.13.jar.sha1 @@ -0,0 +1 @@ +19b4c87fce0173318131d90fcc518ea294ee2bee diff --git a/solr/licenses/bcjmail-LICENSE-MIT.txt b/solr/licenses/bcjmail-LICENSE-MIT.txt new file mode 100644 index 000000000000..277dcd1ebbb8 --- /dev/null +++ b/solr/licenses/bcjmail-LICENSE-MIT.txt @@ -0,0 +1,13 @@ +Copyright (c) 2000-2024 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org). +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, +sub license, and/or sell copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: The above copyright notice and this +permission notice shall be included in all copies or substantial portions of the Software. + +**THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT +OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.** diff --git a/solr/licenses/bcjmail-NOTICE.txt b/solr/licenses/bcjmail-NOTICE.txt new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/solr/licenses/bcjmail-jdk18on-1.81.jar.sha1 b/solr/licenses/bcjmail-jdk18on-1.81.jar.sha1 new file mode 100644 index 000000000000..2f9c5d43f34e --- /dev/null +++ b/solr/licenses/bcjmail-jdk18on-1.81.jar.sha1 @@ -0,0 +1 @@ +7a63d4f27c1d2aa21789c465e4a783440bf2bdbe diff --git a/solr/licenses/bcmail-jdk18on-1.80.jar.sha1 b/solr/licenses/bcmail-jdk18on-1.80.jar.sha1 deleted file mode 100644 index 96583349d91a..000000000000 --- a/solr/licenses/bcmail-jdk18on-1.80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -11ef5aa0e7a151c054859a39b2af4443884757c7 diff --git a/solr/licenses/commons-compress-1.27.1.jar.sha1 b/solr/licenses/commons-compress-1.27.1.jar.sha1 deleted file mode 100644 index f68a8f44c791..000000000000 --- a/solr/licenses/commons-compress-1.27.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a19151084758e2fbb6b41eddaa88e7b8ff4e6599 diff --git a/solr/licenses/commons-compress-1.28.0.jar.sha1 b/solr/licenses/commons-compress-1.28.0.jar.sha1 new file mode 100644 index 000000000000..15969764bcb9 --- /dev/null +++ b/solr/licenses/commons-compress-1.28.0.jar.sha1 @@ -0,0 +1 @@ +e482f2c7a88dac3c497e96aa420b6a769f59c8d7 diff --git a/solr/licenses/commons-csv-1.14.0.jar.sha1 b/solr/licenses/commons-csv-1.14.0.jar.sha1 deleted file mode 100644 index 2695af775a2e..000000000000 --- a/solr/licenses/commons-csv-1.14.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c7cc057084126ea93617b2b809abf82432d8f9f5 diff --git a/solr/licenses/commons-csv-1.14.1.jar.sha1 b/solr/licenses/commons-csv-1.14.1.jar.sha1 new file mode 100644 index 000000000000..17a857b38d76 --- /dev/null +++ b/solr/licenses/commons-csv-1.14.1.jar.sha1 @@ -0,0 +1 @@ +467354980fade8528b6a9f9bdf7f4f19ab9b3373 diff --git a/solr/licenses/commons-io-2.17.0.jar.sha1 b/solr/licenses/commons-io-2.17.0.jar.sha1 deleted file mode 100644 index 1fa43cb52eb5..000000000000 --- a/solr/licenses/commons-io-2.17.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ddcc8433eb019fb48fe25207c0278143f3e1d7e2 diff --git a/solr/licenses/commons-io-2.19.0.jar.sha1 b/solr/licenses/commons-io-2.19.0.jar.sha1 deleted file mode 100644 index d91b69574ed0..000000000000 --- a/solr/licenses/commons-io-2.19.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1f8d4a99ba72b77aa69101175efc79b0c7dcdd7e diff --git a/solr/licenses/commons-io-2.20.0.jar.sha1 b/solr/licenses/commons-io-2.20.0.jar.sha1 new file mode 100644 index 000000000000..c61718917b3e --- /dev/null +++ b/solr/licenses/commons-io-2.20.0.jar.sha1 @@ -0,0 +1 @@ +36f3474daec2849c149e877614e7f979b2082cd2 diff --git a/solr/licenses/fontbox-2.0.34.jar.sha1 b/solr/licenses/fontbox-2.0.34.jar.sha1 deleted file mode 100644 index dfe70b1bfec1..000000000000 --- a/solr/licenses/fontbox-2.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8be3275e863ccac56cb21511d5135c10aedae621 diff --git a/solr/licenses/fontbox-3.0.5.jar.sha1 b/solr/licenses/fontbox-3.0.5.jar.sha1 new file mode 100644 index 000000000000..7f0c0adc1ec1 --- /dev/null +++ b/solr/licenses/fontbox-3.0.5.jar.sha1 @@ -0,0 +1 @@ +b4a068e1dba2b9832a108cdf6e9a3249680e3ce8 diff --git a/solr/licenses/istack-commons-runtime-3.0.12.jar.sha1 b/solr/licenses/istack-commons-runtime-3.0.12.jar.sha1 deleted file mode 100644 index 88cf88a77458..000000000000 --- a/solr/licenses/istack-commons-runtime-3.0.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cbbe1a62b0cc6c85972e99d52aaee350153dc530 diff --git a/solr/licenses/jakarta.activation-1.2.2.jar.sha1 b/solr/licenses/jakarta.activation-1.2.2.jar.sha1 deleted file mode 100644 index 2f2e16cb6e38..000000000000 --- a/solr/licenses/jakarta.activation-1.2.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -74548703f9851017ce2f556066659438019e7eb5 diff --git a/solr/licenses/jakarta.xml.bind-api-2.3.3.jar.sha1 b/solr/licenses/jakarta.xml.bind-api-2.3.3.jar.sha1 deleted file mode 100644 index 96d326808f9f..000000000000 --- a/solr/licenses/jakarta.xml.bind-api-2.3.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -48e3b9cfc10752fba3521d6511f4165bea951801 diff --git a/solr/licenses/jaxb-runtime-2.3.9.jar.sha1 b/solr/licenses/jaxb-runtime-2.3.9.jar.sha1 deleted file mode 100644 index b6ad1f156ee8..000000000000 --- a/solr/licenses/jaxb-runtime-2.3.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9d42b4f19df7e20b625b2044a7de81d95f6dff29 diff --git a/solr/licenses/jsoup-1.21.2.jar.sha1 b/solr/licenses/jsoup-1.21.2.jar.sha1 new file mode 100644 index 000000000000..1c7af28ffae2 --- /dev/null +++ b/solr/licenses/jsoup-1.21.2.jar.sha1 @@ -0,0 +1 @@ +55ba93337201b6f1208a6691f291ca2828860150 diff --git a/solr/licenses/jsoup-LICENSE-MIT.txt b/solr/licenses/jsoup-LICENSE-MIT.txt new file mode 100644 index 000000000000..e4bf2be9fb7f --- /dev/null +++ b/solr/licenses/jsoup-LICENSE-MIT.txt @@ -0,0 +1,21 @@ +The MIT License + +Copyright (c) 2009-2025 Jonathan Hedley + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/solr/licenses/jsoup-NOTICE.txt b/solr/licenses/jsoup-NOTICE.txt new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/solr/licenses/jwarc-0.31.1.jar.sha1 b/solr/licenses/jwarc-0.31.1.jar.sha1 deleted file mode 100644 index 70e61b34744c..000000000000 --- a/solr/licenses/jwarc-0.31.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8b74f9ffc6922bc6e9353c148e8d6b916fb13b8a diff --git a/solr/licenses/jwarc-0.32.0.jar.sha1 b/solr/licenses/jwarc-0.32.0.jar.sha1 new file mode 100644 index 000000000000..5270743b3302 --- /dev/null +++ b/solr/licenses/jwarc-0.32.0.jar.sha1 @@ -0,0 +1 @@ +8c4cf0c3c205ffc1fd2bfb71e47ca2eda20d0182 diff --git a/solr/licenses/pdfbox-2.0.34.jar.sha1 b/solr/licenses/pdfbox-2.0.34.jar.sha1 deleted file mode 100644 index 096dd8837165..000000000000 --- a/solr/licenses/pdfbox-2.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b281d4339844e7614e425e84c2570687b18dc4ba diff --git a/solr/licenses/pdfbox-3.0.5.jar.sha1 b/solr/licenses/pdfbox-3.0.5.jar.sha1 new file mode 100644 index 000000000000..12d045a60009 --- /dev/null +++ b/solr/licenses/pdfbox-3.0.5.jar.sha1 @@ -0,0 +1 @@ +c34109061c3a0d85d871d9edc469ac0682f81856 diff --git a/solr/licenses/pdfbox-io-3.0.5.jar.sha1 b/solr/licenses/pdfbox-io-3.0.5.jar.sha1 new file mode 100644 index 000000000000..78d90c6363d6 --- /dev/null +++ b/solr/licenses/pdfbox-io-3.0.5.jar.sha1 @@ -0,0 +1 @@ +402151a8d1aa427ea879cc7160e9227e9f5088ba diff --git a/solr/licenses/pdfbox-tools-2.0.34.jar.sha1 b/solr/licenses/pdfbox-tools-2.0.34.jar.sha1 deleted file mode 100644 index b2ddcce9e8d4..000000000000 --- a/solr/licenses/pdfbox-tools-2.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ddc7e88c9add7ed5b123a5f07f9968110f5b3174 diff --git a/solr/licenses/pdfbox-tools-3.0.5.jar.sha1 b/solr/licenses/pdfbox-tools-3.0.5.jar.sha1 new file mode 100644 index 000000000000..35e29002cd62 --- /dev/null +++ b/solr/licenses/pdfbox-tools-3.0.5.jar.sha1 @@ -0,0 +1 @@ +c750d7ac52172f369b59f5bfc6d2d2f74c016002 diff --git a/solr/licenses/picocli-4.7.6.jar.sha1 b/solr/licenses/picocli-4.7.6.jar.sha1 new file mode 100644 index 000000000000..c63f30646a6d --- /dev/null +++ b/solr/licenses/picocli-4.7.6.jar.sha1 @@ -0,0 +1 @@ +77c2cb87814b6a03d431fc856024a9f8ff605ad4 diff --git a/solr/licenses/picocli-LICENSE-ASL.txt b/solr/licenses/picocli-LICENSE-ASL.txt new file mode 100644 index 000000000000..8dada3edaf50 --- /dev/null +++ b/solr/licenses/picocli-LICENSE-ASL.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/solr/licenses/picocli-NOTICE.txt b/solr/licenses/picocli-NOTICE.txt new file mode 100644 index 000000000000..160c63581257 --- /dev/null +++ b/solr/licenses/picocli-NOTICE.txt @@ -0,0 +1,351 @@ +This project includes one or more documentation files from OpenJDK, licensed under GPL v2 with Classpath Exception. + +These files are included in the source distributions, not in the binary distributions of this project. + +The GNU General Public License (GPL) + +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public License is intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. This General Public License applies to +most of the Free Software Foundation's software and to any other program whose +authors commit to using it. (Some other Free Software Foundation software is +covered by the GNU Library General Public License instead.) You can apply it to +your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom to +distribute copies of free software (and charge for this service if you wish), +that you receive source code or can get it if you want it, that you can change +the software or use pieces of it in new free programs; and that you know you +can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny +you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of the +software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for +a fee, you must give the recipients all the rights that you have. You must +make sure that they, too, receive or can get the source code. And you must +show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) +offer you this license which gives you legal permission to copy, distribute +and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients to +know that what they have is not the original, so that any problems introduced +by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We +wish to avoid the danger that redistributors of a free program will +individually obtain patent licenses, in effect making the program proprietary. +To prevent this, we have made it clear that any patent must be licensed for +everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms of +this General Public License. The "Program", below, refers to any such program +or work, and a "work based on the Program" means either the Program or any +derivative work under copyright law: that is to say, a work containing the +Program or a portion of it, either verbatim or with modifications and/or +translated into another language. (Hereinafter, translation is included +without limitation in the term "modification".) Each licensee is addressed as +"you". + +Activities other than copying, distribution and modification are not covered by +this License; they are outside its scope. The act of running the Program is +not restricted, and the output from the Program is covered only if its contents +constitute a work based on the Program (independent of having been made by +running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as +you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this License +and to the absence of any warranty; and give any other recipients of the +Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may +at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus +forming a work based on the Program, and copy and distribute such modifications +or work under the terms of Section 1 above, provided that you also meet all of +these conditions: + + a) You must cause the modified files to carry prominent notices stating + that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in whole or + in part contains or is derived from the Program or any part thereof, to be + licensed as a whole at no charge to all third parties under the terms of + this License. + + c) If the modified program normally reads commands interactively when run, + you must cause it, when started running for such interactive use in the + most ordinary way, to print or display an announcement including an + appropriate copyright notice and a notice that there is no warranty (or + else, saying that you provide a warranty) and that users may redistribute + the program under these conditions, and telling the user how to view a copy + of this License. (Exception: if the Program itself is interactive but does + not normally print such an announcement, your work based on the Program is + not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be reasonably +considered independent and separate works in themselves, then this License, and +its terms, do not apply to those sections when you distribute them as separate +works. But when you distribute the same sections as part of a whole which is a +work based on the Program, the distribution of the whole must be on the terms +of this License, whose permissions for other licensees extend to the entire +whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise the +right to control the distribution of derivative or collective works based on +the Program. + +In addition, mere aggregation of another work not based on the Program with the +Program (or with a work based on the Program) on a volume of a storage or +distribution medium does not bring the other work under the scope of this +License. + +3. You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections 1 and +2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable source + code, which must be distributed under the terms of Sections 1 and 2 above + on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three years, to + give any third party, for a charge no more than your cost of physically + performing source distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of Sections 1 + and 2 above on a medium customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer to + distribute corresponding source code. (This alternative is allowed only + for noncommercial distribution and only if you received the program in + object code or executable form with such an offer, in accord with + Subsection b above.) + +The source code for a work means the preferred form of the work for making +modifications to it. For an executable work, complete source code means all +the source code for all modules it contains, plus any associated interface +definition files, plus the scripts used to control compilation and installation +of the executable. However, as a special exception, the source code +distributed need not include anything that is normally distributed (in either +source or binary form) with the major components (compiler, kernel, and so on) +of the operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the source +code from the same place counts as distribution of the source code, even though +third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, modify, +sublicense or distribute the Program is void, and will automatically terminate +your rights under this License. However, parties who have received copies, or +rights, from you under this License will not have their licenses terminated so +long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. +However, nothing else grants you permission to modify or distribute the Program +or its derivative works. These actions are prohibited by law if you do not +accept this License. Therefore, by modifying or distributing the Program (or +any work based on the Program), you indicate your acceptance of this License to +do so, and all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), +the recipient automatically receives a license from the original licensor to +copy, distribute or modify the Program subject to these terms and conditions. +You may not impose any further restrictions on the recipients' exercise of the +rights granted herein. You are not responsible for enforcing compliance by +third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), conditions +are imposed on you (whether by court order, agreement or otherwise) that +contradict the conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as to satisfy +simultaneously your obligations under this License and any other pertinent +obligations, then as a consequence you may not distribute the Program at all. +For example, if a patent license would not permit royalty-free redistribution +of the Program by all those who receive copies directly or indirectly through +you, then the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and +the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or +other property right claims or to contest validity of any such claims; this +section has the sole purpose of protecting the integrity of the free software +distribution system, which is implemented by public license practices. Many +people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose that +choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original +copyright holder who places the Program under this License may add an explicit +geographical distribution limitation excluding those countries, so that +distribution is permitted only in or among countries not thus excluded. In +such case, this License incorporates the limitation as if written in the body +of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the +General Public License from time to time. Such new versions will be similar in +spirit to the present version, but may differ in detail to address new problems +or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any later +version", you have the option of following the terms and conditions either of +that version or of any later version published by the Free Software Foundation. +If the Program does not specify a version number of this License, you may +choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software Foundation, +write to the Free Software Foundation; we sometimes make exceptions for this. +Our decision will be guided by the two goals of preserving the free status of +all derivatives of our free software and of promoting the sharing and reuse of +software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR +THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE +PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, +YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL +ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE +PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR +INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA +BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER +OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible +use to the public, the best way to achieve this is to make it free software +which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach +them to the start of each source file to most effectively convey the exclusion +of warranty; and each file should have at least the "copyright" line and a +pointer to where the full notice is found. + + One line to give the program's name and a brief idea of what it does. + + Copyright (C) + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., 59 + Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it +starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes + with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free + software, and you are welcome to redistribute it under certain conditions; + type 'show c' for details. + +The hypothetical commands 'show w' and 'show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may be +called something other than 'show w' and 'show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, +if any, to sign a "copyright disclaimer" for the program, if necessary. Here +is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + 'Gnomovision' (which makes passes at compilers) written by James Hacker. + + signature of Ty Coon, 1 April 1989 + + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General Public +License instead of this License. + + +"CLASSPATH" EXCEPTION TO THE GPL + +Certain source files distributed by Oracle America and/or its affiliates are +subject to the following clarification and special exception to the GPL, but +only where Oracle has expressly included in the particular source file's header +the words "Oracle designates this particular file as subject to the "Classpath" +exception as provided by Oracle in the LICENSE file that accompanied this code." + + Linking this library statically or dynamically with other modules is making + a combined work based on this library. Thus, the terms and conditions of + the GNU General Public License cover the whole combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent modules, + and to copy and distribute the resulting executable under terms of your + choice, provided that you also meet, for each linked independent module, + the terms and conditions of the license of that module. An independent + module is a module which is not derived from or based on this library. If + you modify this library, you may extend this exception to your version of + the library, but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. diff --git a/solr/licenses/tagsoup-1.2.1.jar.sha1 b/solr/licenses/tagsoup-1.2.1.jar.sha1 deleted file mode 100644 index 5d227b11a0fa..000000000000 --- a/solr/licenses/tagsoup-1.2.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5584627487e984c03456266d3f8802eb85a9ce97 diff --git a/solr/licenses/tika-core-2.9.4.jar.sha1 b/solr/licenses/tika-core-2.9.4.jar.sha1 deleted file mode 100644 index c595971dd969..000000000000 --- a/solr/licenses/tika-core-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4bdd0defbd302b3cf93eadede429cac06d278639 diff --git a/solr/licenses/tika-core-3.2.3.jar.sha1 b/solr/licenses/tika-core-3.2.3.jar.sha1 new file mode 100644 index 000000000000..8ce1b12ec99f --- /dev/null +++ b/solr/licenses/tika-core-3.2.3.jar.sha1 @@ -0,0 +1 @@ +4b1b82f8cce72c9bd3676532c8b613e24041d96c diff --git a/solr/licenses/tika-parser-apple-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-apple-module-2.9.4.jar.sha1 deleted file mode 100644 index ca1d9d16350a..000000000000 --- a/solr/licenses/tika-parser-apple-module-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cdf8b2045baf159dcb62f30a7e9236ad1096cd3b diff --git a/solr/licenses/tika-parser-apple-module-3.2.3.jar.sha1 b/solr/licenses/tika-parser-apple-module-3.2.3.jar.sha1 new file mode 100644 index 000000000000..57678328f163 --- /dev/null +++ b/solr/licenses/tika-parser-apple-module-3.2.3.jar.sha1 @@ -0,0 +1 @@ +4fcf47eda153f1e286f9bfb2b771d3022e44e522 diff --git a/solr/licenses/tika-parser-audiovideo-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-audiovideo-module-2.9.4.jar.sha1 deleted file mode 100644 index d27fd837aa29..000000000000 --- a/solr/licenses/tika-parser-audiovideo-module-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6a1e110f80d105cc539b07aa497905e6ada07ed2 diff --git a/solr/licenses/tika-parser-audiovideo-module-3.2.3.jar.sha1 b/solr/licenses/tika-parser-audiovideo-module-3.2.3.jar.sha1 new file mode 100644 index 000000000000..7a945f08f89a --- /dev/null +++ b/solr/licenses/tika-parser-audiovideo-module-3.2.3.jar.sha1 @@ -0,0 +1 @@ +c68492ed620a7b8c16a8f612a13aec83db07fa88 diff --git a/solr/licenses/tika-parser-cad-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-cad-module-2.9.4.jar.sha1 deleted file mode 100644 index 21250a92413f..000000000000 --- a/solr/licenses/tika-parser-cad-module-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9adaf41d1695629f28e127240a5488009f6319c5 diff --git a/solr/licenses/tika-parser-cad-module-3.2.3.jar.sha1 b/solr/licenses/tika-parser-cad-module-3.2.3.jar.sha1 new file mode 100644 index 000000000000..faf511fdf155 --- /dev/null +++ b/solr/licenses/tika-parser-cad-module-3.2.3.jar.sha1 @@ -0,0 +1 @@ +b6f89485e80ce87c11251cea05391ab54f94e559 diff --git a/solr/licenses/tika-parser-code-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-code-module-2.9.4.jar.sha1 deleted file mode 100644 index 4695bbea1167..000000000000 --- a/solr/licenses/tika-parser-code-module-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9ead684d29df6da371184ed7cec855449ce5d70e diff --git a/solr/licenses/tika-parser-code-module-3.2.3.jar.sha1 b/solr/licenses/tika-parser-code-module-3.2.3.jar.sha1 new file mode 100644 index 000000000000..5a31dce196ee --- /dev/null +++ b/solr/licenses/tika-parser-code-module-3.2.3.jar.sha1 @@ -0,0 +1 @@ +373e6d096d3407e602b0a7758b4719374fbfe833 diff --git a/solr/licenses/tika-parser-crypto-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-crypto-module-2.9.4.jar.sha1 deleted file mode 100644 index 1cc3362fce15..000000000000 --- a/solr/licenses/tika-parser-crypto-module-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8d5861e6e00108ff69434c17ef8a1c0232f52c50 diff --git a/solr/licenses/tika-parser-crypto-module-3.2.3.jar.sha1 b/solr/licenses/tika-parser-crypto-module-3.2.3.jar.sha1 new file mode 100644 index 000000000000..66c1879d142d --- /dev/null +++ b/solr/licenses/tika-parser-crypto-module-3.2.3.jar.sha1 @@ -0,0 +1 @@ +fcb75a3d27a13d7a8afd3daa4260034677e54cf7 diff --git a/solr/licenses/tika-parser-digest-commons-2.9.4.jar.sha1 b/solr/licenses/tika-parser-digest-commons-2.9.4.jar.sha1 deleted file mode 100644 index b147e973907b..000000000000 --- a/solr/licenses/tika-parser-digest-commons-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -21ddd181b559b2734eb25c4e7a3132ae66c6c8af diff --git a/solr/licenses/tika-parser-digest-commons-3.2.3.jar.sha1 b/solr/licenses/tika-parser-digest-commons-3.2.3.jar.sha1 new file mode 100644 index 000000000000..37ab03eb6da1 --- /dev/null +++ b/solr/licenses/tika-parser-digest-commons-3.2.3.jar.sha1 @@ -0,0 +1 @@ +79181274ef25ce84d2a80d9060f14c7c582eafbb diff --git a/solr/licenses/tika-parser-font-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-font-module-2.9.4.jar.sha1 deleted file mode 100644 index ba6566955e46..000000000000 --- a/solr/licenses/tika-parser-font-module-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ded1c7fd14319a7c4162b556d0f70cc14b01200c diff --git a/solr/licenses/tika-parser-font-module-3.2.3.jar.sha1 b/solr/licenses/tika-parser-font-module-3.2.3.jar.sha1 new file mode 100644 index 000000000000..9e877a248356 --- /dev/null +++ b/solr/licenses/tika-parser-font-module-3.2.3.jar.sha1 @@ -0,0 +1 @@ +4d4f699721444bf137d11b21d483715822baafdb diff --git a/solr/licenses/tika-parser-html-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-html-module-2.9.4.jar.sha1 deleted file mode 100644 index 8862579db378..000000000000 --- a/solr/licenses/tika-parser-html-module-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d01f8d79ae2551be1c65c8e1e0d92e1b4799e0f3 diff --git a/solr/licenses/tika-parser-html-module-3.2.3.jar.sha1 b/solr/licenses/tika-parser-html-module-3.2.3.jar.sha1 new file mode 100644 index 000000000000..832c41ffbfaa --- /dev/null +++ b/solr/licenses/tika-parser-html-module-3.2.3.jar.sha1 @@ -0,0 +1 @@ +6ae9096485dca894ddd19a74b0243ffd91a9f634 diff --git a/solr/licenses/tika-parser-image-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-image-module-2.9.4.jar.sha1 deleted file mode 100644 index ac0cee163a30..000000000000 --- a/solr/licenses/tika-parser-image-module-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -42c0b629b65cf585a3b386539f365935fe5a0879 diff --git a/solr/licenses/tika-parser-image-module-3.2.3.jar.sha1 b/solr/licenses/tika-parser-image-module-3.2.3.jar.sha1 new file mode 100644 index 000000000000..c5f73d89992f --- /dev/null +++ b/solr/licenses/tika-parser-image-module-3.2.3.jar.sha1 @@ -0,0 +1 @@ +1562ccc3d5d87f690ea0fdc7979ed4b348842cf8 diff --git a/solr/licenses/tika-parser-mail-commons-2.9.4.jar.sha1 b/solr/licenses/tika-parser-mail-commons-2.9.4.jar.sha1 deleted file mode 100644 index fc7a7ef28e3c..000000000000 --- a/solr/licenses/tika-parser-mail-commons-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -eabea7eecc857872990fd298244a60ead586cb49 diff --git a/solr/licenses/tika-parser-mail-commons-3.2.3.jar.sha1 b/solr/licenses/tika-parser-mail-commons-3.2.3.jar.sha1 new file mode 100644 index 000000000000..4a04c638c163 --- /dev/null +++ b/solr/licenses/tika-parser-mail-commons-3.2.3.jar.sha1 @@ -0,0 +1 @@ +37f85296b9d175dbb7397a4847d62050ac76bf91 diff --git a/solr/licenses/tika-parser-mail-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-mail-module-2.9.4.jar.sha1 deleted file mode 100644 index 5cbb75f7d893..000000000000 --- a/solr/licenses/tika-parser-mail-module-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aaef1b39b1b76d99f254bc1e13b937b3ba0e59cf diff --git a/solr/licenses/tika-parser-mail-module-3.2.3.jar.sha1 b/solr/licenses/tika-parser-mail-module-3.2.3.jar.sha1 new file mode 100644 index 000000000000..1726d390b8b2 --- /dev/null +++ b/solr/licenses/tika-parser-mail-module-3.2.3.jar.sha1 @@ -0,0 +1 @@ +8e5a65ede54f4ba2e90fd91fe7ebb92bec59a921 diff --git a/solr/licenses/tika-parser-microsoft-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-microsoft-module-2.9.4.jar.sha1 deleted file mode 100644 index 77a1c7dc5be0..000000000000 --- a/solr/licenses/tika-parser-microsoft-module-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -818f3baee8765400c5836c36b66e1b6ba38875d5 diff --git a/solr/licenses/tika-parser-microsoft-module-3.2.3.jar.sha1 b/solr/licenses/tika-parser-microsoft-module-3.2.3.jar.sha1 new file mode 100644 index 000000000000..c61184e753b6 --- /dev/null +++ b/solr/licenses/tika-parser-microsoft-module-3.2.3.jar.sha1 @@ -0,0 +1 @@ +825dce18d0f020245e3c79ef879ea2d8c6c50858 diff --git a/solr/licenses/tika-parser-miscoffice-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-miscoffice-module-2.9.4.jar.sha1 deleted file mode 100644 index b1a482a213be..000000000000 --- a/solr/licenses/tika-parser-miscoffice-module-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3ad33d6a4530f75f27fd014f5f841de01d8aa4af diff --git a/solr/licenses/tika-parser-miscoffice-module-3.2.3.jar.sha1 b/solr/licenses/tika-parser-miscoffice-module-3.2.3.jar.sha1 new file mode 100644 index 000000000000..ca6c3fab6b8f --- /dev/null +++ b/solr/licenses/tika-parser-miscoffice-module-3.2.3.jar.sha1 @@ -0,0 +1 @@ +5c04621cfedfe61e93c138caff62e452fa468094 diff --git a/solr/licenses/tika-parser-news-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-news-module-2.9.4.jar.sha1 deleted file mode 100644 index ab4cc3454fca..000000000000 --- a/solr/licenses/tika-parser-news-module-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -82d8f899ba997c65faa4ad92c7921aaa4d43d004 diff --git a/solr/licenses/tika-parser-news-module-3.2.3.jar.sha1 b/solr/licenses/tika-parser-news-module-3.2.3.jar.sha1 new file mode 100644 index 000000000000..a827d4c3e514 --- /dev/null +++ b/solr/licenses/tika-parser-news-module-3.2.3.jar.sha1 @@ -0,0 +1 @@ +5f5da73a684659206b1547a6e3a46657d8ef251b diff --git a/solr/licenses/tika-parser-ocr-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-ocr-module-2.9.4.jar.sha1 deleted file mode 100644 index 9275f2b05a3f..000000000000 --- a/solr/licenses/tika-parser-ocr-module-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4f48fee50698b5820e222363654fc27e23b1ce7a diff --git a/solr/licenses/tika-parser-ocr-module-3.2.3.jar.sha1 b/solr/licenses/tika-parser-ocr-module-3.2.3.jar.sha1 new file mode 100644 index 000000000000..e3a3b45a747c --- /dev/null +++ b/solr/licenses/tika-parser-ocr-module-3.2.3.jar.sha1 @@ -0,0 +1 @@ +79f6d44b6f855926f662179b53fd585b6b8328c0 diff --git a/solr/licenses/tika-parser-pdf-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-pdf-module-2.9.4.jar.sha1 deleted file mode 100644 index d639e0009839..000000000000 --- a/solr/licenses/tika-parser-pdf-module-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -50a6c3835aab4789721e81912cd84ca309ea1640 diff --git a/solr/licenses/tika-parser-pdf-module-3.2.3.jar.sha1 b/solr/licenses/tika-parser-pdf-module-3.2.3.jar.sha1 new file mode 100644 index 000000000000..14408d6bd7fd --- /dev/null +++ b/solr/licenses/tika-parser-pdf-module-3.2.3.jar.sha1 @@ -0,0 +1 @@ +34c45469166d3fca75785632540ec77ee59d79e0 diff --git a/solr/licenses/tika-parser-pkg-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-pkg-module-2.9.4.jar.sha1 deleted file mode 100644 index 660aee35ca76..000000000000 --- a/solr/licenses/tika-parser-pkg-module-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0758b28eef96817bcbb6aff506db70c7959f41bc diff --git a/solr/licenses/tika-parser-pkg-module-3.2.3.jar.sha1 b/solr/licenses/tika-parser-pkg-module-3.2.3.jar.sha1 new file mode 100644 index 000000000000..35973dd1fbf4 --- /dev/null +++ b/solr/licenses/tika-parser-pkg-module-3.2.3.jar.sha1 @@ -0,0 +1 @@ +2a374447251210be981b20deb4b467f8f1f5ac67 diff --git a/solr/licenses/tika-parser-text-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-text-module-2.9.4.jar.sha1 deleted file mode 100644 index f2d43d69d771..000000000000 --- a/solr/licenses/tika-parser-text-module-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1e3e434dfb14809025c8447001a06d6f2b8ecab7 diff --git a/solr/licenses/tika-parser-text-module-3.2.3.jar.sha1 b/solr/licenses/tika-parser-text-module-3.2.3.jar.sha1 new file mode 100644 index 000000000000..e53761617dba --- /dev/null +++ b/solr/licenses/tika-parser-text-module-3.2.3.jar.sha1 @@ -0,0 +1 @@ +d64ee44ba458c9264e1451af91c99f47027c4386 diff --git a/solr/licenses/tika-parser-webarchive-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-webarchive-module-2.9.4.jar.sha1 deleted file mode 100644 index 07a897cc401b..000000000000 --- a/solr/licenses/tika-parser-webarchive-module-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7243dafc296eab4d24a69395c6340975a141ebb7 diff --git a/solr/licenses/tika-parser-webarchive-module-3.2.3.jar.sha1 b/solr/licenses/tika-parser-webarchive-module-3.2.3.jar.sha1 new file mode 100644 index 000000000000..ea16d8cc76ac --- /dev/null +++ b/solr/licenses/tika-parser-webarchive-module-3.2.3.jar.sha1 @@ -0,0 +1 @@ +36957d104c83d24e5c68309381e1b04f046733a6 diff --git a/solr/licenses/tika-parser-xml-module-2.9.4.jar.sha1 b/solr/licenses/tika-parser-xml-module-2.9.4.jar.sha1 deleted file mode 100644 index c22cd24b701a..000000000000 --- a/solr/licenses/tika-parser-xml-module-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -785786bf9f0e161868ed0ca35d4d68e774de7c94 diff --git a/solr/licenses/tika-parser-xml-module-3.2.3.jar.sha1 b/solr/licenses/tika-parser-xml-module-3.2.3.jar.sha1 new file mode 100644 index 000000000000..b7e1d5924a1d --- /dev/null +++ b/solr/licenses/tika-parser-xml-module-3.2.3.jar.sha1 @@ -0,0 +1 @@ +f680492ecba78714c396f07ab06a88b95c78f7c5 diff --git a/solr/licenses/tika-parser-xmp-commons-2.9.4.jar.sha1 b/solr/licenses/tika-parser-xmp-commons-2.9.4.jar.sha1 deleted file mode 100644 index 7534c7678f90..000000000000 --- a/solr/licenses/tika-parser-xmp-commons-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e250a0d48e8a15eea64e4cad2b090da72fb4035a diff --git a/solr/licenses/tika-parser-xmp-commons-3.2.3.jar.sha1 b/solr/licenses/tika-parser-xmp-commons-3.2.3.jar.sha1 new file mode 100644 index 000000000000..7c6ca7ed674a --- /dev/null +++ b/solr/licenses/tika-parser-xmp-commons-3.2.3.jar.sha1 @@ -0,0 +1 @@ +59009291a517f8b397f20acb1b7616e4c6f34baa diff --git a/solr/licenses/tika-parser-zip-commons-2.9.4.jar.sha1 b/solr/licenses/tika-parser-zip-commons-2.9.4.jar.sha1 deleted file mode 100644 index c360903139a4..000000000000 --- a/solr/licenses/tika-parser-zip-commons-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bacc10f4d5637cf9efe56d111ef74c8838368a79 diff --git a/solr/licenses/tika-parser-zip-commons-3.2.3.jar.sha1 b/solr/licenses/tika-parser-zip-commons-3.2.3.jar.sha1 new file mode 100644 index 000000000000..7420068605ed --- /dev/null +++ b/solr/licenses/tika-parser-zip-commons-3.2.3.jar.sha1 @@ -0,0 +1 @@ +0ef5f13d4e520d46b62ce516345ecd05bf2bcf74 diff --git a/solr/licenses/tika-parsers-standard-package-2.9.4.jar.sha1 b/solr/licenses/tika-parsers-standard-package-2.9.4.jar.sha1 deleted file mode 100644 index 132c2cc90302..000000000000 --- a/solr/licenses/tika-parsers-standard-package-2.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -00351eee6dda0b75110a804412a1bb3023422faf diff --git a/solr/licenses/tika-parsers-standard-package-3.2.3.jar.sha1 b/solr/licenses/tika-parsers-standard-package-3.2.3.jar.sha1 new file mode 100644 index 000000000000..7a8ff2601fcd --- /dev/null +++ b/solr/licenses/tika-parsers-standard-package-3.2.3.jar.sha1 @@ -0,0 +1 @@ +ce614a5e2708e86bfb5bbfec1558784fddd0bf41 diff --git a/solr/licenses/txw2-2.3.9.jar.sha1 b/solr/licenses/txw2-2.3.9.jar.sha1 deleted file mode 100644 index e7f3bdb77b8a..000000000000 --- a/solr/licenses/txw2-2.3.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -13a78453a89bf7d268382a520cba4d5435c5adfc diff --git a/solr/licenses/xmpbox-2.0.34.jar.sha1 b/solr/licenses/xmpbox-2.0.34.jar.sha1 deleted file mode 100644 index ffe43721f516..000000000000 --- a/solr/licenses/xmpbox-2.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -58f9a6ff00cc4b46c590b7d234bce70637db12d4 diff --git a/solr/licenses/xmpbox-3.0.5.jar.sha1 b/solr/licenses/xmpbox-3.0.5.jar.sha1 new file mode 100644 index 000000000000..ce8fbc06f30c --- /dev/null +++ b/solr/licenses/xmpbox-3.0.5.jar.sha1 @@ -0,0 +1 @@ +7fbe124262a2879c9dfeb939b88679a022ee1817 diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile index 97dd5a9adbd3..16a4e385c8b5 100644 --- a/solr/modules/analysis-extras/gradle.lockfile +++ b/solr/modules/analysis-extras/gradle.lockfile @@ -34,7 +34,7 @@ com.microsoft.onnxruntime:onnxruntime:1.22.0=compileClasspath,jarValidation,runt com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -commons-io:commons-io:2.17.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfile index 8af164aa78c5..84e826609193 100644 --- a/solr/modules/clustering/gradle.lockfile +++ b/solr/modules/clustering/gradle.lockfile @@ -32,7 +32,7 @@ com.lmax:disruptor:3.4.4=solrPlatformLibs com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile index ec5f3d42aba2..746981fa5c15 100644 --- a/solr/modules/cross-dc/gradle.lockfile +++ b/solr/modules/cross-dc/gradle.lockfile @@ -33,7 +33,7 @@ com.lmax:disruptor:3.4.4=solrPlatformLibs com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -commons-io:commons-io:2.17.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile index 688f514ff8bf..789cc97d2e13 100644 --- a/solr/modules/extraction/gradle.lockfile +++ b/solr/modules/extraction/gradle.lockfile @@ -7,17 +7,13 @@ com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.3=jarValidation, com.carrotsearch:hppc:0.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.drewnoakes:metadata-extractor:2.19.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.epam:parso:2.0.14=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.19.0=permitUnusedDeclared -com.fasterxml.jackson.core:jackson-annotations:2.20=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.19.0=permitUnusedDeclared -com.fasterxml.jackson.core:jackson-core:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.19.0=permitUnusedDeclared -com.fasterxml.jackson.core:jackson-databind:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.20=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.20.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.20.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.19.0=permitUnusedDeclared -com.fasterxml.jackson:jackson-bom:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.20.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.github.albfernandez:juniversalchardet:2.5.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.2.2=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath @@ -48,17 +44,14 @@ com.lmax:disruptor:3.4.4=solrPlatformLibs com.pff:java-libpst:0.9.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.rometools:rome-utils:2.1.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.rometools:rome:2.1.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.sun.activation:jakarta.activation:1.2.2=jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testRuntimeClasspath -com.sun.istack:istack-commons-runtime:3.0.12=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.sun.istack:istack-commons-runtime:4.1.2=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.zaxxer:SparseBitSet:1.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -commons-codec:commons-codec:1.18.0=permitUnusedDeclared -commons-codec:commons-codec:1.19.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.17.0=solrPlatformLibs -commons-io:commons-io:2.18.0=permitUnusedDeclared -commons-io:commons-io:2.19.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.19.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.3.5=permitUnusedDeclared +info.picocli:picocli:4.7.6=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -86,22 +79,21 @@ io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeC io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.commons:commons-collections4:4.5.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.commons:commons-compress:1.27.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.commons:commons-csv:1.14.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.commons:commons-exec:1.4.0=permitUnusedDeclared -org.apache.commons:commons-exec:1.5.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.commons:commons-lang3:3.17.0=permitUnusedDeclared -org.apache.commons:commons-lang3:3.18.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-compress:1.28.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-csv:1.14.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-exec:1.5.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.18.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-math3:3.6.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -109,8 +101,8 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.james:apache-mime4j-core:0.8.12=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.james:apache-mime4j-dom:0.8.12=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.james:apache-mime4j-core:0.8.13=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.james:apache-mime4j-dom:0.8.13=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-1.2-api:2.25.1=solrPlatformLibs org.apache.logging.log4j:log4j-api:2.24.3=permitUnusedDeclared org.apache.logging.log4j:log4j-api:2.25.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -140,55 +132,53 @@ org.apache.lucene:lucene-spatial-extras:10.2.1=jarValidation,runtimeClasspath,ru org.apache.lucene:lucene-spatial3d:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-suggest:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-test-framework:10.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath -org.apache.pdfbox:fontbox:2.0.34=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.pdfbox:fontbox:3.0.5=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.pdfbox:jbig2-imageio:3.0.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.pdfbox:jempbox:1.8.17=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.pdfbox:pdfbox-tools:2.0.34=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.pdfbox:pdfbox:2.0.34=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.pdfbox:xmpbox:2.0.34=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.pdfbox:pdfbox-io:3.0.5=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.pdfbox:pdfbox-tools:3.0.5=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.pdfbox:pdfbox:3.0.5=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.pdfbox:xmpbox:3.0.5=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.poi:poi-ooxml-lite:5.4.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.poi:poi-ooxml:5.4.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.poi:poi-scratchpad:5.4.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.poi:poi:5.4.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-core:2.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-apple-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-audiovideo-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-cad-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-code-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-crypto-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-digest-commons:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-font-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-html-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-image-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-mail-commons:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-mail-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-microsoft-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-miscoffice-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-news-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-ocr-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-pdf-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-pkg-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-text-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-webarchive-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-xml-module:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-xmp-commons:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parser-zip-commons:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-parsers-standard-package:2.9.4=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-core:3.2.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-apple-module:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-audiovideo-module:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-cad-module:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-code-module:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-crypto-module:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-digest-commons:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-font-module:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-html-module:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-image-module:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-mail-commons:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-mail-module:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-microsoft-module:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-miscoffice-module:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-news-module:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-ocr-module:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-pdf-module:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-pkg-module:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-text-module:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-webarchive-module:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-xml-module:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-xmp-commons:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parser-zip-commons:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-parsers-standard-package:3.2.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.xmlbeans:xmlbeans:5.3.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath -org.bouncycastle:bcmail-jdk18on:1.80=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.bouncycastle:bcpkix-jdk18on:1.80=permitUnusedDeclared -org.bouncycastle:bcpkix-jdk18on:1.81=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.bouncycastle:bcprov-jdk18on:1.80=permitUnusedDeclared -org.bouncycastle:bcprov-jdk18on:1.81=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.bouncycastle:bcutil-jdk18on:1.80=permitUnusedDeclared -org.bouncycastle:bcutil-jdk18on:1.81=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.bouncycastle:bcjmail-jdk18on:1.81=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.bouncycastle:bcpkix-jdk18on:1.81=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.bouncycastle:bcprov-jdk18on:1.81=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.bouncycastle:bcutil-jdk18on:1.81=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.brotli:dec:0.1.2=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.ccil.cowan.tagsoup:tagsoup:1.2.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.codelibs:jhighlight:1.1.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.angus:angus-activation:2.0.2=jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty.http2:jetty-http2-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -215,10 +205,9 @@ org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrP org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-utils:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:1.0.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.jaxb:jaxb-runtime:2.3.6=permitUnusedDeclared -org.glassfish.jaxb:jaxb-runtime:2.3.9=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:2.3.6=permitUnusedDeclared -org.glassfish.jaxb:txw2:2.3.9=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-core:4.0.5=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:4.0.5=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:4.0.5=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-common:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -229,12 +218,13 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=jarValidation,runtim org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jdom:jdom2:2.0.6.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.jsoup:jsoup:1.21.2=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.netpreserve:jwarc:0.31.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.netpreserve:jwarc:0.32.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.osgi:org.osgi.annotation.bundle:2.0.0=compileClasspath,testCompileClasspath org.osgi:org.osgi.annotation.versioning:1.1.2=compileClasspath,testCompileClasspath @@ -251,6 +241,5 @@ org.slf4j:slf4j-api:2.0.17=compileClasspath,jarValidation,permitUnusedDeclared,r org.tallison:jmatio:1.5=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.tukaani:xz:1.10=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.10.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -xerces:xercesImpl:2.12.2=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -xml-apis:xml-apis:1.4.01=permitUnusedDeclared +xerces:xercesImpl:2.12.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath empty=apiHelper,apiHelperTest,compileOnlyHelper,compileOnlyHelperTest,missingdoclet,packaging,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUsedUndeclared,signatures diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile index 9929a4804fd6..a3dc0d9cd687 100644 --- a/solr/modules/gcs-repository/gradle.lockfile +++ b/solr/modules/gcs-repository/gradle.lockfile @@ -61,7 +61,7 @@ com.lmax:disruptor:3.4.4=solrPlatformLibs com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.17.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index 4bc4ad65294e..ba830bdf0624 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -42,7 +42,7 @@ com.squareup.okio:okio:3.6.0=jarValidation,testCompileClasspath,testRuntimeClass com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile index 8f54351fc238..304c11012120 100644 --- a/solr/modules/langid/gradle.lockfile +++ b/solr/modules/langid/gradle.lockfile @@ -33,7 +33,7 @@ com.lmax:disruptor:3.4.4=solrPlatformLibs com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -108,8 +108,8 @@ org.apache.lucene:lucene-spatial3d:10.2.1=jarValidation,runtimeClasspath,runtime org.apache.lucene:lucene-suggest:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-test-framework:10.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.opennlp:opennlp-tools:2.5.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-core:2.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-langdetect:2.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-core:3.2.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-langdetect:3.2.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/llm/gradle.lockfile b/solr/modules/llm/gradle.lockfile index 254154d75177..4d95e7224f43 100644 --- a/solr/modules/llm/gradle.lockfile +++ b/solr/modules/llm/gradle.lockfile @@ -41,7 +41,7 @@ com.squareup.retrofit2:retrofit:2.9.0=jarValidation,runtimeClasspath,runtimeLibs com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath dev.ai4j:openai4j:0.22.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath dev.langchain4j:langchain4j-cohere:0.35.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath dev.langchain4j:langchain4j-core:0.35.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile index 5aa0e2e3fa8e..e659c496f7cc 100644 --- a/solr/modules/ltr/gradle.lockfile +++ b/solr/modules/ltr/gradle.lockfile @@ -32,7 +32,7 @@ com.lmax:disruptor:3.4.4=solrPlatformLibs com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index f7f7bacd6aae..d4ac4a6450ec 100644 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@ -38,7 +38,7 @@ com.squareup.okio:okio:3.15.0=jarValidation,runtimeClasspath,runtimeLibs,testRun com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile index 194dc0c7e783..7df58402b8e6 100644 --- a/solr/modules/s3-repository/gradle.lockfile +++ b/solr/modules/s3-repository/gradle.lockfile @@ -45,7 +45,7 @@ com.sun.istack:istack-commons-runtime:4.1.2=jarValidation,testCompileClasspath,t com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.17.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfile index 2fb5161a0b12..4e359294b459 100644 --- a/solr/modules/scripting/gradle.lockfile +++ b/solr/modules/scripting/gradle.lockfile @@ -32,7 +32,7 @@ com.lmax:disruptor:3.4.4=solrPlatformLibs com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile index 5b42aa0f19fa..a7988bc775ec 100644 --- a/solr/modules/sql/gradle.lockfile +++ b/solr/modules/sql/gradle.lockfile @@ -35,7 +35,7 @@ com.microsoft.onnxruntime:onnxruntime:1.22.0=jarValidation,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/prometheus-exporter/gradle.lockfile b/solr/prometheus-exporter/gradle.lockfile index 0330a8961574..0641e016a4a0 100644 --- a/solr/prometheus-exporter/gradle.lockfile +++ b/solr/prometheus-exporter/gradle.lockfile @@ -32,7 +32,7 @@ com.lmax:disruptor:3.4.4=jarValidation,runtimeClasspath,runtimeLibs,solrPlatform com.tdunning:t-digest:3.3=jarValidation,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath commons-codec:commons-codec:1.19.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfile index 5463d460d9db..6982171f53f9 100644 --- a/solr/server/gradle.lockfile +++ b/solr/server/gradle.lockfile @@ -31,7 +31,7 @@ com.lmax:disruptor:3.4.4=jarValidation,libExt,runtimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,solrCore commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,solrCore commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,solrCore -commons-io:commons-io:2.17.0=jarValidation,runtimeClasspath,solrCore +commons-io:commons-io:2.20.0=jarValidation,runtimeClasspath,solrCore io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,libExt,runtimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,libExt,runtimeClasspath,solrCore io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,libExt,runtimeClasspath,solrCore diff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfile index b933eea16332..cf14a27856fc 100644 --- a/solr/solr-ref-guide/gradle.lockfile +++ b/solr/solr-ref-guide/gradle.lockfile @@ -31,7 +31,7 @@ com.jayway.jsonpath:json-path:2.9.0=testRuntimeClasspath com.tdunning:t-digest:3.3=testRuntimeClasspath commons-cli:commons-cli:1.10.0=testRuntimeClasspath commons-codec:commons-codec:1.19.0=testRuntimeClasspath -commons-io:commons-io:2.17.0=testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=testRuntimeClasspath diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile index f2c57833944a..a6ef1b6c3781 100644 --- a/solr/solrj-streaming/gradle.lockfile +++ b/solr/solrj-streaming/gradle.lockfile @@ -32,7 +32,8 @@ com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath -commons-io:commons-io:2.17.0=jarValidation,permitTestUnusedDeclared,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.17.0=permitTestUnusedDeclared +commons-io:commons-io:2.20.0=jarValidation,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,testRuntimeClasspath diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfile index 8df8a2b58f9b..e0daef45fb78 100644 --- a/solr/solrj-zookeeper/gradle.lockfile +++ b/solr/solrj-zookeeper/gradle.lockfile @@ -37,7 +37,8 @@ com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath -commons-io:commons-io:2.17.0=apiHelper,compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.17.0=apiHelper +commons-io:commons-io:2.20.0=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,testRuntimeClasspath diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile index 6284d324a755..0495de6a01b2 100644 --- a/solr/solrj/gradle.lockfile +++ b/solr/solrj/gradle.lockfile @@ -32,7 +32,8 @@ com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,testRuntimeClasspath commons-codec:commons-codec:1.19.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.17.0=jarValidation,permitTestUnusedDeclared,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.17.0=permitTestUnusedDeclared +commons-io:commons-io:2.20.0=jarValidation,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,testRuntimeClasspath diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfile index 23c06e31b526..75408397b820 100644 --- a/solr/test-framework/gradle.lockfile +++ b/solr/test-framework/gradle.lockfile @@ -34,7 +34,7 @@ com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,tes com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath commons-cli:commons-cli:1.10.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-codec:commons-codec:1.19.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.17.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-graphite:4.2.26=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath diff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfile index 389640548caf..180145ad9cef 100644 --- a/solr/webapp/gradle.lockfile +++ b/solr/webapp/gradle.lockfile @@ -31,7 +31,7 @@ com.lmax:disruptor:3.4.4=serverLib com.tdunning:t-digest:3.3=permitUnusedDeclared,solrCore commons-cli:commons-cli:1.10.0=permitUnusedDeclared,solrCore commons-codec:commons-codec:1.19.0=permitUnusedDeclared,solrCore -commons-io:commons-io:2.17.0=permitUnusedDeclared,solrCore +commons-io:commons-io:2.20.0=permitUnusedDeclared,solrCore io.dropwizard.metrics:metrics-annotation:4.2.26=serverLib io.dropwizard.metrics:metrics-core:4.2.26=permitUnusedDeclared,serverLib,solrCore io.dropwizard.metrics:metrics-graphite:4.2.26=permitUnusedDeclared,serverLib,solrCore From ec09b15ee5e03d5479dcd7d274564299a29a6335 Mon Sep 17 00:00:00 2001 From: Christos Malliaridis Date: Sat, 20 Sep 2025 19:28:20 +0300 Subject: [PATCH 08/10] Fix breaking changes of Tika 3.X --- .../extraction/ExtractingDocumentLoader.java | 19 +++++++++++++------ .../ExtractingRequestHandlerTest.java | 8 ++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java index f5cce1faec2e..040ec70d5ca8 100644 --- a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java +++ b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java @@ -20,7 +20,9 @@ import java.io.InputStream; import java.io.StringWriter; import java.lang.invoke.MethodHandles; +import java.util.HashSet; import java.util.Locale; +import java.util.Set; import org.apache.solr.common.SolrException; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.params.UpdateParams; @@ -263,14 +265,19 @@ public void load( public static class MostlyPassthroughHtmlMapper implements HtmlMapper { public static final HtmlMapper INSTANCE = new MostlyPassthroughHtmlMapper(); - /** - * Keep all elements and their content. - * - *

Apparently <SCRIPT> and <STYLE> elements are blocked elsewhere - */ + /** Elements that are not relevant and can be discarded. */ + private static final Set DISCARDABLE_ELEMENTS = + new HashSet<>() { + { + add("STYLE"); + add("SCRIPT"); + } + }; + + /** Discard <STYLE> and <SCRIPT> elements. */ @Override public boolean isDiscardElement(String name) { - return false; + return DISCARDABLE_ELEMENTS.contains(name); } /** Lowercases the attribute name */ diff --git a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java index 38e8a120ed7d..0395e4921a7f 100644 --- a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java +++ b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java @@ -611,6 +611,10 @@ public void testPlainTextSpecifyingMimeType() throws Exception { "extractedLanguage", "fmap.X-TIKA:Parsed-By", "ignored_parser", + "fmap.X-TIKA:detectedEncoding", + "ignored_encoding", + "fmap.X-TIKA:encodingDetector", + "ignored_encoding_detector", "fmap.content", "extractedContent", ExtractingParams.STREAM_TYPE, @@ -647,6 +651,10 @@ public void testPlainTextSpecifyingResourceName() throws Exception { "ignored_parser", "fmap.X-TIKA:Parsed-By-Full-Set", "ignored_parser_set", + "fmap.X-TIKA:detectedEncoding", + "ignored_encoding", + "fmap.X-TIKA:encodingDetector", + "ignored_encoding_detector", "fmap.content", "extractedContent", ExtractingParams.RESOURCE_NAME, From b4ec90624d697e5fdabdabe8a814dc08fe24be6d Mon Sep 17 00:00:00 2001 From: Christos Malliaridis Date: Sat, 20 Sep 2025 19:36:26 +0300 Subject: [PATCH 09/10] Fix langdetect dependency in langid module --- gradle/libs.versions.toml | 2 +- solr/licenses/annotations-12.0.jar.sha1 | 1 + solr/licenses/jsonic-1.2.11.jar.sha1 | 1 + solr/licenses/jsonic-1.2.7.jar.sha1 | 1 - solr/licenses/language-detector-0.6.jar.sha1 | 1 + .../language-detector-LICENSE-ASL.txt | 88 +++++++++++++++++++ solr/licenses/language-detector-NOTICE.txt | 0 .../tika-langdetect-tika-3.2.3.jar.sha1 | 1 + solr/modules/langid/build.gradle | 3 +- solr/modules/langid/gradle.lockfile | 7 +- ...TikaLanguageIdentifierUpdateProcessor.java | 2 +- 11 files changed, 99 insertions(+), 8 deletions(-) create mode 100644 solr/licenses/annotations-12.0.jar.sha1 create mode 100644 solr/licenses/jsonic-1.2.11.jar.sha1 delete mode 100644 solr/licenses/jsonic-1.2.7.jar.sha1 create mode 100644 solr/licenses/language-detector-0.6.jar.sha1 create mode 100644 solr/licenses/language-detector-LICENSE-ASL.txt create mode 100644 solr/licenses/language-detector-NOTICE.txt create mode 100644 solr/licenses/tika-langdetect-tika-3.2.3.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aa817cf7befb..6205b26ffd27 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -292,7 +292,7 @@ apache-poi-ooxml = { module = "org.apache.poi:poi-ooxml", version.ref = "apache- apache-poi-poi = { module = "org.apache.poi:poi", version.ref = "apache-poi" } apache-rat-rat = { module = "org.apache.rat:apache-rat", version.ref = "apache-rat" } apache-tika-core = { module = "org.apache.tika:tika-core", version.ref = "apache-tika" } -apache-tika-langdetect = { module = "org.apache.tika:tika-langdetect", version.ref = "apache-tika" } +apache-tika-langdetect-tika = { module = "org.apache.tika:tika-langdetect-tika", version.ref = "apache-tika" } apache-tika-parser-html-module = { module = "org.apache.tika:tika-parser-html-module", version.ref = "apache-tika" } apache-tika-parsers-standard-package = { module = "org.apache.tika:tika-parsers-standard-package", version.ref = "apache-tika" } apache-tomcat-annotationsapi = { module = "org.apache.tomcat:annotations-api", version.ref = "apache-tomcat" } diff --git a/solr/licenses/annotations-12.0.jar.sha1 b/solr/licenses/annotations-12.0.jar.sha1 new file mode 100644 index 000000000000..8e8618350b1f --- /dev/null +++ b/solr/licenses/annotations-12.0.jar.sha1 @@ -0,0 +1 @@ +bbcf6448f6d40abe506e2c83b70a3e8bfd2b4539 diff --git a/solr/licenses/jsonic-1.2.11.jar.sha1 b/solr/licenses/jsonic-1.2.11.jar.sha1 new file mode 100644 index 000000000000..784aadc3a4f4 --- /dev/null +++ b/solr/licenses/jsonic-1.2.11.jar.sha1 @@ -0,0 +1 @@ +d85dcd1c5469673b58ec78ceae8a675e2c730c66 diff --git a/solr/licenses/jsonic-1.2.7.jar.sha1 b/solr/licenses/jsonic-1.2.7.jar.sha1 deleted file mode 100644 index 720e411da15b..000000000000 --- a/solr/licenses/jsonic-1.2.7.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9efb491fa27424c5e4773db449e8a2c551a75de5 diff --git a/solr/licenses/language-detector-0.6.jar.sha1 b/solr/licenses/language-detector-0.6.jar.sha1 new file mode 100644 index 000000000000..636bfd5eb30e --- /dev/null +++ b/solr/licenses/language-detector-0.6.jar.sha1 @@ -0,0 +1 @@ +52fee1eaa101f8d3e30b7095e1b6e0054d514dde diff --git a/solr/licenses/language-detector-LICENSE-ASL.txt b/solr/licenses/language-detector-LICENSE-ASL.txt new file mode 100644 index 000000000000..a62d849a2261 --- /dev/null +++ b/solr/licenses/language-detector-LICENSE-ASL.txt @@ -0,0 +1,88 @@ +Apache License, Version 2.0 + +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. + +Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. + +Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. + +You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + You must give any other recipients of the Work or Derivative Works a copy of this License; and + You must cause any modified files to carry prominent notices stating that You changed the files; and + You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + +You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. + +Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. + +This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. + +Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. + +In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. + +While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work + + To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/solr/licenses/language-detector-NOTICE.txt b/solr/licenses/language-detector-NOTICE.txt new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/solr/licenses/tika-langdetect-tika-3.2.3.jar.sha1 b/solr/licenses/tika-langdetect-tika-3.2.3.jar.sha1 new file mode 100644 index 000000000000..fdaff9ec1928 --- /dev/null +++ b/solr/licenses/tika-langdetect-tika-3.2.3.jar.sha1 @@ -0,0 +1 @@ +c841c39ddaccbecce5faf7ebf099688cb45a8c45 diff --git a/solr/modules/langid/build.gradle b/solr/modules/langid/build.gradle index 773461a4243a..ff652a660324 100644 --- a/solr/modules/langid/build.gradle +++ b/solr/modules/langid/build.gradle @@ -23,8 +23,7 @@ dependencies { implementation project(':solr:core') implementation project(':solr:solrj') - implementation(libs.apache.tika.core) { transitive = false } - implementation(libs.apache.tika.langdetect) + implementation libs.apache.tika.langdetect.tika implementation libs.commonsio.commonsio implementation libs.cybozulabs.langdetect implementation libs.apache.opennlp.tools diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile index 304c11012120..7f83e04b9437 100644 --- a/solr/modules/langid/gradle.lockfile +++ b/solr/modules/langid/gradle.lockfile @@ -27,9 +27,11 @@ com.google.guava:guava:33.4.8-jre=annotationProcessor,compileClasspath,errorpron com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor +com.intellij:annotations:12.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs +com.optimaize.languagedetector:language-detector:0.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -68,7 +70,7 @@ jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,r jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath -net.arnx:jsonic:1.2.7=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +net.arnx:jsonic:1.2.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.commons:commons-exec:1.5.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.commons:commons-lang3:3.18.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -108,8 +110,7 @@ org.apache.lucene:lucene-spatial3d:10.2.1=jarValidation,runtimeClasspath,runtime org.apache.lucene:lucene-suggest:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-test-framework:10.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.opennlp:opennlp-tools:2.5.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-core:3.2.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-langdetect:3.2.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-langdetect-tika:3.2.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java b/solr/modules/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java index 97fb7917fd66..a658dba50a2d 100644 --- a/solr/modules/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java +++ b/solr/modules/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java @@ -22,7 +22,7 @@ import java.util.List; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; -import org.apache.tika.language.LanguageIdentifier; +import org.apache.tika.langdetect.tika.LanguageIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; From d656a1b2dab7ee7b7efcaff45290aca0c677b01a Mon Sep 17 00:00:00 2001 From: Christos Malliaridis Date: Sun, 21 Sep 2025 11:38:08 +0300 Subject: [PATCH 10/10] Update aqute-bnd dependency --- gradle/libs.versions.toml | 2 +- solr/core/gradle.lockfile | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6205b26ffd27..5ae37afbec37 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -46,7 +46,7 @@ apache-tomcat = "6.0.53" apache-zookeeper = "3.9.4" # @keep for version alignment apiguardian = "1.1.2" -aqute-bnd = "6.4.1" +aqute-bnd = "7.1.0" # @keep Asciidoctor mathjax version used in ref-guide asciidoctor-mathjax = "0.0.9" # @keep Asciidoctor tabs version used in ref-guide diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile index 4307a4bcd9c7..18b8bde02146 100644 --- a/solr/core/gradle.lockfile +++ b/solr/core/gradle.lockfile @@ -1,8 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -biz.aQute.bnd:biz.aQute.bnd.annotation:6.4.1=compileOnlyHelper,jarValidation -biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0=compileClasspath,testCompileClasspath +biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0=compileClasspath,compileOnlyHelper,jarValidation,testCompileClasspath com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.3=jarValidation,testCompileClasspath,testRuntimeClasspath com.carrotsearch:hppc:0.10.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.20=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath