From 753755918d9ee55104ccc3cee4a78e161b6cd475 Mon Sep 17 00:00:00 2001
From: Alexey Andreev <Alexey.Andreev@jetbrains.com>
Date: Thu, 22 Nov 2018 14:49:30 +0300
Subject: [PATCH] Update build config to avoid jar hell

---
 .idea/codeStyles/Project.xml                  |  6 +++
 .travis.yml                                   |  2 +-
 classlib/pom.xml                              | 40 +++++++++-----
 core/pom.xml                                  | 54 +++++++++++++++----
 .../javascript/rendering/AstWriter.java       | 12 +++++
 .../javascript/rendering/JSParser.java        | 14 +++++
 jso/impl/pom.xml                              | 30 +++++++++++
 .../org/teavm/jso/impl/JSClassProcessor.java  |  2 +-
 metaprogramming/api/pom.xml                   | 13 -----
 metaprogramming/impl/pom.xml                  | 52 ++++++++++++++----
 platform/pom.xml                              | 13 -----
 pom.xml                                       | 10 ++--
 tests/pom.xml                                 |  6 +++
 tools/chrome-rdp/pom.xml                      | 13 -----
 tools/cli/pom.xml                             |  1 -
 tools/core/pom.xml                            | 51 ++++++++++++++----
 tools/idea/idea-artifacts/dep-pom.xml         | 15 ------
 .../java/org/teavm/idea/jps/TeaVMBuild.java   | 23 ++++++--
 .../java/org/teavm/idea/jps/TeaVMBuilder.java |  2 +-
 upload-files.sh                               | 14 ++---
 20 files changed, 255 insertions(+), 118 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index be4d48af6..96ef064cb 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -47,5 +47,11 @@
       <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
       <option name="ENUM_CONSTANTS_WRAP" value="2" />
     </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+    </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 3d18112ff..b924ce2f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ before_install:
   - rm -rf $HOME/.m2
 
 install:
-  - $MVN_CMD install -Dteavm.build.all=false -P with-idea -P with-eclipse -P with-cli -DskipTests=true -Dmaven.javadoc.skip=true -V
+  - $MVN_CMD install -Dteavm.build.all=false -P with-idea -P with-cli -DskipTests=true -Dmaven.javadoc.skip=true -V
   - pushd tests/src/test/js
   - npm config set prefix=$HOME/.node_modules
   - npm install
diff --git a/classlib/pom.xml b/classlib/pom.xml
index 53898bc71..931e108c5 100644
--- a/classlib/pom.xml
+++ b/classlib/pom.xml
@@ -24,8 +24,6 @@
   </parent>
   <artifactId>teavm-classlib</artifactId>
 
-  <packaging>bundle</packaging>
-
   <name>TeaVM Java class library</name>
   <description>TeaVM Java class library emulation</description>
 
@@ -49,6 +47,7 @@
       <artifactId>teavm-core</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.teavm</groupId>
@@ -79,6 +78,7 @@
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-util</artifactId>
       <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
@@ -106,17 +106,6 @@
           <configLocation>../checkstyle.xml</configLocation>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>org.teavm.classlib.*</Export-Package>
-            <Bundle-SymbolicName>teavm-classlib</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
@@ -125,6 +114,31 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <includes>
+                  <include>org.teavm:teavm-classlib</include>
+                </includes>
+              </artifactSet>
+              <relocations>
+                <relocation>cd
+                  <pattern>org.objectweb.asm</pattern>
+                  <shadedPattern>org.teavm.asm</shadedPattern>
+                </relocation>
+              </relocations>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/core/pom.xml b/core/pom.xml
index 55ef9818f..a5968d1d5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,8 +24,6 @@
   </parent>
   <artifactId>teavm-core</artifactId>
 
-  <packaging>bundle</packaging>
-
   <name>TeaVM core</name>
   <description>TeaVM compiler and SPI</description>
 
@@ -48,19 +46,23 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-commons</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-util</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>com.carrotsearch</groupId>
       <artifactId>hppc</artifactId>
       <version>0.7.3</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -70,6 +72,7 @@
     <dependency>
       <groupId>org.mozilla</groupId>
       <artifactId>rhino</artifactId>
