This is an automated email from the ASF dual-hosted git repository. epugh pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/solr.git
commit e11a2f47862ce71630c39093a1e5b829de6ee71d Author: Jan Høydahl <[email protected]> AuthorDate: Wed Feb 9 01:43:25 2022 +0100 SOLR-15907 Upgrade JWT dependencies mock-oauth2-server and jose4j --- solr/licenses/accessors-smart-1.2.jar.sha1 | 1 - solr/licenses/accessors-smart-2.4.7.jar.sha1 | 1 + solr/licenses/asm-7.2.jar.sha1 | 1 - solr/licenses/asm-9.1.jar.sha1 | 1 + solr/licenses/asm-commons-7.2.jar.sha1 | 1 - solr/licenses/asm-commons-9.1.jar.sha1 | 1 + ...LICENSE-BSD_LIKE.txt => bcmail-LICENSE-MIT.txt} | 0 solr/licenses/bcmail-jdk15on-1.69.jar.sha1 | 1 - solr/licenses/bcmail-jdk15on-1.70.jar.sha1 | 1 + ...LICENSE-BSD_LIKE.txt => bcpkix-LICENSE-MIT.txt} | 0 ...bcpkix-jdk15on-NOTICE.txt => bcpkix-NOTICE.txt} | 0 solr/licenses/bcpkix-jdk15on-1.69.jar.sha1 | 1 - solr/licenses/bcpkix-jdk15on-1.70.jar.sha1 | 1 + ...LICENSE-BSD_LIKE.txt => bcprov-LICENSE-MIT.txt} | 0 solr/licenses/bcprov-jdk15on-1.69.jar.sha1 | 1 - solr/licenses/bcprov-jdk15on-1.70.jar.sha1 | 1 + ...LICENSE-BSD_LIKE.txt => bcutil-LICENSE-MIT.txt} | 2 +- solr/licenses/bcutil-jdk15on-1.70.jar.sha1 | 1 + solr/licenses/content-type-2.1.jar.sha1 | 1 - solr/licenses/content-type-2.2.jar.sha1 | 1 + solr/licenses/jackson-annotations-2.12.3.jar.sha1 | 1 - solr/licenses/jackson-annotations-2.13.1.jar.sha1 | 1 + solr/licenses/jackson-core-2.12.3.jar.sha1 | 1 - solr/licenses/jackson-core-2.13.1.jar.sha1 | 1 + solr/licenses/jackson-databind-2.12.3.jar.sha1 | 1 - solr/licenses/jackson-databind-2.13.1.jar.sha1 | 1 + .../jackson-dataformat-cbor-2.12.3.jar.sha1 | 1 - .../jackson-dataformat-cbor-2.13.1.jar.sha1 | 1 + .../jackson-dataformat-smile-2.12.3.jar.sha1 | 1 - .../jackson-dataformat-smile-2.13.1.jar.sha1 | 1 + .../jackson-dataformat-xml-2.12.3.jar.sha1 | 1 - .../jackson-dataformat-xml-2.13.1.jar.sha1 | 1 + .../licenses/jackson-datatype-jdk8-2.12.3.jar.sha1 | 1 - .../licenses/jackson-datatype-jdk8-2.13.1.jar.sha1 | 1 + .../jackson-datatype-jsr310-2.12.3.jar.sha1 | 1 - .../jackson-datatype-jsr310-2.13.1.jar.sha1 | 1 + ...jackson-module-jaxb-annotations-2.12.3.jar.sha1 | 1 - ...jackson-module-jaxb-annotations-LICENSE-ASL.txt | 201 --------------------- .../jackson-module-jaxb-annotations-NOTICE.txt | 0 .../licenses/jackson-module-kotlin-2.12.3.jar.sha1 | 1 - .../licenses/jackson-module-kotlin-2.13.1.jar.sha1 | 1 + .../jackson-module-parameter-names-2.12.3.jar.sha1 | 1 - .../jackson-module-parameter-names-2.13.1.jar.sha1 | 1 + .../licenses/jakarta.activation-api-1.2.1.jar.sha1 | 1 - .../jakarta.activation-api-LICENSE-BSD_LIKE.txt | 13 -- solr/licenses/jakarta.activation-api-NOTICE.txt | 25 --- solr/licenses/jakarta.xml.bind-api-2.3.2.jar.sha1 | 1 - .../jakarta.xml.bind-api-LICENSE-BSD_LIKE.txt | 13 -- solr/licenses/jakarta.xml.bind-api-NOTICE.txt | 44 ----- solr/licenses/jose4j-0.7.7.jar.sha1 | 1 - solr/licenses/jose4j-0.7.9.jar.sha1 | 1 + solr/licenses/json-smart-2.3.jar.sha1 | 1 - solr/licenses/json-smart-2.4.7.jar.sha1 | 1 + solr/licenses/kotlin-logging-jvm-2.0.6.jar.sha1 | 1 - solr/licenses/kotlin-logging-jvm-2.1.21.jar.sha1 | 1 + solr/licenses/kotlin-reflect-1.4.32.jar.sha1 | 1 - solr/licenses/kotlin-reflect-1.6.10.jar.sha1 | 1 + solr/licenses/kotlin-stdlib-1.4.32.jar.sha1 | 1 - solr/licenses/kotlin-stdlib-1.6.10.jar.sha1 | 1 + solr/licenses/kotlin-stdlib-common-1.4.32.jar.sha1 | 1 - solr/licenses/kotlin-stdlib-common-1.6.10.jar.sha1 | 1 + solr/licenses/kotlin-stdlib-jdk7-1.4.10.jar.sha1 | 1 - solr/licenses/kotlin-stdlib-jdk7-1.6.0.jar.sha1 | 1 + solr/licenses/kotlin-stdlib-jdk8-1.4.10.jar.sha1 | 1 - solr/licenses/kotlin-stdlib-jdk8-1.6.0.jar.sha1 | 1 + solr/licenses/lang-tag-1.4.4.jar.sha1 | 1 - solr/licenses/lang-tag-1.5.jar.sha1 | 1 + solr/licenses/mock-oauth2-server-0.3.3.jar.sha1 | 1 - solr/licenses/mock-oauth2-server-0.4.3.jar.sha1 | 1 + solr/licenses/mockwebserver-4.9.1.jar.sha1 | 1 - solr/licenses/mockwebserver-4.9.3.jar.sha1 | 1 + solr/licenses/nimbus-jose-jwt-9.16.1.jar.sha1 | 1 + solr/licenses/nimbus-jose-jwt-9.6.1.jar.sha1 | 1 - solr/licenses/oauth2-oidc-sdk-9.2.3.jar.sha1 | 1 - solr/licenses/oauth2-oidc-sdk-9.22.2.jar.sha1 | 1 + solr/licenses/okhttp-4.9.1.jar.sha1 | 1 - solr/licenses/okhttp-4.9.3.jar.sha1 | 1 + solr/licenses/woodstox-core-6.2.4.jar.sha1 | 1 - solr/licenses/woodstox-core-6.2.7.jar.sha1 | 1 + .../security/jwt/JWTAuthPluginIntegrationTest.java | 8 +- versions.lock | 76 ++++---- versions.props | 4 +- 82 files changed, 76 insertions(+), 378 deletions(-) diff --git a/solr/licenses/accessors-smart-1.2.jar.sha1 b/solr/licenses/accessors-smart-1.2.jar.sha1 deleted file mode 100644 index 00907b4..0000000 --- a/solr/licenses/accessors-smart-1.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c592b500269bfde36096641b01238a8350f8aa31 diff --git a/solr/licenses/accessors-smart-2.4.7.jar.sha1 b/solr/licenses/accessors-smart-2.4.7.jar.sha1 new file mode 100644 index 0000000..6d865c8 --- /dev/null +++ b/solr/licenses/accessors-smart-2.4.7.jar.sha1 @@ -0,0 +1 @@ +3970cfc505e6657ca60f3aa57c849f6043000d7a diff --git a/solr/licenses/asm-7.2.jar.sha1 b/solr/licenses/asm-7.2.jar.sha1 deleted file mode 100644 index ccb16fa..0000000 --- a/solr/licenses/asm-7.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fa637eb67eb7628c915d73762b681ae7ff0b9731 diff --git a/solr/licenses/asm-9.1.jar.sha1 b/solr/licenses/asm-9.1.jar.sha1 new file mode 100644 index 0000000..5625582 --- /dev/null +++ b/solr/licenses/asm-9.1.jar.sha1 @@ -0,0 +1 @@ +a99500cf6eea30535eeac6be73899d048f8d12a8 diff --git a/solr/licenses/asm-commons-7.2.jar.sha1 b/solr/licenses/asm-commons-7.2.jar.sha1 deleted file mode 100644 index 3db5dac..0000000 --- a/solr/licenses/asm-commons-7.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ca2954e8d92a05bacc28ff465b25c70e0f512497 diff --git a/solr/licenses/asm-commons-9.1.jar.sha1 b/solr/licenses/asm-commons-9.1.jar.sha1 new file mode 100644 index 0000000..aac6596 --- /dev/null +++ b/solr/licenses/asm-commons-9.1.jar.sha1 @@ -0,0 +1 @@ +8b971b182eb5cf100b9e8d4119152d83e00e0fdd diff --git a/solr/licenses/bcprov-LICENSE-BSD_LIKE.txt b/solr/licenses/bcmail-LICENSE-MIT.txt similarity index 100% rename from solr/licenses/bcprov-LICENSE-BSD_LIKE.txt rename to solr/licenses/bcmail-LICENSE-MIT.txt diff --git a/solr/licenses/bcmail-jdk15on-1.69.jar.sha1 b/solr/licenses/bcmail-jdk15on-1.69.jar.sha1 deleted file mode 100644 index a2b1f8d..0000000 --- a/solr/licenses/bcmail-jdk15on-1.69.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -759f9233ac99a576e4963bd09b0f830a2716d2ec diff --git a/solr/licenses/bcmail-jdk15on-1.70.jar.sha1 b/solr/licenses/bcmail-jdk15on-1.70.jar.sha1 new file mode 100644 index 0000000..acc49ba --- /dev/null +++ b/solr/licenses/bcmail-jdk15on-1.70.jar.sha1 @@ -0,0 +1 @@ +08f4aafad90f6cc7f16b9992279828ae848c9e0d diff --git a/solr/licenses/bcpkix-jdk15on-LICENSE-BSD_LIKE.txt b/solr/licenses/bcpkix-LICENSE-MIT.txt similarity index 100% copy from solr/licenses/bcpkix-jdk15on-LICENSE-BSD_LIKE.txt copy to solr/licenses/bcpkix-LICENSE-MIT.txt diff --git a/solr/licenses/bcpkix-jdk15on-NOTICE.txt b/solr/licenses/bcpkix-NOTICE.txt similarity index 100% rename from solr/licenses/bcpkix-jdk15on-NOTICE.txt rename to solr/licenses/bcpkix-NOTICE.txt diff --git a/solr/licenses/bcpkix-jdk15on-1.69.jar.sha1 b/solr/licenses/bcpkix-jdk15on-1.69.jar.sha1 deleted file mode 100644 index 76113f2..0000000 --- a/solr/licenses/bcpkix-jdk15on-1.69.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -45c36fb72fafb0b688c6af795e6cc803f6f79ee5 diff --git a/solr/licenses/bcpkix-jdk15on-1.70.jar.sha1 b/solr/licenses/bcpkix-jdk15on-1.70.jar.sha1 new file mode 100644 index 0000000..07cad6d --- /dev/null +++ b/solr/licenses/bcpkix-jdk15on-1.70.jar.sha1 @@ -0,0 +1 @@ +f81e5af49571a9d5a109a88f239a73ce87055417 diff --git a/solr/licenses/bcmail-LICENSE-BSD_LIKE.txt b/solr/licenses/bcprov-LICENSE-MIT.txt similarity index 100% rename from solr/licenses/bcmail-LICENSE-BSD_LIKE.txt rename to solr/licenses/bcprov-LICENSE-MIT.txt diff --git a/solr/licenses/bcprov-jdk15on-1.69.jar.sha1 b/solr/licenses/bcprov-jdk15on-1.69.jar.sha1 deleted file mode 100644 index 865e022..0000000 --- a/solr/licenses/bcprov-jdk15on-1.69.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -91e1628251cf3ca90093ce9d0fe67e5b7dab3850 diff --git a/solr/licenses/bcprov-jdk15on-1.70.jar.sha1 b/solr/licenses/bcprov-jdk15on-1.70.jar.sha1 new file mode 100644 index 0000000..bef2daf --- /dev/null +++ b/solr/licenses/bcprov-jdk15on-1.70.jar.sha1 @@ -0,0 +1 @@ +4636a0d01f74acaf28082fb62b317f1080118371 diff --git a/solr/licenses/bcpkix-jdk15on-LICENSE-BSD_LIKE.txt b/solr/licenses/bcutil-LICENSE-MIT.txt similarity index 94% rename from solr/licenses/bcpkix-jdk15on-LICENSE-BSD_LIKE.txt rename to solr/licenses/bcutil-LICENSE-MIT.txt index 9dfdf7c..f40b132 100644 --- a/solr/licenses/bcpkix-jdk15on-LICENSE-BSD_LIKE.txt +++ b/solr/licenses/bcutil-LICENSE-MIT.txt @@ -1,4 +1,4 @@ -Copyright (c) 2000-2010 The Legion Of The Bouncy Castle (http://www.bouncycastle.org) +Copyright (c) 2000-2021 The Legion Of The Bouncy Castle (http://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, sublicense, diff --git a/solr/licenses/bcutil-jdk15on-1.70.jar.sha1 b/solr/licenses/bcutil-jdk15on-1.70.jar.sha1 new file mode 100644 index 0000000..73d7873 --- /dev/null +++ b/solr/licenses/bcutil-jdk15on-1.70.jar.sha1 @@ -0,0 +1 @@ +54280e7195a7430d7911ded93fc01e07300b9526 diff --git a/solr/licenses/content-type-2.1.jar.sha1 b/solr/licenses/content-type-2.1.jar.sha1 deleted file mode 100644 index efc8504..0000000 --- a/solr/licenses/content-type-2.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -66d618739859bc75ab9643b96a9839ac7802ec90 diff --git a/solr/licenses/content-type-2.2.jar.sha1 b/solr/licenses/content-type-2.2.jar.sha1 new file mode 100644 index 0000000..77741b9 --- /dev/null +++ b/solr/licenses/content-type-2.2.jar.sha1 @@ -0,0 +1 @@ +9a894bce7646dd4086652d85b88013229f23724b diff --git a/solr/licenses/jackson-annotations-2.12.3.jar.sha1 b/solr/licenses/jackson-annotations-2.12.3.jar.sha1 deleted file mode 100644 index de7b361..0000000 --- a/solr/licenses/jackson-annotations-2.12.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7275513412694a1aafd08c0287f48469fa0e6e17 diff --git a/solr/licenses/jackson-annotations-2.13.1.jar.sha1 b/solr/licenses/jackson-annotations-2.13.1.jar.sha1 new file mode 100644 index 0000000..80ab910 --- /dev/null +++ b/solr/licenses/jackson-annotations-2.13.1.jar.sha1 @@ -0,0 +1 @@ +1cbcbe4623113e6af92ccaa89884a345270f1a87 diff --git a/solr/licenses/jackson-core-2.12.3.jar.sha1 b/solr/licenses/jackson-core-2.12.3.jar.sha1 deleted file mode 100644 index 8d21e9b..0000000 --- a/solr/licenses/jackson-core-2.12.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -deb23fe2a7f2b773e18ced2b50d4acc1df8fa366 diff --git a/solr/licenses/jackson-core-2.13.1.jar.sha1 b/solr/licenses/jackson-core-2.13.1.jar.sha1 new file mode 100644 index 0000000..983ca6a --- /dev/null +++ b/solr/licenses/jackson-core-2.13.1.jar.sha1 @@ -0,0 +1 @@ +51ae921a2ed1e06ca8876f12f32f265e83c0b2b8 diff --git a/solr/licenses/jackson-databind-2.12.3.jar.sha1 b/solr/licenses/jackson-databind-2.12.3.jar.sha1 deleted file mode 100644 index 3c762ab..0000000 --- a/solr/licenses/jackson-databind-2.12.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d6153f8fc60c479ab0f9efb35c034526436a4953 diff --git a/solr/licenses/jackson-databind-2.13.1.jar.sha1 b/solr/licenses/jackson-databind-2.13.1.jar.sha1 new file mode 100644 index 0000000..acf95e6 --- /dev/null +++ b/solr/licenses/jackson-databind-2.13.1.jar.sha1 @@ -0,0 +1 @@ +698b2d2b15d9a1b7aae025f1d9f576842285e7f6 diff --git a/solr/licenses/jackson-dataformat-cbor-2.12.3.jar.sha1 b/solr/licenses/jackson-dataformat-cbor-2.12.3.jar.sha1 deleted file mode 100644 index 4edbe76..0000000 --- a/solr/licenses/jackson-dataformat-cbor-2.12.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d72a74232dd4cb9cd7b07fdec3bc87bf0078491f diff --git a/solr/licenses/jackson-dataformat-cbor-2.13.1.jar.sha1 b/solr/licenses/jackson-dataformat-cbor-2.13.1.jar.sha1 new file mode 100644 index 0000000..831df05 --- /dev/null +++ b/solr/licenses/jackson-dataformat-cbor-2.13.1.jar.sha1 @@ -0,0 +1 @@ +35cc80045c638fe6a383d64c87f2d513502abffa diff --git a/solr/licenses/jackson-dataformat-smile-2.12.3.jar.sha1 b/solr/licenses/jackson-dataformat-smile-2.12.3.jar.sha1 deleted file mode 100644 index 0610c41..0000000 --- a/solr/licenses/jackson-dataformat-smile-2.12.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f9be9f3ee1a04aafc501f1cf6850b18852f2178a diff --git a/solr/licenses/jackson-dataformat-smile-2.13.1.jar.sha1 b/solr/licenses/jackson-dataformat-smile-2.13.1.jar.sha1 new file mode 100644 index 0000000..f7cfdd9 --- /dev/null +++ b/solr/licenses/jackson-dataformat-smile-2.13.1.jar.sha1 @@ -0,0 +1 @@ +439357c78116a9c4e5dfff10e2eb4dea2b776c2f diff --git a/solr/licenses/jackson-dataformat-xml-2.12.3.jar.sha1 b/solr/licenses/jackson-dataformat-xml-2.12.3.jar.sha1 deleted file mode 100644 index 2bd78bd..0000000 --- a/solr/licenses/jackson-dataformat-xml-2.12.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d2a90460fecffa0c7ae9fd836272bbce91b5241a diff --git a/solr/licenses/jackson-dataformat-xml-2.13.1.jar.sha1 b/solr/licenses/jackson-dataformat-xml-2.13.1.jar.sha1 new file mode 100644 index 0000000..a4531b8 --- /dev/null +++ b/solr/licenses/jackson-dataformat-xml-2.13.1.jar.sha1 @@ -0,0 +1 @@ +bcc5e3a3056e6e98020856b52e53895ad5fdfc4b diff --git a/solr/licenses/jackson-datatype-jdk8-2.12.3.jar.sha1 b/solr/licenses/jackson-datatype-jdk8-2.12.3.jar.sha1 deleted file mode 100644 index 51220d4..0000000 --- a/solr/licenses/jackson-datatype-jdk8-2.12.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -77424ea087313312e308dae5ff8445608aabb5e1 diff --git a/solr/licenses/jackson-datatype-jdk8-2.13.1.jar.sha1 b/solr/licenses/jackson-datatype-jdk8-2.13.1.jar.sha1 new file mode 100644 index 0000000..2e1499b --- /dev/null +++ b/solr/licenses/jackson-datatype-jdk8-2.13.1.jar.sha1 @@ -0,0 +1 @@ +8ecfa9bcd714269fdf22c33f9fd00d0643bd0e21 diff --git a/solr/licenses/jackson-datatype-jsr310-2.12.3.jar.sha1 b/solr/licenses/jackson-datatype-jsr310-2.12.3.jar.sha1 deleted file mode 100644 index 899e236..0000000 --- a/solr/licenses/jackson-datatype-jsr310-2.12.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f69c636438dcf19c49960c1fe8901320ab85f989 diff --git a/solr/licenses/jackson-datatype-jsr310-2.13.1.jar.sha1 b/solr/licenses/jackson-datatype-jsr310-2.13.1.jar.sha1 new file mode 100644 index 0000000..0598f30 --- /dev/null +++ b/solr/licenses/jackson-datatype-jsr310-2.13.1.jar.sha1 @@ -0,0 +1 @@ +1ece5a87b59701328215e0083448b4d451857cbd diff --git a/solr/licenses/jackson-module-jaxb-annotations-2.12.3.jar.sha1 b/solr/licenses/jackson-module-jaxb-annotations-2.12.3.jar.sha1 deleted file mode 100644 index e9823b1..0000000 --- a/solr/licenses/jackson-module-jaxb-annotations-2.12.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ea843951d2efdd5e6844d6faa8aabf71698463a8 diff --git a/solr/licenses/jackson-module-jaxb-annotations-LICENSE-ASL.txt b/solr/licenses/jackson-module-jaxb-annotations-LICENSE-ASL.txt deleted file mode 100644 index 261eeb9..0000000 --- a/solr/licenses/jackson-module-jaxb-annotations-LICENSE-ASL.txt +++ /dev/null @@ -1,201 +0,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: - - (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/jackson-module-jaxb-annotations-NOTICE.txt b/solr/licenses/jackson-module-jaxb-annotations-NOTICE.txt deleted file mode 100644 index e69de29..0000000 diff --git a/solr/licenses/jackson-module-kotlin-2.12.3.jar.sha1 b/solr/licenses/jackson-module-kotlin-2.12.3.jar.sha1 deleted file mode 100644 index 93fa80d..0000000 --- a/solr/licenses/jackson-module-kotlin-2.12.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c8da7d998ed2e9253e62fdf15d1112c54b3ce6db diff --git a/solr/licenses/jackson-module-kotlin-2.13.1.jar.sha1 b/solr/licenses/jackson-module-kotlin-2.13.1.jar.sha1 new file mode 100644 index 0000000..77b1cdd --- /dev/null +++ b/solr/licenses/jackson-module-kotlin-2.13.1.jar.sha1 @@ -0,0 +1 @@ +e8633bb172310b84462ebf586058b3babdbaf4b1 diff --git a/solr/licenses/jackson-module-parameter-names-2.12.3.jar.sha1 b/solr/licenses/jackson-module-parameter-names-2.12.3.jar.sha1 deleted file mode 100644 index da9bbb0..0000000 --- a/solr/licenses/jackson-module-parameter-names-2.12.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -592a882beaf1bd57b8fe960b937a2706b090b4d7 diff --git a/solr/licenses/jackson-module-parameter-names-2.13.1.jar.sha1 b/solr/licenses/jackson-module-parameter-names-2.13.1.jar.sha1 new file mode 100644 index 0000000..3125dfd --- /dev/null +++ b/solr/licenses/jackson-module-parameter-names-2.13.1.jar.sha1 @@ -0,0 +1 @@ +cbeec2259213c555ef451a2e05f35ed1dbfbf799 diff --git a/solr/licenses/jakarta.activation-api-1.2.1.jar.sha1 b/solr/licenses/jakarta.activation-api-1.2.1.jar.sha1 deleted file mode 100644 index 7e7decf..0000000 --- a/solr/licenses/jakarta.activation-api-1.2.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -562a587face36ec7eff2db7f2fc95425c6602bc1 diff --git a/solr/licenses/jakarta.activation-api-LICENSE-BSD_LIKE.txt b/solr/licenses/jakarta.activation-api-LICENSE-BSD_LIKE.txt deleted file mode 100644 index e0cdfb1..0000000 --- a/solr/licenses/jakarta.activation-api-LICENSE-BSD_LIKE.txt +++ /dev/null @@ -1,13 +0,0 @@ -Eclipse Distribution License - v 1.0 - -Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors. - -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -- Neither the name of the Eclipse Foundation, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFI [...] \ No newline at end of file diff --git a/solr/licenses/jakarta.activation-api-NOTICE.txt b/solr/licenses/jakarta.activation-api-NOTICE.txt deleted file mode 100644 index 78e216f..0000000 --- a/solr/licenses/jakarta.activation-api-NOTICE.txt +++ /dev/null @@ -1,25 +0,0 @@ -# Notices for Jakarta Activation - -This content is produced and maintained by Jakarta Activation project. - -* Project home: https://projects.eclipse.org/projects/ee4j.jaf - -## 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 Eclipse Distribution License v. 1.0, -which is available at http://www.eclipse.org/org/documents/edl-v10.php. - -SPDX-License-Identifier: BSD-3-Clause - -## Source Code - -The project maintains the following source code repositories: - -* https://github.com/eclipse-ee4j/jaf diff --git a/solr/licenses/jakarta.xml.bind-api-2.3.2.jar.sha1 b/solr/licenses/jakarta.xml.bind-api-2.3.2.jar.sha1 deleted file mode 100644 index 14f8f9d..0000000 --- a/solr/licenses/jakarta.xml.bind-api-2.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8d49996a4338670764d7ca4b85a1c4ccf7fe665d diff --git a/solr/licenses/jakarta.xml.bind-api-LICENSE-BSD_LIKE.txt b/solr/licenses/jakarta.xml.bind-api-LICENSE-BSD_LIKE.txt deleted file mode 100644 index e0cdfb1..0000000 --- a/solr/licenses/jakarta.xml.bind-api-LICENSE-BSD_LIKE.txt +++ /dev/null @@ -1,13 +0,0 @@ -Eclipse Distribution License - v 1.0 - -Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors. - -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -- Neither the name of the Eclipse Foundation, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFI [...] \ No newline at end of file diff --git a/solr/licenses/jakarta.xml.bind-api-NOTICE.txt b/solr/licenses/jakarta.xml.bind-api-NOTICE.txt deleted file mode 100644 index 5aac171..0000000 --- a/solr/licenses/jakarta.xml.bind-api-NOTICE.txt +++ /dev/null @@ -1,44 +0,0 @@ -# Notices for Eclipse Project for JAXB - -This content is produced and maintained by the Eclipse Project for JAXB project. - -* Project home: https://projects.eclipse.org/projects/ee4j.jaxb - -## Trademarks - -Eclipse Project for JAXB is a trademark 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 Eclipse Distribution License v. 1.0 which is available -at http://www.eclipse.org/org/documents/edl-v10.php. - -SPDX-License-Identifier: BSD-3-Clause - -## Source Code - -The project maintains the following source code repositories: - -* https://github.com/eclipse-ee4j/jaxb-api - -## Third-party Content - -This project leverages the following third party content. - -None - -## Cryptography - -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. diff --git a/solr/licenses/jose4j-0.7.7.jar.sha1 b/solr/licenses/jose4j-0.7.7.jar.sha1 deleted file mode 100644 index c47ba06..0000000 --- a/solr/licenses/jose4j-0.7.7.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cf1a02839a251731e92ba0134268fec3f79d4868 diff --git a/solr/licenses/jose4j-0.7.9.jar.sha1 b/solr/licenses/jose4j-0.7.9.jar.sha1 new file mode 100644 index 0000000..ff27428 --- /dev/null +++ b/solr/licenses/jose4j-0.7.9.jar.sha1 @@ -0,0 +1 @@ +b44a2235728ab1cad9ffd06013500f09a5f1d241 diff --git a/solr/licenses/json-smart-2.3.jar.sha1 b/solr/licenses/json-smart-2.3.jar.sha1 deleted file mode 100644 index 5fc001e..0000000 --- a/solr/licenses/json-smart-2.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -007396407491352ce4fa30de92efb158adb76b5b diff --git a/solr/licenses/json-smart-2.4.7.jar.sha1 b/solr/licenses/json-smart-2.4.7.jar.sha1 new file mode 100644 index 0000000..92aebfd --- /dev/null +++ b/solr/licenses/json-smart-2.4.7.jar.sha1 @@ -0,0 +1 @@ +8d7f4c1530c07c54930935f3da85f48b83b3c109 diff --git a/solr/licenses/kotlin-logging-jvm-2.0.6.jar.sha1 b/solr/licenses/kotlin-logging-jvm-2.0.6.jar.sha1 deleted file mode 100644 index bd2d62c..0000000 --- a/solr/licenses/kotlin-logging-jvm-2.0.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -539f788429038f058f9c0da3cac14f7b653f0db8 diff --git a/solr/licenses/kotlin-logging-jvm-2.1.21.jar.sha1 b/solr/licenses/kotlin-logging-jvm-2.1.21.jar.sha1 new file mode 100644 index 0000000..590ef71 --- /dev/null +++ b/solr/licenses/kotlin-logging-jvm-2.1.21.jar.sha1 @@ -0,0 +1 @@ +7a65a2789a27c67c281a4fe9e78689cf5e2b36d8 diff --git a/solr/licenses/kotlin-reflect-1.4.32.jar.sha1 b/solr/licenses/kotlin-reflect-1.4.32.jar.sha1 deleted file mode 100644 index ba9373e..0000000 --- a/solr/licenses/kotlin-reflect-1.4.32.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ce852b166d97f0f1991b5130c2bb02e2ef6c554e diff --git a/solr/licenses/kotlin-reflect-1.6.10.jar.sha1 b/solr/licenses/kotlin-reflect-1.6.10.jar.sha1 new file mode 100644 index 0000000..c8ade64 --- /dev/null +++ b/solr/licenses/kotlin-reflect-1.6.10.jar.sha1 @@ -0,0 +1 @@ +1cbe9c92c12a94eea200d23c2bbaedaf3daf5132 diff --git a/solr/licenses/kotlin-stdlib-1.4.32.jar.sha1 b/solr/licenses/kotlin-stdlib-1.4.32.jar.sha1 deleted file mode 100644 index d51c831..0000000 --- a/solr/licenses/kotlin-stdlib-1.4.32.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -461367948840adbb0839c51d91ed74ef4a9ccb52 diff --git a/solr/licenses/kotlin-stdlib-1.6.10.jar.sha1 b/solr/licenses/kotlin-stdlib-1.6.10.jar.sha1 new file mode 100644 index 0000000..0014384 --- /dev/null +++ b/solr/licenses/kotlin-stdlib-1.6.10.jar.sha1 @@ -0,0 +1 @@ +b8af3fe6f1ca88526914929add63cf5e7c5049af diff --git a/solr/licenses/kotlin-stdlib-common-1.4.32.jar.sha1 b/solr/licenses/kotlin-stdlib-common-1.4.32.jar.sha1 deleted file mode 100644 index 969ef6a..0000000 --- a/solr/licenses/kotlin-stdlib-common-1.4.32.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ef50bfa2c0491a11dcc35d9822edbfd6170e1ea2 diff --git a/solr/licenses/kotlin-stdlib-common-1.6.10.jar.sha1 b/solr/licenses/kotlin-stdlib-common-1.6.10.jar.sha1 new file mode 100644 index 0000000..d502658 --- /dev/null +++ b/solr/licenses/kotlin-stdlib-common-1.6.10.jar.sha1 @@ -0,0 +1 @@ +0c118700e3a33c8a0d9adc920e9dec0831171925 diff --git a/solr/licenses/kotlin-stdlib-jdk7-1.4.10.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk7-1.4.10.jar.sha1 deleted file mode 100644 index b505b7b..0000000 --- a/solr/licenses/kotlin-stdlib-jdk7-1.4.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -30e46450b0bb3dbf43898d2f461be4a942784780 diff --git a/solr/licenses/kotlin-stdlib-jdk7-1.6.0.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk7-1.6.0.jar.sha1 new file mode 100644 index 0000000..a488934 --- /dev/null +++ b/solr/licenses/kotlin-stdlib-jdk7-1.6.0.jar.sha1 @@ -0,0 +1 @@ +da6bdc87391322974a43ccc00a25536ae74dad51 diff --git a/solr/licenses/kotlin-stdlib-jdk8-1.4.10.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk8-1.4.10.jar.sha1 deleted file mode 100644 index 3036192..0000000 --- a/solr/licenses/kotlin-stdlib-jdk8-1.4.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -998caa30623f73223194a8b657abd2baec4880ea diff --git a/solr/licenses/kotlin-stdlib-jdk8-1.6.0.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk8-1.6.0.jar.sha1 new file mode 100644 index 0000000..50cd854 --- /dev/null +++ b/solr/licenses/kotlin-stdlib-jdk8-1.6.0.jar.sha1 @@ -0,0 +1 @@ +baf82c475e9372c25407f3d132439e4aa803b8b8 diff --git a/solr/licenses/lang-tag-1.4.4.jar.sha1 b/solr/licenses/lang-tag-1.4.4.jar.sha1 deleted file mode 100644 index a48d1f9..0000000 --- a/solr/licenses/lang-tag-1.4.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1db9a709239ae473a69b5424c7e78d0b7108229d diff --git a/solr/licenses/lang-tag-1.5.jar.sha1 b/solr/licenses/lang-tag-1.5.jar.sha1 new file mode 100644 index 0000000..3a38e49 --- /dev/null +++ b/solr/licenses/lang-tag-1.5.jar.sha1 @@ -0,0 +1 @@ +7e82e3c4c593f85addf4bd209abde4f8ff933a07 diff --git a/solr/licenses/mock-oauth2-server-0.3.3.jar.sha1 b/solr/licenses/mock-oauth2-server-0.3.3.jar.sha1 deleted file mode 100644 index 3fd888f..0000000 --- a/solr/licenses/mock-oauth2-server-0.3.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -79dee9cc305eb31ce4f95e02043ad0a39f0ab249 diff --git a/solr/licenses/mock-oauth2-server-0.4.3.jar.sha1 b/solr/licenses/mock-oauth2-server-0.4.3.jar.sha1 new file mode 100644 index 0000000..3347ef0 --- /dev/null +++ b/solr/licenses/mock-oauth2-server-0.4.3.jar.sha1 @@ -0,0 +1 @@ +28586c0d946551b69198535c46ae55389ad39cae diff --git a/solr/licenses/mockwebserver-4.9.1.jar.sha1 b/solr/licenses/mockwebserver-4.9.1.jar.sha1 deleted file mode 100644 index 0d64f53..0000000 --- a/solr/licenses/mockwebserver-4.9.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -25e7b8352606b61c6b66f93db3b1590c5588eece diff --git a/solr/licenses/mockwebserver-4.9.3.jar.sha1 b/solr/licenses/mockwebserver-4.9.3.jar.sha1 new file mode 100644 index 0000000..c950542 --- /dev/null +++ b/solr/licenses/mockwebserver-4.9.3.jar.sha1 @@ -0,0 +1 @@ +436df81ae01a2326b72d013783a782b595f173a5 diff --git a/solr/licenses/nimbus-jose-jwt-9.16.1.jar.sha1 b/solr/licenses/nimbus-jose-jwt-9.16.1.jar.sha1 new file mode 100644 index 0000000..c6839fc --- /dev/null +++ b/solr/licenses/nimbus-jose-jwt-9.16.1.jar.sha1 @@ -0,0 +1 @@ +6bd47fe347968ea624355dda6144e98596b62d12 diff --git a/solr/licenses/nimbus-jose-jwt-9.6.1.jar.sha1 b/solr/licenses/nimbus-jose-jwt-9.6.1.jar.sha1 deleted file mode 100644 index 492333fd..0000000 --- a/solr/licenses/nimbus-jose-jwt-9.6.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -13973a67cdca487129e4012eec57fd22e51aa894 diff --git a/solr/licenses/oauth2-oidc-sdk-9.2.3.jar.sha1 b/solr/licenses/oauth2-oidc-sdk-9.2.3.jar.sha1 deleted file mode 100644 index b79bf8d..0000000 --- a/solr/licenses/oauth2-oidc-sdk-9.2.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -74fa6dbebede173028edb9a10b608f07ed11aff6 diff --git a/solr/licenses/oauth2-oidc-sdk-9.22.2.jar.sha1 b/solr/licenses/oauth2-oidc-sdk-9.22.2.jar.sha1 new file mode 100644 index 0000000..21e8570 --- /dev/null +++ b/solr/licenses/oauth2-oidc-sdk-9.22.2.jar.sha1 @@ -0,0 +1 @@ +2339e9e610683544bd69d7c3c839df2f0e97f7aa diff --git a/solr/licenses/okhttp-4.9.1.jar.sha1 b/solr/licenses/okhttp-4.9.1.jar.sha1 deleted file mode 100644 index 5dd6663..0000000 --- a/solr/licenses/okhttp-4.9.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -51215279c3fe472c59b6b7dd7491e6ac2e28a81b diff --git a/solr/licenses/okhttp-4.9.3.jar.sha1 b/solr/licenses/okhttp-4.9.3.jar.sha1 new file mode 100644 index 0000000..07197f8 --- /dev/null +++ b/solr/licenses/okhttp-4.9.3.jar.sha1 @@ -0,0 +1 @@ +b0b14b3d12980912723fb8b66afb48dcda742fcb diff --git a/solr/licenses/woodstox-core-6.2.4.jar.sha1 b/solr/licenses/woodstox-core-6.2.4.jar.sha1 deleted file mode 100644 index e440440..0000000 --- a/solr/licenses/woodstox-core-6.2.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -16b9f8ab972e67eb21872ea2c40046249d543989 diff --git a/solr/licenses/woodstox-core-6.2.7.jar.sha1 b/solr/licenses/woodstox-core-6.2.7.jar.sha1 new file mode 100644 index 0000000..d5eff18 --- /dev/null +++ b/solr/licenses/woodstox-core-6.2.7.jar.sha1 @@ -0,0 +1 @@ +86622cfd0a9933628b6b876d0c92589148d3b42e diff --git a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.java b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.java index e079d3a..c3f0db4 100644 --- a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.java +++ b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.java @@ -32,7 +32,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.security.KeyStore; import java.util.Base64; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -46,7 +45,6 @@ import no.nav.security.mock.oauth2.MockOAuth2Server; import no.nav.security.mock.oauth2.OAuth2Config; import no.nav.security.mock.oauth2.http.MockWebServerWrapper; import no.nav.security.mock.oauth2.token.DefaultOAuth2TokenCallback; -import no.nav.security.mock.oauth2.token.OAuth2TokenProvider; import okhttp3.mockwebserver.MockWebServer; import org.apache.commons.io.IOUtils; import org.apache.http.HttpHeaders; @@ -533,9 +531,9 @@ public class JWTAuthPluginIntegrationTest extends SolrCloudAuthTestCase { SSLSocketFactory sf = sslContext.getSocketFactory(); mockWebServer.useHttps(sf, false); - OAuth2Config config = - new OAuth2Config( - false, new OAuth2TokenProvider(), Collections.emptySet(), mockWebServerWrapper); + OAuth2Config config = new OAuth2Config(); + ((MockWebServerWrapper) config.getHttpServer()).getMockWebServer().useHttps(sf, false); + return new MockOAuth2Server(config); } catch (Exception e) { throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Failed initializing SSL", e); diff --git a/versions.lock b/versions.lock index 14d5eea..6e2580d 100644 --- a/versions.lock +++ b/versions.lock @@ -6,12 +6,12 @@ com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e) com.drewnoakes:metadata-extractor:2.11.0 (1 constraints: 3605323b) com.epam:parso:2.0.11 (1 constraints: 36052c3b) com.esri.geometry:esri-geometry-api:2.2.0 (2 constraints: 6112842b) -com.fasterxml.jackson:jackson-bom:2.12.3 (11 constraints: fdf28813) -com.fasterxml.jackson.core:jackson-annotations:2.12.3 (9 constraints: 42a15458) -com.fasterxml.jackson.core:jackson-core:2.12.3 (14 constraints: 1c0a99f0) -com.fasterxml.jackson.core:jackson-databind:2.12.3 (17 constraints: 5e455fcf) -com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.12.3 (2 constraints: f1137d82) -com.fasterxml.woodstox:woodstox-core:6.2.4 (2 constraints: 4d1cac9f) +com.fasterxml.jackson:jackson-bom:2.13.1 (10 constraints: 93d98ca5) +com.fasterxml.jackson.core:jackson-annotations:2.13.1 (8 constraints: dd8797a5) +com.fasterxml.jackson.core:jackson-core:2.13.1 (13 constraints: a5f07d58) +com.fasterxml.jackson.core:jackson-databind:2.13.1 (16 constraints: f62b03fa) +com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.13.1 (2 constraints: f0137e82) +com.fasterxml.woodstox:woodstox-core:6.2.7 (2 constraints: 501caf9f) com.github.ben-manes.caffeine:caffeine:3.0.5 (1 constraints: 0a05ff35) com.github.virtuald:curvesapi:1.06 (1 constraints: db04f530) com.github.zafarkhaja:java-semver:0.9.0 (1 constraints: 0b050636) @@ -88,7 +88,7 @@ io.prometheus:simpleclient_common:0.2.0 (2 constraints: e8159ecb) io.prometheus:simpleclient_httpserver:0.2.0 (1 constraints: 0405f135) io.sgr:s2-geometry-library-java:1.0.0 (2 constraints: b215dedf) javax.servlet:javax.servlet-api:3.1.0 (3 constraints: 75209943) -junit:junit:4.13.1 (7 constraints: 786812d9) +junit:junit:4.13.1 (6 constraints: c059a781) net.arnx:jsonic:1.2.7 (2 constraints: db10d4d1) net.jcip:jcip-annotations:1.0 (1 constraints: 560ff165) net.sf.jopt-simple:jopt-simple:4.6 (1 constraints: 610a91b7) @@ -174,10 +174,11 @@ org.apache.zookeeper:zookeeper:3.7.0 (2 constraints: 9e13f25e) org.apache.zookeeper:zookeeper-jute:3.7.0 (2 constraints: 95120523) org.apiguardian:apiguardian-api:1.1.0 (3 constraints: 5f208479) org.aspectj:aspectjrt:1.8.0 (1 constraints: 0b050836) -org.bitbucket.b_c:jose4j:0.7.7 (1 constraints: 10050736) -org.bouncycastle:bcmail-jdk15on:1.69 (1 constraints: e4040431) -org.bouncycastle:bcpkix-jdk15on:1.69 (1 constraints: e4040431) -org.bouncycastle:bcprov-jdk15on:1.69 (1 constraints: e4040431) +org.bitbucket.b_c:jose4j:0.7.9 (1 constraints: 12050936) +org.bouncycastle:bcmail-jdk15on:1.70 (1 constraints: e4040431) +org.bouncycastle:bcpkix-jdk15on:1.70 (2 constraints: 73133c52) +org.bouncycastle:bcprov-jdk15on:1.70 (3 constraints: 941ff808) +org.bouncycastle:bcutil-jdk15on:1.70 (1 constraints: 580d0529) org.brotli:dec:0.1.2 (1 constraints: 0505f035) org.carrot2:carrot2-core:4.0.4 (1 constraints: 0a050336) org.carrot2:morfologik-fsa:2.1.5 (1 constraints: d70d9836) @@ -221,12 +222,12 @@ org.jctools:jctools-core:3.3.0 (1 constraints: 08050336) org.jdom:jdom2:2.0.6 (1 constraints: 0a05fb35) org.locationtech.spatial4j:spatial4j:0.8 (2 constraints: 03150d9b) org.openjdk.jmh:jmh-core:1.32 (1 constraints: da04f730) -org.ow2.asm:asm:7.2 (3 constraints: a325a35c) -org.ow2.asm:asm-commons:7.2 (1 constraints: 6b0f7267) +org.ow2.asm:asm:9.1 (3 constraints: 4725b829) +org.ow2.asm:asm-commons:9.1 (1 constraints: 6b0f7267) org.quicktheories:quicktheories:0.26 (1 constraints: dc04f530) org.reactivestreams:reactive-streams:1.0.3 (3 constraints: 3c2b02fd) org.slf4j:jcl-over-slf4j:1.7.24 (1 constraints: 4005473b) -org.slf4j:slf4j-api:1.7.24 (24 constraints: 6d4546ac) +org.slf4j:slf4j-api:1.7.24 (24 constraints: 67456b9d) org.tallison:jmatio:1.5 (1 constraints: aa041f2c) org.threeten:threetenbp:1.5.0 (4 constraints: f82b9e86) org.tukaani:xz:1.8 (1 constraints: ad04222c) @@ -262,13 +263,12 @@ com.amazonaws:aws-java-sdk-kms:1.12.15 (1 constraints: d60cb42a) com.amazonaws:aws-java-sdk-s3:1.12.15 (1 constraints: e0125c30) com.amazonaws:jmespath-java:1.12.15 (2 constraints: 501a5183) com.beust:jcommander:1.35 (1 constraints: b50c1901) -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.3 (2 constraints: 5e1c0ef1) -com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.12.3 (2 constraints: a519c412) -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.3 (2 constraints: 0724ba81) -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.3 (3 constraints: 753d9b0e) -com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.12.3 (2 constraints: 2326f760) -com.fasterxml.jackson.module:jackson-module-kotlin:2.12.3 (2 constraints: a41dd15f) -com.fasterxml.jackson.module:jackson-module-parameter-names:2.12.3 (2 constraints: 0724ba81) +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.1 (2 constraints: 5d1c0ff1) +com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.1 (2 constraints: a419c512) +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.1 (2 constraints: 06248081) +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.1 (3 constraints: 743d1c0e) +com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1 (2 constraints: a31da85f) +com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.1 (2 constraints: 06248081) com.github.jnr:jffi:1.2.18 (1 constraints: b20902ab) com.github.jnr:jnr-constants:0.9.12 (4 constraints: ed2c9d5d) com.github.jnr:jnr-enxio:0.19 (2 constraints: 2a167d08) @@ -283,31 +283,29 @@ com.headius:modulator:1.0 (1 constraints: 19098b8e) com.headius:options:1.4 (1 constraints: 1d098f8e) com.jcraft:jzlib:1.1.3 (1 constraints: 7b094fa1) com.martiansoftware:nailgun-server:0.9.1 (1 constraints: 800960a1) -com.nimbusds:content-type:2.1 (1 constraints: d70b67eb) -com.nimbusds:lang-tag:1.4.4 (1 constraints: 3b0cb803) -com.nimbusds:nimbus-jose-jwt:9.6.1 (1 constraints: 420ce303) -com.nimbusds:oauth2-oidc-sdk:9.2.3 (1 constraints: c40ec362) -com.squareup.okhttp3:mockwebserver:4.9.1 (1 constraints: c40ebd62) -com.squareup.okhttp3:okhttp:4.9.1 (1 constraints: 3d0f4f6d) +com.nimbusds:content-type:2.2 (1 constraints: d80b68eb) +com.nimbusds:lang-tag:1.5 (1 constraints: da0b68eb) +com.nimbusds:nimbus-jose-jwt:9.16.1 (1 constraints: 730c5410) +com.nimbusds:oauth2-oidc-sdk:9.22.2 (1 constraints: f50ebb71) +com.squareup.okhttp3:mockwebserver:4.9.3 (1 constraints: c60ebf62) +com.squareup.okhttp3:okhttp:4.9.3 (1 constraints: 3f0f516d) com.squareup.okio:okio:2.8.0 (1 constraints: 540c39fd) com.sun.jersey:jersey-servlet:1.19 (1 constraints: df04fa30) com.vaadin.external.google:android-json:0.0.20131108.vaadin1 (1 constraints: 34092a9e) -io.github.microutils:kotlin-logging:2.0.6 (1 constraints: be0e9d62) -io.github.microutils:kotlin-logging-jvm:2.0.6 (1 constraints: 810f877c) +io.github.microutils:kotlin-logging:2.1.21 (1 constraints: ec0e8871) +io.github.microutils:kotlin-logging-jvm:2.1.21 (1 constraints: af0f358c) io.micrometer:micrometer-core:1.5.14 (1 constraints: fc161b19) io.netty:netty-codec-http:4.1.68.Final (1 constraints: 5d077961) io.opentracing:opentracing-mock:0.33.0 (1 constraints: 3805343b) -jakarta.activation:jakarta.activation-api:1.2.1 (2 constraints: b928fbbd) jakarta.annotation:jakarta.annotation-api:1.3.5 (1 constraints: 3a131133) jakarta.servlet:jakarta.servlet-api:4.0.4 (1 constraints: 961568b9) jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9) -jakarta.xml.bind:jakarta.xml.bind-api:2.3.2 (1 constraints: 30198ba6) javax.inject:javax.inject:1 (1 constraints: 7a0df617) joda-time:joda-time:2.9.9 (2 constraints: 0317195a) net.bytebuddy:byte-buddy:1.10.20 (2 constraints: 7c10a9d0) -net.minidev:accessors-smart:1.2 (1 constraints: e60926a4) -net.minidev:json-smart:2.3 (1 constraints: ae0de552) -no.nav.security:mock-oauth2-server:0.3.3 (1 constraints: 0805f735) +net.minidev:accessors-smart:2.4.7 (1 constraints: 4e0a90b8) +net.minidev:json-smart:2.4.7 (1 constraints: 160e936e) +no.nav.security:mock-oauth2-server:0.4.3 (1 constraints: 0905fa35) org.apache.hadoop:hadoop-hdfs:3.2.0 (1 constraints: 07050036) org.apache.hadoop:hadoop-minikdc:3.2.0 (1 constraints: 07050036) org.apache.kerby:kerb-admin:1.0.1 (1 constraints: 840d892f) @@ -324,11 +322,11 @@ org.glassfish:jakarta.el:3.0.3 (1 constraints: 941562b9) org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 520d2029) org.hsqldb:hsqldb:2.4.0 (1 constraints: 08050136) org.jetbrains:annotations:13.0 (1 constraints: df0e795c) -org.jetbrains.kotlin:kotlin-reflect:1.4.32 (2 constraints: 612453e2) -org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (7 constraints: 4168b6de) -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 (3 constraints: b92a7abb) -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.10 (1 constraints: dd10ebd2) -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 (1 constraints: 650f967c) +org.jetbrains.kotlin:kotlin-reflect:1.6.10 (2 constraints: 602486e2) +org.jetbrains.kotlin:kotlin-stdlib:1.6.10 (6 constraints: b456d578) +org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10 (3 constraints: 852a7097) +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0 (1 constraints: ae1013c2) +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0 (2 constraints: 5e203d24) org.jruby:dirgra:0.3 (1 constraints: 1b098b8e) org.jruby:jruby:9.2.6.0 (1 constraints: 490d7d28) org.jruby:jruby-core:9.2.6.0 (1 constraints: 0f08b57d) diff --git a/versions.props b/versions.props index b9409cf..3aa3d1b 100644 --- a/versions.props +++ b/versions.props @@ -68,7 +68,7 @@ net.arnx:jsonic=1.2.7 net.bytebuddy:byte-buddy=1.9.3 net.sourceforge.argparse4j:argparse4j=0.8.1 net.thisptr:jackson-jq=0.0.8 -no.nav.security:mock-oauth2-server=0.3.3 +no.nav.security:mock-oauth2-server=0.4.3 org.antlr:antlr4-runtime=4.5.1-1 org.apache.calcite.avatica:avatica-core=1.18.0 org.apache.calcite:*=1.27.0 @@ -100,7 +100,7 @@ org.apache.zookeeper:*=3.7.0 org.apiguardian:apiguardian-api=1.1.0 org.asciidoctor:asciidoctorj=1.6.2 org.aspectj:aspectjrt=1.8.0 -org.bitbucket.b_c:jose4j=0.7.7 +org.bitbucket.b_c:jose4j=0.7.9 org.bouncycastle:*=1.69 org.brotli:dec=0.1.2 org.carrot2:carrot2-core=4.0.4
