diff --git a/.idea/libraries/Slf4j.xml b/.idea/libraries/Slf4j.xml new file mode 100644 index 000000000000..84df8aa2c1e0 --- /dev/null +++ b/.idea/libraries/Slf4j.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant index 6f66e25b1182..68af6955a02e 100644 --- a/build/scripts/libLicenses.gant +++ b/build/scripts/libLicenses.gant @@ -221,7 +221,7 @@ libraryLicense(name: "Maven3", libraryNames: ["Maven3", "maven-dependency-tree-1 libraryLicense(name: "Gradle", version: "1.12", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license") libraryLicense(name: "gradle-tooling-api-2.0.jar", version: "2.0", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license") libraryLicense(name: "GradleJnaPosix", version: "1.0.3", license: "LGPL 2.1", url: "http://www.jruby.org/", licenseUrl: "http://www.gnu.org/licenses/lgpl-2.1.txt") -libraryLicense(name: "Slf4j", version: "1.7.2", license: "MIT License", url: "http://slf4j.org/", licenseUrl: "http://slf4j.org/license.html") +libraryLicense(name: "Slf4j", version: "1.7.10", license: "MIT License", url: "http://slf4j.org/", licenseUrl: "http://slf4j.org/license.html") libraryLicense(name: "GradleGuava", version: "14.0.1", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/", licenseUrl: "http://apache.org/licenses/LICENSE-2.0") libraryLicense(name: "Jsr305", version: "1.3.9", license: "New BSD", url: "http://code.google.com/p/jsr-305/", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause") libraryLicense(name: "markdownj", attachedTo: "tasks-core", version: "", license: "BSD", url: "http://markdownj.org/", licenseUrl: "http://www.opensource.org/licenses/bsd-license.php") diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt index 94730914deff..e8c8c7343043 100644 --- a/lib/required_for_dist.txt +++ b/lib/required_for_dist.txt @@ -62,6 +62,8 @@ sanselan-0.98-snapshot.jar serviceMessages.jar snappy-in-java-0.3.1.jar swingx-core-1.6.2.jar +slf4j-api-1.7.10.jar +slf4j-log4j12-1.7.10.jar trove4j.jar velocity.jar winp-1.23.jar diff --git a/lib/slf4j-api-1.7.10.jar b/lib/slf4j-api-1.7.10.jar new file mode 100644 index 000000000000..ac7da374a8c1 Binary files /dev/null and b/lib/slf4j-api-1.7.10.jar differ diff --git a/lib/slf4j-log4j12-1.7.10.jar b/lib/slf4j-log4j12-1.7.10.jar new file mode 100644 index 000000000000..25d5275979c4 Binary files /dev/null and b/lib/slf4j-log4j12-1.7.10.jar differ diff --git a/plugins/gradle/gradle.iml b/plugins/gradle/gradle.iml index 1fc27e00c388..52c1b3a76dd4 100644 --- a/plugins/gradle/gradle.iml +++ b/plugins/gradle/gradle.iml @@ -27,6 +27,7 @@ + @@ -58,15 +59,6 @@ - - - - - - - - - @@ -116,4 +108,4 @@ - + \ No newline at end of file diff --git a/plugins/gradle/lib/slf4j-api-1.7.7.jar b/plugins/gradle/lib/slf4j-api-1.7.7.jar deleted file mode 100644 index bebabd961960..000000000000 Binary files a/plugins/gradle/lib/slf4j-api-1.7.7.jar and /dev/null differ diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/compiler/GradleBuildProcessParametersProvider.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/compiler/GradleBuildProcessParametersProvider.java index 3b0d8a968747..b93e8f4bb694 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/compiler/GradleBuildProcessParametersProvider.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/compiler/GradleBuildProcessParametersProvider.java @@ -30,6 +30,8 @@ import org.apache.tools.ant.taskdefs.Ant; import org.gradle.tooling.ProjectConnection; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.gradle.util.GradleConstants; +import org.slf4j.Logger; +import org.slf4j.impl.Log4jLoggerFactory; import java.io.File; import java.util.List; @@ -90,5 +92,7 @@ public class GradleBuildProcessParametersProvider extends BuildProcessParameters classpath.add(PathUtil.getJarPathForClass(Ant.class)); classpath.add(PathUtil.getJarPathForClass(GroovyObject.class)); classpath.add(PathUtil.getJarPathForClass(Gson.class)); + classpath.add(PathUtil.getJarPathForClass(Logger.class)); + classpath.add(PathUtil.getJarPathForClass(Log4jLoggerFactory.class)); } } diff --git a/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml b/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml index 37389439244e..b761b69e5bb9 100644 --- a/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml +++ b/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml @@ -11,6 +11,7 @@ + @@ -45,4 +46,4 @@ - + \ No newline at end of file diff --git a/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml b/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml index 411170b8edae..b8bb34c01e22 100644 --- a/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml +++ b/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml @@ -64,15 +64,6 @@ - - - - - - - - - - + \ No newline at end of file