+      <optional>true</optional>
     </dependency>
   </dependencies>
 
@@ -90,16 +93,45 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
       </plugin>
+
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>org.teavm.*</Export-Package>
-            <Bundle-SymbolicName>teavm-core</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <excludes>
+                  <exclude>junit:junit</exclude>
+                  <exclude>org:teavm:*</exclude>
+                  <exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
+                </excludes>
+              </artifactSet>
+              <relocations>
+                <relocation>
+                  <pattern>org.objectweb.asm</pattern>
+                  <shadedPattern>org.teavm.asm</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.mozilla</pattern>
+                  <shadedPattern>org.teavm.rhino</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>com.carrotsearch.hppc</pattern>
+                  <shadedPattern>org.teavm.hppc</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.apache.commons</pattern>
+                  <shadedPattern>org.teavm.apachecommons</shadedPattern>
+                </relocation>
+              </relocations>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
diff --git a/core/src/main/java/org/teavm/backend/javascript/rendering/AstWriter.java b/core/src/main/java/org/teavm/backend/javascript/rendering/AstWriter.java
index 6351181b4..04fdcc6f0 100644
--- a/core/src/main/java/org/teavm/backend/javascript/rendering/AstWriter.java
+++ b/core/src/main/java/org/teavm/backend/javascript/rendering/AstWriter.java
@@ -119,6 +119,10 @@ public class AstWriter {
         nameMap.put(name, emitter);
     }
 
