MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[platform] upgrading SLF4J to 2.x branch (IJPL-301)

Browse Source 
GitOrigin-RevId: 044dbe68b61e665d35e948eefa610f18b63abe8a
This commit is contained in:
Roman Shevchenko
2023-10-23 11:35:04 +02:00
committed by intellij-monorepo-bot
parent 88ce9a2030
commit f66ae2de0d
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.idea/libraries/Slf4j.xml generated
View File

@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Slf4j" type="repository">
<properties include-transitive-deps="false" jar-repository-id="central-proxy" maven-id="org.slf4j:slf4j-api:1.7.36">
<properties include-transitive-deps="false" jar-repository-id="central-proxy" maven-id="org.slf4j:slf4j-api:2.0.9">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar">
<sha256sum>d3ef575e3e4979678dc01bf1dcce51021493b4d11fb7f1be8ad982877c16a1c0</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.jar">
<sha256sum>0818930dc8d7debb403204611691da58e49d42c50b6ffcfdce02dadb7c3c2b6c</sha256sum>
</artifact>
</verification>
<exclude>
@@ -11,11 +11,11 @@
</exclude>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9-sources.jar!/" />
</SOURCES>
</library>
</component>

10
.idea/libraries/slf4j_jdk14.xml generated
View File

@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="slf4j-jdk14" type="repository">
<properties include-transitive-deps="false" jar-repository-id="central-proxy" maven-id="org.slf4j:slf4j-jdk14:1.7.36">
<properties include-transitive-deps="false" jar-repository-id="central-proxy" maven-id="org.slf4j:slf4j-jdk14:2.0.9">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/org/slf4j/slf4j-jdk14/1.7.36/slf4j-jdk14-1.7.36.jar">
<sha256sum>5bf64690af4e59876b8902bb0db3dd39c686a40abfed97d3837eeeec7a2922ac</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/slf4j/slf4j-jdk14/2.0.9/slf4j-jdk14-2.0.9.jar">
<sha256sum>1052aa82851c36f76465e64539ad4450338a86094e638a5cb1b3ce7a0dabfb18</sha256sum>
</artifact>
</verification>
<exclude>
@@ -11,11 +11,11 @@
</exclude>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-jdk14/1.7.36/slf4j-jdk14-1.7.36.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-jdk14/2.0.9/slf4j-jdk14-2.0.9.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-jdk14/1.7.36/slf4j-jdk14-1.7.36-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-jdk14/2.0.9/slf4j-jdk14-2.0.9-sources.jar!/" />
</SOURCES>
</library>
</component>

2
aether-dependency-resolver/src/org/jetbrains/idea/maven/aether/ArtifactRepositoryManager.java
View File

@@ -278,7 +278,7 @@ public final class ArtifactRepositoryManager {
org.apache.http.client.HttpClient.class, //http-client
org.apache.commons.logging.LogFactory.class, // commons-logging
org.slf4j.Marker.class, // slf4j, - required for aether resolver at runtime
org.slf4j.impl.JDK14LoggerFactory.class, // slf4j-jdk14 - required for aether resolver at runtime
org.slf4j.jul.JDK14LoggerFactory.class, // slf4j-jdk14 - required for aether resolver at runtime
org.apache.commons.codec.binary.Base64.class // commons-codec
));
result.addAll(List.of(ClassPathUtil.getUtilClasses())); // intellij.platform.util module

6
plugins/gradle/src/org/jetbrains/plugins/gradle/execution/target/GradleServerEnvironmentSetupImpl.kt
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.plugins.gradle.execution.target
import com.intellij.execution.Platform
@@ -37,7 +37,7 @@ import org.jetbrains.plugins.gradle.tooling.proxy.TargetBuildParameters
import org.jetbrains.plugins.gradle.util.GradleConstants
import org.jetbrains.plugins.gradle.util.GradleConstants.INIT_SCRIPT_CMD_OPTION
import org.slf4j.LoggerFactory
import org.slf4j.impl.JDK14LoggerFactory
import org.slf4j.jul.JDK14LoggerFactory
import java.io.File
import java.nio.file.Files
import java.nio.file.Path
@@ -438,4 +438,4 @@ internal class GradleServerEnvironmentSetupImpl(private val project: Project,
private val log = logger<GradleServerEnvironmentSetupImpl>()
private val EP = ExtensionPointName.create<GradleTargetEnvironmentAware>("org.jetbrains.plugins.gradle.targetEnvironmentAware")
}
}
}

4
plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerCMDState.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.maven.server;
import com.intellij.execution.DefaultExecutionResult;
@@ -30,7 +30,7 @@ import org.jetbrains.idea.maven.buildtool.quickfix.InstallMaven2BuildIssue;
import org.jetbrains.idea.maven.utils.MavenLog;
import org.jetbrains.idea.maven.utils.MavenUtil;
import org.slf4j.Logger;
import org.slf4j.impl.JDK14LoggerFactory;
import org.slf4j.jul.JDK14LoggerFactory;
import java.io.File;
import java.util.*;