MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

Target SLF4J to java.util.logging instead of log4j

Browse Source 
GitOrigin-RevId: 1c2b12e5615598bf33e6ed87b44968fbe281de6a
This commit is contained in:
Dmitry Jemerov
2021-12-29 18:53:06 +01:00
committed by intellij-monorepo-bot
parent d4d196dbcc
commit fdd870d07a
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/gradle/java/src/compiler/GradleBuildProcessParametersProvider.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.plugins.gradle.compiler;
import com.google.gson.Gson;
@@ -13,7 +13,7 @@ import org.gradle.tooling.ProjectConnection;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.gradle.settings.GradleSettings;
import org.slf4j.Logger;
import org.slf4j.impl.Log4jLoggerFactory;
import org.slf4j.impl.JDK14LoggerFactory;
import java.util.ArrayList;
import java.util.List;
@@ -63,6 +63,6 @@ public class GradleBuildProcessParametersProvider extends BuildProcessParameters
classpath.add(PathUtil.getJarPathForClass(GroovyObject.class));
classpath.add(PathUtil.getJarPathForClass(Gson.class));
classpath.add(PathUtil.getJarPathForClass(Logger.class));
classpath.add(PathUtil.getJarPathForClass(Log4jLoggerFactory.class));
classpath.add(PathUtil.getJarPathForClass(JDK14LoggerFactory.class));
}
}

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

@@ -1,4 +1,4 @@
// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2021 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
@@ -39,7 +39,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.Log4jLoggerFactory
import org.slf4j.impl.JDK14LoggerFactory
import java.io.File
import java.nio.file.Files
import java.nio.file.Path
@@ -296,7 +296,7 @@ internal class GradleServerEnvironmentSetupImpl(private val project: Project,
classpathInferer.add(WrapperExecutor::class.java)
// logging jars
classpathInferer.add(LoggerFactory::class.java)
classpathInferer.add(Log4jLoggerFactory::class.java)
classpathInferer.add(JDK14LoggerFactory::class.java)
classpathInferer.add(org.apache.log4j.Level::class.java)
// gradle tooling proxy module
classpathInferer.add(Main::class.java)

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

@@ -1,4 +1,4 @@
// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2021 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;
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.idea.maven.utils.MavenUtil;
import org.slf4j.Logger;
import org.slf4j.impl.Log4jLoggerFactory;
import org.slf4j.impl.JDK14LoggerFactory;
import java.util.*;
import java.util.regex.Matcher;
@@ -175,7 +175,7 @@ public class MavenServerCMDState extends CommandLineState {
classPath.add(PathUtil.getJarPathForClass(org.apache.log4j.Logger.class));
if (StringUtil.compareVersionNumbers(mavenVersion, "3.1") < 0) {
classPath.add(PathUtil.getJarPathForClass(Logger.class));
classPath.add(PathUtil.getJarPathForClass(Log4jLoggerFactory.class));
classPath.add(PathUtil.getJarPathForClass(JDK14LoggerFactory.class));
}
classPath.add(PathUtil.getJarPathForClass(StringUtilRt.class));//util-rt