+    public void hoist(Object node) {
+        hoist((AstNode) node);
+    }
+
     public void hoist(AstNode node) {
         node.visit(n -> {
             if (n instanceof Scope) {
@@ -133,6 +137,14 @@ public class AstWriter {
         });
     }
 
+    public void print(Object node) throws IOException {
+        print((AstNode) node);
+    }
+
+    public void print(Object node, int precedence) throws IOException {
+        print((AstNode) node, precedence);
+    }
+
     public void print(AstNode node) throws IOException {
         print(node, PRECEDENCE_COMMA);
     }
diff --git a/core/src/main/java/org/teavm/backend/javascript/rendering/JSParser.java b/core/src/main/java/org/teavm/backend/javascript/rendering/JSParser.java
index 05b75bff3..52398b508 100644
--- a/core/src/main/java/org/teavm/backend/javascript/rendering/JSParser.java
+++ b/core/src/main/java/org/teavm/backend/javascript/rendering/JSParser.java
@@ -15,15 +15,25 @@
  */
 package org.teavm.backend.javascript.rendering;
 
+import java.io.IOException;
+import java.io.Reader;
 import org.mozilla.javascript.CompilerEnvirons;
 import org.mozilla.javascript.ErrorReporter;
 import org.mozilla.javascript.Parser;
 
 public class JSParser extends Parser {
+    public JSParser(Object compilerEnv, Object errorReporter) {
+        this((CompilerEnvirons) compilerEnv, (ErrorReporter) errorReporter);
+    }
+
     public JSParser(CompilerEnvirons compilerEnv, ErrorReporter errorReporter) {
         super(compilerEnv, errorReporter);
     }
 
+    public JSParser(Object compilerEnv) {
+        this((CompilerEnvirons) compilerEnv);
+    }
+
     public JSParser(CompilerEnvirons compilerEnv) {
         super(compilerEnv);
     }
@@ -35,4 +45,8 @@ public class JSParser extends Parser {
     public void exitFunction() {
         --nestingOfFunction;
     }
+
+    public Object parseAsObject(Reader sourceReader, String sourceURI, int lineno) throws IOException {
+        return parse(sourceReader, sourceURI, lineno);
+    }
 }
diff --git a/jso/impl/pom.xml b/jso/impl/pom.xml
index 0d58066fc..017f8da9f 100644
--- a/jso/impl/pom.xml
+++ b/jso/impl/pom.xml
@@ -45,6 +45,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mozilla</groupId>
+      <artifactId>rhino</artifactId>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 
   <build>
@@ -65,6 +70,31 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <includes>
+                  <include>org.teavm:teavm-jso-impl</include>
+                </includes>
+              </artifactSet>
+              <relocations>
+                <relocation>
+                  <pattern>org.mozilla</pattern>
+                  <shadedPattern>org.teavm.rhino</shadedPattern>
+                </relocation>
+              </relocations>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
\ No newline at end of file
diff --git a/jso/impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java
index 113b2743e..bc259f6eb 100644
--- a/jso/impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java
+++ b/jso/impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java
@@ -587,7 +587,7 @@ class JSClassProcessor {
         JSParser parser = new JSParser(env, errorReporter);
         AstRoot rootNode;
         try {
-            rootNode = parser.parse(new StringReader("function(){" + script + "}"), null, 0);
+            rootNode = (AstRoot) parser.parseAsObject(new StringReader("function(){" + script + "}"), null, 0);
         } catch (IOException e) {
             throw new RuntimeException("IO Error occurred", e);
         }
diff --git a/metaprogramming/api/pom.xml b/metaprogramming/api/pom.xml
index 45a59b5bf..e0a6a43df 100644
--- a/metaprogramming/api/pom.xml
+++ b/metaprogramming/api/pom.xml
@@ -28,8 +28,6 @@
   </parent>
   <artifactId>teavm-metaprogramming-api</artifactId>
 
-  <packaging>bundle</packaging>
-
   <name>TeaVM metaprogramming API</name>
   <description>Declaration of interfaces and annotations for TeaVM metaprogramming</description>
 
@@ -70,17 +68,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>org.teavm.metaprogramming.*</Export-Package>
-            <Bundle-SymbolicName>teavm-metaprogramming-api</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
\ No newline at end of file
diff --git a/metaprogramming/impl/pom.xml b/metaprogramming/impl/pom.xml
index 009228526..540698127 100644
--- a/metaprogramming/impl/pom.xml
+++ b/metaprogramming/impl/pom.xml
@@ -28,8 +28,6 @@
 
   <artifactId>teavm-metaprogramming-impl</artifactId>
 
-  <packaging>bundle</packaging>
-
   <name>TeaVM metaprogramming API implementation</name>
   <description>Implementation of metaprogramming API</description>
 
@@ -45,6 +43,20 @@
       <artifactId>teavm-metaprogramming-api</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-commons</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-util</artifactId>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -82,15 +94,33 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>org.teavm.metaprogramming.*</Export-Package>
-            <Bundle-SymbolicName>teavm-metaprogramming-api</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <includes>
+                  <include>org.teavm:teavm-metaprogramming-impl</include>
+                </includes>
+              </artifactSet>
+              <relocations>
+                <relocation>
+                  <pattern>org.objectweb.asm</pattern>
+                  <shadedPattern>org.teavm.asm</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.apache.commons</pattern>
+                  <shadedPattern>org.teavm.apachecommons</shadedPattern>
+                </relocation>
+              </relocations>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
diff --git a/platform/pom.xml b/platform/pom.xml
index f253a7922..8f96204b7 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -24,8 +24,6 @@
   </parent>
   <artifactId>teavm-platform</artifactId>
 
-  <packaging>bundle</packaging>
-
   <name>TeaVM platform</name>
   <description>A low-level classes that help to implement Java class library</description>
 
@@ -50,17 +48,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>org.teavm.platform.*</Export-Package>
-            <Bundle-SymbolicName>teavm-platform</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 91679395c..195f5d0fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,6 +208,11 @@
         <artifactId>rhino</artifactId>
         <version>${rhino.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.1.1</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -287,11 +292,6 @@
             <configLocation>../checkstyle.xml</configLocation>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>4.1.0</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
diff --git a/tests/pom.xml b/tests/pom.xml
index 52137adc9..10ee9d67e 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -77,6 +77,12 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.carrotsearch</groupId>
+      <artifactId>hppc</artifactId>
+      <version>0.7.3</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/tools/chrome-rdp/pom.xml b/tools/chrome-rdp/pom.xml
index 962218ef3..d9d84ade4 100644
--- a/tools/chrome-rdp/pom.xml
+++ b/tools/chrome-rdp/pom.xml
@@ -25,8 +25,6 @@
   </parent>
   <artifactId>teavm-chrome-rdp</artifactId>
 
-  <packaging>bundle</packaging>
-
   <name>TeaVM debugging backend for Google Chrome RDP</name>
   <description>TeaVM debugging backend for Google Chrome RDP</description>
 
@@ -82,17 +80,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>org.teavm.chromerdp</Export-Package>
-            <Bundle-SymbolicName>teavm-chrome-rdp</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
\ No newline at end of file
diff --git a/tools/cli/pom.xml b/tools/cli/pom.xml
index 56c4a098f..a07051509 100644
--- a/tools/cli/pom.xml
+++ b/tools/cli/pom.xml
@@ -93,7 +93,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.1.0</version>
         <executions>
           <execution>
             <phase>package</phase>
diff --git a/tools/core/pom.xml b/tools/core/pom.xml
index ff2de9a53..02ed03291 100644
--- a/tools/core/pom.xml
+++ b/tools/core/pom.xml
@@ -24,7 +24,6 @@
     <relativePath>../..</relativePath>
   </parent>
   <artifactId>teavm-tooling</artifactId>
-  <packaging>bundle</packaging>
 
   <name>TeaVM tooling core</name>
   <description>TeaVM API that helps to create tooling</description>
@@ -40,6 +39,11 @@
       <artifactId>jackson-annotations</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 
   <build>
@@ -60,16 +64,43 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
       </plugin>
+
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>org.teavm.*</Export-Package>
-            <Bundle-SymbolicName>teavm-tooling</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <includes>
+                  <include>org.teavm:teavm-tooling</include>
+                </includes>
+              </artifactSet>
+              <relocations>
+                <relocation>
+                  <pattern>org.objectweb.asm</pattern>
+                  <shadedPattern>org.teavm.asm</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.mozilla</pattern>
+                  <shadedPattern>org.teavm.rhino</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>com.carrotsearch.hppc</pattern>
+                  <shadedPattern>org.teavm.hppc</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.apache.commons</pattern>
+                  <shadedPattern>org.teavm.apachecommons</shadedPattern>
+                </relocation>
+              </relocations>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
diff --git a/tools/idea/idea-artifacts/dep-pom.xml b/tools/idea/idea-artifacts/dep-pom.xml
index da89aa875..7f01c8492 100644
--- a/tools/idea/idea-artifacts/dep-pom.xml
+++ b/tools/idea/idea-artifacts/dep-pom.xml
@@ -62,11 +62,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.teavm</groupId>
-      <artifactId>teavm-metaprogramming-impl</artifactId>
-      <version>${teavm.version}</version>
-    </dependency>
   </dependencies>
 
   <build>
@@ -128,16 +123,6 @@
                   <exclude>com.jetbrains.intellij.idea:ideaIC:zip:*</exclude>
                 </excludes>
               </atrifactSet>
-              <relocations>
-                <relocation>
-                  <pattern>org.objectweb.asm</pattern>
-                  <shadedPattern>org.teavm.asm</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.objectweb.asm</pattern>
-                  <shadedPattern>org.teavm.asm</shadedPattern>
-                </relocation>
-              </relocations>
               <createDependencyReducedPom>false</createDependencyReducedPom>
               <outputFile>dependencies/teavm.jar</outputFile>
             </configuration>
diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuild.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuild.java
index 4f6341298..1950e3425 100644
--- a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuild.java
+++ b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuild.java
@@ -74,6 +74,12 @@ import org.teavm.vm.TeaVMProgressFeedback;
 import org.teavm.vm.TeaVMProgressListener;
 
 class TeaVMBuild {
+    private static final String[] BLACKLISTED_CLASSES = {
+            "org/teavm/jso/impl/JSOPlugin.class",
+            "org/teavm/metaprogramming/impl/MetaprogrammingImpl.class",
+            "org/teavm/classlib/impl/JCLPlugin.class"
+    };
+
     private final CompileContext context;
     private final List<String> classPathEntries = new ArrayList<>();
     private List<String> directoryClassPathEntries;
@@ -83,13 +89,15 @@ class TeaVMBuild {
     private final Map<File, int[]> fileLineCache = new HashMap<>();
     private BuildStrategy buildStrategy;
     private BuildOutputConsumer outputConsumer;
+    private boolean incrementaSupported;
 
     TeaVMBuild(CompileContext context, TeaVMBuilderAssistant assistant, BuildStrategy buildStrategy,
-            BuildOutputConsumer outputConsumer) {
+            BuildOutputConsumer outputConsumer, boolean incrementalSupported) {
         this.context = context;
         this.assistant = assistant;
         this.buildStrategy = buildStrategy;
         this.outputConsumer = outputConsumer;
+        this.incrementaSupported = incrementalSupported;
     }
 
     boolean perform(JpsModule module, TeaVMBuildTarget target) throws IOException, BuildException {
@@ -122,7 +130,7 @@ class TeaVMBuild {
         buildStrategy.setTargetType(config.getTargetType());
         buildStrategy.setTargetDirectory(config.getTargetDirectory());
         buildStrategy.setProgressListener(createProgressListener(context));
-        buildStrategy.setIncremental(!isRebuild(target));
+        buildStrategy.setIncremental(incrementaSupported && !isRebuild(target));
 
         Properties properties = new Properties();
         for (TeaVMProperty property : config.getProperties()) {
@@ -484,7 +492,7 @@ class TeaVMBuild {
                 JpsModuleDependency moduleDependency = (JpsModuleDependency) dependency;
                 File dependencyOutput = JpsJavaExtensionService.getInstance().getOutputDirectory(
                         moduleDependency.getModule(), false);
-                if (dependencyOutput != null) {
+                if (dependencyOutput != null && !isBlacklistedDependency(dependencyOutput)) {
                     classPathEntries.add(dependencyOutput.getPath());
                 }
                 for (JpsModuleSourceRoot sourceRoot : moduleDependency.getModule().getSourceRoots()) {
@@ -512,6 +520,15 @@ class TeaVMBuild {
         }
     }
 
+    private static boolean isBlacklistedDependency(File dependency) {
+        for (String entry : BLACKLISTED_CLASSES) {
+            if (new File(dependency, entry).exists()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private File getFileFromUrl(String url) {
         if (url.startsWith("file://")) {
             return new File(url.substring("file://".length()));
diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java
index a38e4b626..d298aba1f 100644
--- a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java
+++ b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java
@@ -77,7 +77,7 @@ public class TeaVMBuilder extends TargetBuilder<BuildRootDescriptor, TeaVMBuildT
             BuildStrategy buildStrategy = buildService != null
                     ? new RemoteBuildStrategy(buildService)
                     : createInProcessBuilder();
-            TeaVMBuild build = new TeaVMBuild(context, assistant, buildStrategy, outputConsumer);
+            TeaVMBuild build = new TeaVMBuild(context, assistant, buildStrategy, outputConsumer, buildService != null);
 
             build.perform(target.getModule(), target);
         } catch (BuildException e) {
diff --git a/upload-files.sh b/upload-files.sh
index 6e5726a2a..beb08203e 100755
--- a/upload-files.sh
+++ b/upload-files.sh
@@ -29,10 +29,10 @@ curl --ftp-create-dirs -T .idea-repository.xml \
 #
 # Upload Eclipse plugin
 #
-cd tools/eclipse/updatesite/target/repository
-  find . -type f -exec curl \
-    --ftp-create-dirs \
-    -u $TEAVM_FTP_LOGIN:$TEAVM_FTP_PASSWORD \
-    -T {} \
-    ftp://$TEAVM_FTP_HOST/httpdocs/eclipse/update-site/$BASE_VERSION-dev/{} \;
-cd ../../../../..
\ No newline at end of file
+#cd tools/eclipse/updatesite/target/repository
+#  find . -type f -exec curl \
+#    --ftp-create-dirs \
+#    -u $TEAVM_FTP_LOGIN:$TEAVM_FTP_PASSWORD \
+#    -T {} \
+#    ftp://$TEAVM_FTP_HOST/httpdocs/eclipse/update-site/$BASE_VERSION-dev/{} \;
+#cd ../../../../..
\ No newline at end of file