From ed4eac822ad2dc222663631e8f676d0122b085c0 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Wed, 2 Mar 2011 14:56:12 +0100 Subject: [PATCH] Maven: build scripts tuned --- build/scripts/layouts.gant | 2 +- .../org/jetbrains/idea/maven/facade/MavenFacadeManager.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index 7f4678352136..6c9a25c221b1 100644 --- a/build/scripts/layouts.gant +++ b/build/scripts/layouts.gant @@ -1,4 +1,3 @@ -import org.jetbrains.jps.Module import static org.jetbrains.jps.idea.IdeaProjectLoader.guessHome includeTargets << new File("${guessHome(this)}/build/scripts/utils.gant") @@ -162,6 +161,7 @@ def layoutFull(String home, String targetDirectory) { jar("maven-facade-impl.jar") { module("maven-facade-impl") } + fileset(dir: "$home/plugins/maven/lib") fileset(dir: "$home/plugins/maven/facade-impl/lib") fileset(dir: "$home/plugins/maven/facade-api/lib") } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/facade/MavenFacadeManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/facade/MavenFacadeManager.java index 88e591003327..2bfe079cc257 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/facade/MavenFacadeManager.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/facade/MavenFacadeManager.java @@ -185,7 +185,6 @@ public class MavenFacadeManager extends RemoteObjectWrapper { ContainerUtil.addIfNotNull(PathUtil.getJarPathForClass(THashSet.class), classPath); ContainerUtil.addIfNotNull(PathUtil.getJarPathForClass(Element.class), classPath); ContainerUtil.addIfNotNull(PathUtil.getJarPathForClass(Query.class), classPath); - ContainerUtil.addIfNotNull(PathUtil.getJarPathForClass(Query.class), classPath); params.getClassPath().add(PathManager.getResourceRoot(getClass(), "/messages/CommonBundle.properties")); params.getClassPath().addAll(classPath); params.getClassPath().addAllFiles(collectClassPathAndLIbsFolder().first);