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 d3593eb45310e224e291bfdb1fae3ae9d2dc50be Author: Kevin Risden <[email protected]> AuthorDate: Tue Feb 8 12:54:15 2022 -0500 SOLR-15987: Upgrade slf4j to 1.7.35 and remove ant-compat/force-versions.gradle --- build.gradle | 1 - gradle/ant-compat/force-versions.gradle | 37 ---------------------------- solr/CHANGES.txt | 2 ++ solr/licenses/commons-logging-1.1.3.jar.sha1 | 1 - solr/licenses/commons-logging-1.2.jar.sha1 | 1 + solr/licenses/jcl-over-slf4j-1.7.24.jar.sha1 | 1 - solr/licenses/jcl-over-slf4j-1.7.35.jar.sha1 | 1 + solr/licenses/jul-to-slf4j-1.7.24.jar.sha1 | 1 - solr/licenses/jul-to-slf4j-1.7.35.jar.sha1 | 1 + solr/licenses/slf4j-api-1.7.24.jar.sha1 | 1 - solr/licenses/slf4j-api-1.7.35.jar.sha1 | 1 + versions.lock | 8 +++--- versions.props | 2 +- 13 files changed, 11 insertions(+), 47 deletions(-) diff --git a/build.gradle b/build.gradle index bdcc50b..a94f798 100644 --- a/build.gradle +++ b/build.gradle @@ -184,7 +184,6 @@ apply from: file('gradle/lucene-dev/lucene-dev-repo-composite.gradle') // of potential problems with the build conventions, dependencies, etc. apply from: file('gradle/ant-compat/misc.gradle') -apply from: file('gradle/ant-compat/force-versions.gradle') apply from: file('gradle/ant-compat/artifact-naming.gradle') apply from: file('gradle/documentation/pull-lucene-javadocs.gradle') diff --git a/gradle/ant-compat/force-versions.gradle b/gradle/ant-compat/force-versions.gradle deleted file mode 100644 index 1af573f..0000000 --- a/gradle/ant-compat/force-versions.gradle +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - - -// Force versions of certain components to align them with ant build. - -project(":solr").subprojects { - plugins.withType(JavaPlugin) { - dependencies { - implementation enforcedPlatform('org.slf4j:slf4j-api:1.7.24') - implementation enforcedPlatform('commons-logging:commons-logging:1.1.3') - } - } -} - -configure(project(":solr:server")) { - afterEvaluate { - dependencies { - libExt enforcedPlatform('org.slf4j:slf4j-api:1.7.24') - libExt enforcedPlatform('commons-logging:commons-logging:1.1.3') - } - } -} \ No newline at end of file diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 08b37cb..7cf58e6 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -318,6 +318,8 @@ Build * SOLR-15984: Ensure all used dependencies are declared (Kevin Risden) +* SOLR-15987: Upgrade slf4j to 1.7.35 and remove ant-compat/force-versions.gradle (Kevin Risden) + Other Changes ---------------------- * SOLR-14656: Autoscaling framework removed (Ishan Chattopadhyaya, noble, Ilan Ginzburg) diff --git a/solr/licenses/commons-logging-1.1.3.jar.sha1 b/solr/licenses/commons-logging-1.1.3.jar.sha1 deleted file mode 100644 index c8756c4..0000000 --- a/solr/licenses/commons-logging-1.1.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f diff --git a/solr/licenses/commons-logging-1.2.jar.sha1 b/solr/licenses/commons-logging-1.2.jar.sha1 new file mode 100644 index 0000000..c314688 --- /dev/null +++ b/solr/licenses/commons-logging-1.2.jar.sha1 @@ -0,0 +1 @@ +4bfc12adfe4842bf07b657f0369c4cb522955686 diff --git a/solr/licenses/jcl-over-slf4j-1.7.24.jar.sha1 b/solr/licenses/jcl-over-slf4j-1.7.24.jar.sha1 deleted file mode 100644 index b3f8afc..0000000 --- a/solr/licenses/jcl-over-slf4j-1.7.24.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e6a8629079856a2aa7862c6327ccf6dd1988d7fc diff --git a/solr/licenses/jcl-over-slf4j-1.7.35.jar.sha1 b/solr/licenses/jcl-over-slf4j-1.7.35.jar.sha1 new file mode 100644 index 0000000..6ea925e --- /dev/null +++ b/solr/licenses/jcl-over-slf4j-1.7.35.jar.sha1 @@ -0,0 +1 @@ +02f92ca85f248949b7a7dda48d6f720bd38c7343 diff --git a/solr/licenses/jul-to-slf4j-1.7.24.jar.sha1 b/solr/licenses/jul-to-slf4j-1.7.24.jar.sha1 deleted file mode 100644 index 38c351e..0000000 --- a/solr/licenses/jul-to-slf4j-1.7.24.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -25a2be668cb2ad1d05d76c0773df73b4b53617fd diff --git a/solr/licenses/jul-to-slf4j-1.7.35.jar.sha1 b/solr/licenses/jul-to-slf4j-1.7.35.jar.sha1 new file mode 100644 index 0000000..83d640d --- /dev/null +++ b/solr/licenses/jul-to-slf4j-1.7.35.jar.sha1 @@ -0,0 +1 @@ +1a813ccb4100cfeaf488a9ef6fb35bb19e1d73d6 diff --git a/solr/licenses/slf4j-api-1.7.24.jar.sha1 b/solr/licenses/slf4j-api-1.7.24.jar.sha1 deleted file mode 100644 index e2722e7..0000000 --- a/solr/licenses/slf4j-api-1.7.24.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3f6b4bd4f8dbe8d4bea06d107a3826469b85c3e9 diff --git a/solr/licenses/slf4j-api-1.7.35.jar.sha1 b/solr/licenses/slf4j-api-1.7.35.jar.sha1 new file mode 100644 index 0000000..ef32054 --- /dev/null +++ b/solr/licenses/slf4j-api-1.7.35.jar.sha1 @@ -0,0 +1 @@ +517f3a0687490b72d0e56d815e05608a541af802 diff --git a/versions.lock b/versions.lock index 6e2580d..52e777b 100644 --- a/versions.lock +++ b/versions.lock @@ -60,7 +60,7 @@ commons-cli:commons-cli:1.4 (1 constraints: a9041e2c) commons-codec:commons-codec:1.13 (4 constraints: b633162d) commons-collections:commons-collections:3.2.2 (1 constraints: 09050236) commons-io:commons-io:2.8.0 (4 constraints: 842b7e24) -commons-logging:commons-logging:1.1.3 (3 constraints: 3b22c8bc) +commons-logging:commons-logging:1.2 (3 constraints: 3b22c8bc) de.l3s.boilerpipe:boilerpipe:1.1.0 (1 constraints: 0405f335) io.dropwizard.metrics:metrics-core:4.1.5 (5 constraints: 2543e4c0) io.dropwizard.metrics:metrics-graphite:4.1.5 (1 constraints: 0c050736) @@ -226,8 +226,8 @@ 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: 67456b9d) +org.slf4j:jcl-over-slf4j:1.7.35 (1 constraints: 42054a3b) +org.slf4j:slf4j-api:1.7.35 (24 constraints: 6d45f2a6) 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) @@ -337,7 +337,7 @@ org.jsoup:jsoup:1.12.1 (1 constraints: 3705303b) org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b) org.mockito:mockito-core:3.8.0 (1 constraints: 0d051236) org.objenesis:objenesis:3.1 (2 constraints: 5b0ff979) -org.slf4j:jul-to-slf4j:1.7.24 (1 constraints: 801632ff) +org.slf4j:jul-to-slf4j:1.7.35 (1 constraints: 801632ff) org.springframework:spring-aop:5.2.15.RELEASE (2 constraints: 32232d90) org.springframework:spring-beans:5.2.15.RELEASE (4 constraints: 5843b908) org.springframework:spring-context:5.2.15.RELEASE (2 constraints: c3236acf) diff --git a/versions.props b/versions.props index 3aa3d1b..3e61c7b 100644 --- a/versions.props +++ b/versions.props @@ -123,7 +123,7 @@ org.objenesis:objenesis=2.6 org.openjdk.jmh:*=1.32 org.ow2.asm:*=7.2 org.quicktheories:quicktheories=0.26 -org.slf4j:*=1.7.24 +org.slf4j:*=1.7.35 org.tallison:jmatio=1.5 org.threeten:threetenbp=1.3.3 org.tukaani:xz=1.8
