move slf4j to project level library

This commit is contained in:
Vladislav.Soroka
2015-03-26 15:07:56 +03:00
parent bc2a56256e
commit 2af4f99331
10 changed files with 22 additions and 22 deletions
+10
View File
@@ -0,0 +1,10 @@
<component name="libraryTable">
<library name="Slf4j">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/slf4j-api-1.7.10.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/slf4j-log4j12-1.7.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
+1 -1
View File
@@ -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")
+2
View File
@@ -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
Binary file not shown.
Binary file not shown.
+2 -10
View File
@@ -27,6 +27,7 @@
<orderEntry type="module" module-name="maven" />
<orderEntry type="module" module-name="junit" />
<orderEntry type="library" name="swingx" level="project" />
<orderEntry type="library" exported="" name="Slf4j" level="project" />
<orderEntry type="module-library" exported="">
<library name="Gradle">
<CLASSES>
@@ -58,15 +59,6 @@
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="Slf4j">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/slf4j-api-1.7.7.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="GradleGuava">
<CLASSES>
@@ -116,4 +108,4 @@
<orderEntry type="library" name="Ant" level="project" />
<orderEntry type="library" name="gson" level="project" />
</component>
</module>
</module>
Binary file not shown.
@@ -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));
}
}
@@ -11,6 +11,7 @@
<orderEntry type="module" module-name="annotations" />
<orderEntry type="module" module-name="testFramework" scope="TEST" />
<orderEntry type="module" module-name="testFramework-java" scope="TEST" />
<orderEntry type="library" exported="" name="Slf4j" level="project" />
<orderEntry type="module-library" exported="">
<library name="Gradle">
<CLASSES>
@@ -45,4 +46,4 @@
</orderEntry>
<orderEntry type="library" scope="PROVIDED" name="Groovy" level="project" />
</component>
</module>
</module>
@@ -64,15 +64,6 @@
</library>
</orderEntry>
<orderEntry type="library" name="Groovy" level="project" />
<orderEntry type="module-library" exported="">
<library name="Slf4j">
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib/slf4j-api-1.7.7.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="gson" level="project" />
</component>
</module>
</module>