1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/build/AppEngineEnhancerBuilder.java b/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/build/AppEngineEnhancerBuilder.java
index 549aa1a5b361..e6ab8747c2a3 100644
--- a/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/build/AppEngineEnhancerBuilder.java
+++ b/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/build/AppEngineEnhancerBuilder.java
@@ -113,7 +113,11 @@ public class AppEngineEnhancerBuilder extends ModuleLevelBuilder {
     List<String> classpath = new ArrayList<String>();
     classpath.add(extension.getToolsApiJarPath());
     classpath.add(PathManager.getJarPathForClass(EnhancerRunner.class));
+    boolean removeOrmJars = Boolean.parseBoolean(System.getProperty("jps.appengine.enhancer.remove.orm.jars", "true"));
     for (File file : JpsJavaExtensionService.dependencies(module).recursively().compileOnly().productionOnly().classes().getRoots()) {
+      if (removeOrmJars && FileUtil.isAncestor(new File(extension.getOrmLibPath()), file, true)) {
+        continue;
+      }
       classpath.add(file.getAbsolutePath());
     }