From 2a52c02bf9ecaa96d1d7e00341b71cf4c22a2d20 Mon Sep 17 00:00:00 2001
From: Alexey Andreev <konsoletyper@gmail.com>
Date: Thu, 25 Sep 2014 13:59:38 +0400
Subject: [PATCH] Configure to build with bundled TeaVM

---
 teavm-eclipse/pom.xml                         |   3 +-
 .../teavm-eclipse-core-plugin/.gitignore      |   1 +
 .../META-INF/MANIFEST.MF                      |  95 +++++
 .../build.properties                          |  51 +++
 .../teavm-eclipse-core-plugin/pom.xml         |   2 +-
 .../teavm-eclipse-feature/.gitignore          |   2 +
 .../teavm-eclipse-feature/feature.xml         | 334 ++----------------
 .../teavm-eclipse-m2e-plugin/.gitignore       |   3 +
 .../teavm-eclipse-m2e-plugin/pom.xml          |   8 +
 .../teavm-eclipse-m2e-plugin/src/plugin.xml   |  19 -
 teavm-eclipse/teavm-eclipse-plugin/.gitignore |   5 +-
 .../teavm-eclipse-plugin/META-INF/MANIFEST.MF |   5 +-
 teavm-eclipse/teavm-eclipse-plugin/pom.xml    |   8 +
 .../teavm-eclipse-updatesite/.gitignore       |   2 +
 14 files changed, 201 insertions(+), 337 deletions(-)
 create mode 100644 teavm-eclipse/teavm-eclipse-core-plugin/META-INF/MANIFEST.MF
 create mode 100644 teavm-eclipse/teavm-eclipse-core-plugin/build.properties
 delete mode 100644 teavm-eclipse/teavm-eclipse-m2e-plugin/src/plugin.xml

diff --git a/teavm-eclipse/pom.xml b/teavm-eclipse/pom.xml
index 4cfa1caf9..4277e17a4 100644
--- a/teavm-eclipse/pom.xml
+++ b/teavm-eclipse/pom.xml
@@ -34,8 +34,9 @@
   </properties>
 
   <modules>
-    <module>teavm-eclipse-repository</module>
+    <module>teavm-eclipse-core-plugin</module>
     <module>teavm-eclipse-plugin</module>
+    <module>teavm-eclipse-m2e-plugin</module>
     <module>teavm-eclipse-feature</module>
     <module>teavm-eclipse-updatesite</module>
   </modules>
diff --git a/teavm-eclipse/teavm-eclipse-core-plugin/.gitignore b/teavm-eclipse/teavm-eclipse-core-plugin/.gitignore
index c708c363d..8f0913a70 100644
--- a/teavm-eclipse/teavm-eclipse-core-plugin/.gitignore
+++ b/teavm-eclipse/teavm-eclipse-core-plugin/.gitignore
@@ -2,3 +2,4 @@
 /.settings
 /.classpath
 /.project
+/lib
diff --git a/teavm-eclipse/teavm-eclipse-core-plugin/META-INF/MANIFEST.MF b/teavm-eclipse/teavm-eclipse-core-plugin/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..64a529944
--- /dev/null
+++ b/teavm-eclipse/teavm-eclipse-core-plugin/META-INF/MANIFEST.MF
@@ -0,0 +1,95 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: TeaVM plugin for Eclipse
+Bundle-SymbolicName: teavm-eclipse-core-plugin;singleton:=true
+Bundle-Version: 0.2.0.qualifer
+Bundle-Vendor: Alexey Andreev <konsoletyper@gmail.com>
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ClassPath: .,
+ lib/asm-5.0.1.jar,
+ lib/asm-commons-5.0.1.jar,
+ lib/asm-debug-all-4.2.jar,
+ lib/asm-tree-5.0.1.jar,
+ lib/cdi-api-1.2.jar,
+ lib/commons-io-2.4.jar,
+ lib/gson-2.2.4.jar,
+ lib/jackson-core-asl-1.9.13.jar,
+ lib/jackson-mapper-asl-1.9.13.jar,
+ lib/javax-websocket-client-impl-9.2.1.v20140609.jar,
+ lib/javax-websocket-server-impl-9.2.1.v20140609.jar,
+ lib/javax.annotation-api-1.2.jar,
+ lib/javax.el-api-3.0.0.jar,
+ lib/javax.inject-1.jar,
+ lib/javax.interceptor-api-1.2.jar,
+ lib/javax.servlet-api-3.1.0.jar,
+ lib/javax.transaction-api-1.2.jar,
+ lib/javax.websocket-api-1.0.jar,
+ lib/jetty-annotations-9.2.1.v20140609.jar,
+ lib/jetty-http-9.2.1.v20140609.jar,
+ lib/jetty-io-9.2.1.v20140609.jar,
+ lib/jetty-jndi-9.2.1.v20140609.jar,
+ lib/jetty-plus-9.2.1.v20140609.jar,
+ lib/jetty-security-9.2.1.v20140609.jar,
+ lib/jetty-server-9.2.1.v20140609.jar,
+ lib/jetty-servlet-9.2.1.v20140609.jar,
+ lib/jetty-util-9.2.1.v20140609.jar,
+ lib/jetty-webapp-9.2.1.v20140609.jar,
+ lib/jetty-xml-9.2.1.v20140609.jar,
+ lib/logback-classic-1.1.2.jar,
+ lib/logback-core-1.1.2.jar,
+ lib/org.apache.aries.spifly.core-internal-1.0.1.jar,
+ lib/org.apache.aries.spifly.dynamic.bundle-1.0.1.jar,
+ lib/org.apache.aries.spifly.weaver-internal-1.0.1.jar,
+ lib/org.apache.aries.util-1.0.0.jar,
+ lib/slf4j-api-1.7.7.jar,
+ lib/teavm-chrome-rdp-0.2-SNAPSHOT.jar,
+ lib/teavm-classlib-0.2-SNAPSHOT.jar,
+ lib/teavm-core-0.2-SNAPSHOT.jar,
+ lib/teavm-platform-0.2-SNAPSHOT.jar,
+ lib/websocket-api-9.2.1.v20140609.jar,
+ lib/websocket-client-9.2.1.v20140609.jar,
+ lib/websocket-common-9.2.1.v20140609.jar,
+ lib/websocket-server-9.2.1.v20140609.jar,
+ lib/websocket-servlet-9.2.1.v20140609.jar
+Bundle-ActivationPolicy: lazy
+Export-Package: org.teavm.cache,
+ org.teavm.chromerdp,
+ org.teavm.chromerdp.data,
+ org.teavm.chromerdp.messages,
+ org.teavm.classlib.impl,
+ org.teavm.classlib.impl.charset,
+ org.teavm.classlib.impl.report,
+ org.teavm.classlib.impl.unicode,
+ org.teavm.classlib.java.io,
+ org.teavm.classlib.java.lang,
+ org.teavm.classlib.java.lang.annotation,
+ org.teavm.classlib.java.lang.ref,
+ org.teavm.classlib.java.lang.reflect,
+ org.teavm.classlib.java.math,
+ org.teavm.classlib.java.net,
+ org.teavm.classlib.java.nio,
+ org.teavm.classlib.java.text,
+ org.teavm.classlib.java.util,
+ org.teavm.classlib.java.util.concurrent,
+ org.teavm.classlib.java.util.logging,
+ org.teavm.codegen,
+ org.teavm.common,
+ org.teavm.debugging,
+ org.teavm.debugging.information,
+ org.teavm.debugging.javascript,
+ org.teavm.dependency,
+ org.teavm.javascript,
+ org.teavm.javascript.ast,
+ org.teavm.javascript.ni,
+ org.teavm.model,
+ org.teavm.model.instructions,
+ org.teavm.model.util,
+ org.teavm.optimization,
+ org.teavm.parsing,
+ org.teavm.platform.metadata,
+ org.teavm.platform.plugin,
+ org.teavm.resource,
+ org.teavm.testing,
+ org.teavm.tooling,
+ org.teavm.vm,
+ org.teavm.vm.spi
diff --git a/teavm-eclipse/teavm-eclipse-core-plugin/build.properties b/teavm-eclipse/teavm-eclipse-core-plugin/build.properties
new file mode 100644
index 000000000..44a9cbeba
--- /dev/null
+++ b/teavm-eclipse/teavm-eclipse-core-plugin/build.properties
@@ -0,0 +1,51 @@
+source.. = src/main/java/
+output.. = target/
+bin.includes = META-INF/,\
+               .,\
+               lib/,\
+               lib/asm-5.0.1.jar,\
+               lib/asm-commons-5.0.1.jar,\
+               lib/asm-debug-all-4.2.jar,\
+               lib/asm-tree-5.0.1.jar,\
+               lib/cdi-api-1.2.jar,\
+               lib/commons-io-2.4.jar,\
+               lib/gson-2.2.4.jar,\
+               lib/jackson-core-asl-1.9.13.jar,\
+               lib/jackson-mapper-asl-1.9.13.jar,\
+               lib/javax-websocket-client-impl-9.2.1.v20140609.jar,\
+               lib/javax-websocket-server-impl-9.2.1.v20140609.jar,\
+               lib/javax.annotation-api-1.2.jar,\
+               lib/javax.el-api-3.0.0.jar,\
+               lib/javax.inject-1.jar,\
+               lib/javax.interceptor-api-1.2.jar,\
+               lib/javax.servlet-api-3.1.0.jar,\
+               lib/javax.transaction-api-1.2.jar,\
+               lib/javax.websocket-api-1.0.jar,\
+               lib/jetty-annotations-9.2.1.v20140609.jar,\
+               lib/jetty-http-9.2.1.v20140609.jar,\
+               lib/jetty-io-9.2.1.v20140609.jar,\
+               lib/jetty-jndi-9.2.1.v20140609.jar,\
+               lib/jetty-plus-9.2.1.v20140609.jar,\
+               lib/jetty-security-9.2.1.v20140609.jar,\
+               lib/jetty-server-9.2.1.v20140609.jar,\
+               lib/jetty-servlet-9.2.1.v20140609.jar,\
+               lib/jetty-util-9.2.1.v20140609.jar,\
+               lib/jetty-webapp-9.2.1.v20140609.jar,\
+               lib/jetty-xml-9.2.1.v20140609.jar,\
+               lib/logback-classic-1.1.2.jar,\
+               lib/logback-core-1.1.2.jar,\
+               lib/org.apache.aries.spifly.core-internal-1.0.1.jar,\
+               lib/org.apache.aries.spifly.dynamic.bundle-1.0.1.jar,\
+               lib/org.apache.aries.spifly.weaver-internal-1.0.1.jar,\
+               lib/org.apache.aries.util-1.0.0.jar,\
+               lib/slf4j-api-1.7.7.jar,\
+               lib/teavm-chrome-rdp-0.2-SNAPSHOT.jar,\
+               lib/teavm-classlib-0.2-SNAPSHOT.jar,\
+               lib/teavm-core-0.2-SNAPSHOT.jar,\
+               lib/teavm-platform-0.2-SNAPSHOT.jar,\
+               lib/websocket-api-9.2.1.v20140609.jar,\
+               lib/websocket-client-9.2.1.v20140609.jar,\
+               lib/websocket-common-9.2.1.v20140609.jar,\
+               lib/websocket-server-9.2.1.v20140609.jar,\
+               lib/websocket-servlet-9.2.1.v20140609.jar
+jars.compile.order = .
diff --git a/teavm-eclipse/teavm-eclipse-core-plugin/pom.xml b/teavm-eclipse/teavm-eclipse-core-plugin/pom.xml
index d0be2a3c5..5e9b0f7c7 100644
--- a/teavm-eclipse/teavm-eclipse-core-plugin/pom.xml
+++ b/teavm-eclipse/teavm-eclipse-core-plugin/pom.xml
@@ -23,7 +23,7 @@
     <version>0.2-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
-  <artifactId>teavm-eclipse-repository</artifactId>
+  <artifactId>teavm-eclipse-core-plugin</artifactId>
   <version>0.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
diff --git a/teavm-eclipse/teavm-eclipse-feature/.gitignore b/teavm-eclipse/teavm-eclipse-feature/.gitignore
index ea8c4bf7f..dc18fc4dc 100644
--- a/teavm-eclipse/teavm-eclipse-feature/.gitignore
+++ b/teavm-eclipse/teavm-eclipse-feature/.gitignore
@@ -1 +1,3 @@
 /target
+/.settings
+/.project
diff --git a/teavm-eclipse/teavm-eclipse-feature/feature.xml b/teavm-eclipse/teavm-eclipse-feature/feature.xml
index 5733f9f63..36298fb1f 100644
--- a/teavm-eclipse/teavm-eclipse-feature/feature.xml
+++ b/teavm-eclipse/teavm-eclipse-feature/feature.xml
@@ -3,20 +3,29 @@
       id="teavm-eclipse-feature"
       label="TeaVM Eclipse support"
       version="0.2.0.qualifier"
-      provider-name="Alexey Andreev &lt;konsoletyper@gmail.com&gt;"
-      os="aix,hpux,linux,macosx,qnx,solaris,win32"
-      ws="carbon,cocoa,gtk,motif,photon,win32,wpf"
-      arch="ia64,ia64_32,PA_RISC,ppc,sparc,x86,x86_64">
+      provider-name="Alexey Andreev &lt;konsoletyper@gmail.com&gt;">
 
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
+  <description url="http://www.example.com/description">
+      TeaVM support
+  </description>
 
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
+  <copyright url="http://www.example.com/copyright">
+    Copyright 2014 Alexey Andreev.
 
-   <license url="http://www.apache.org/licenses/LICENSE-2.0.html">
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+  </copyright>
+
+  <license url="http://www.apache.org/licenses/LICENSE-2.0.html">
       Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -220,312 +229,15 @@
    limitations under the License.
    </license>
 
-   <plugin
+  <plugin
          id="teavm-eclipse-plugin"
-         os="aix,hpux,linux,macosx,qnx,solaris,win32"
-         ws="carbon,cocoa,gtk,motif,photon,win32,wpf"
-         arch="ia64,ia64_32,PA_RISC,ppc,sparc,x86,x86_64"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="ch.qos.logback.classic"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="ch.qos.logback.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.google.gson"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="jackson-core-asl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="jackson-mapper-asl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.annotation-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.servlet-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.websocket-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.io"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.annotations"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.http"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.io"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.jndi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.plus"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.security"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.server"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.servlet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.webapp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.websocket.api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.websocket.client"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.websocket.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.websocket.javax.websocket"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.websocket.server"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.websocket.servlet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.xml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.objectweb.asm.all.debug"
-         download-size="0"
-         install-size="0"
-         version="4.2.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.objectweb.asm"
-         download-size="0"
-         install-size="0"
-         version="5.0.1"
-         unpack="false"/>
-
-   <plugin
-         id="org.objectweb.asm.commons"
-         download-size="0"
-         install-size="0"
-         version="5.0.1"
-         unpack="false"/>
-
-   <plugin
-         id="org.objectweb.asm.tree"
-         download-size="0"
-         install-size="0"
-         version="5.0.1"
-         unpack="false"/>
-
-   <plugin
-         id="slf4j.api"
-         download-size="0"
-         install-size="0"
-         version="1.7.6"
-         unpack="false"/>
-
-   <plugin
-         id="teavm-chrome-rdp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="teavm-classlib"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="teavm-core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="teavm-platform"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.aries.spifly.dynamic.bundle"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.aries.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.transaction-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.interceptor-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.enterprise.cdi-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.websocket.javax.websocket.server"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.el-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.inject.javax.inject"
+  <plugin
+         id="teavm-eclipse-plugin"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/teavm-eclipse/teavm-eclipse-m2e-plugin/.gitignore b/teavm-eclipse/teavm-eclipse-m2e-plugin/.gitignore
index ea8c4bf7f..c708c363d 100644
--- a/teavm-eclipse/teavm-eclipse-m2e-plugin/.gitignore
+++ b/teavm-eclipse/teavm-eclipse-m2e-plugin/.gitignore
@@ -1 +1,4 @@
 /target
+/.settings
+/.classpath
+/.project
diff --git a/teavm-eclipse/teavm-eclipse-m2e-plugin/pom.xml b/teavm-eclipse/teavm-eclipse-m2e-plugin/pom.xml
index b455b84a1..2c062ca7b 100644
--- a/teavm-eclipse/teavm-eclipse-m2e-plugin/pom.xml
+++ b/teavm-eclipse/teavm-eclipse-m2e-plugin/pom.xml
@@ -27,6 +27,14 @@
   <packaging>eclipse-plugin</packaging>
   <version>0.2.0-SNAPSHOT</version>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.teavm</groupId>
+      <artifactId>teavm-eclipse-plugin</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
   <build>
     <pluginManagement>
       <plugins>
diff --git a/teavm-eclipse/teavm-eclipse-m2e-plugin/src/plugin.xml b/teavm-eclipse/teavm-eclipse-m2e-plugin/src/plugin.xml
deleted file mode 100644
index 58ddd5620..000000000
--- a/teavm-eclipse/teavm-eclipse-m2e-plugin/src/plugin.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2014 Alexey Andreev.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<?eclipse version="3.0"?>
-<plugin>
-</plugin>
diff --git a/teavm-eclipse/teavm-eclipse-plugin/.gitignore b/teavm-eclipse/teavm-eclipse-plugin/.gitignore
index 61b2b4207..dbe5a1815 100644
--- a/teavm-eclipse/teavm-eclipse-plugin/.gitignore
+++ b/teavm-eclipse/teavm-eclipse-plugin/.gitignore
@@ -1,2 +1,5 @@
 /lib
-/target
\ No newline at end of file
+/target
+/.settings
+/.classpath
+/.project
diff --git a/teavm-eclipse/teavm-eclipse-plugin/META-INF/MANIFEST.MF b/teavm-eclipse/teavm-eclipse-plugin/META-INF/MANIFEST.MF
index 99e528365..4fb752524 100644
--- a/teavm-eclipse/teavm-eclipse-plugin/META-INF/MANIFEST.MF
+++ b/teavm-eclipse/teavm-eclipse-plugin/META-INF/MANIFEST.MF
@@ -22,10 +22,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0)",
  org.eclipse.core.variables;bundle-version="[3.2.600,4)",
  org.eclipse.core.databinding.observable;bundle-version="[1.4.1,2)",
  org.eclipse.jface.databinding;bundle-version="[1.6.0,2)",
- teavm-core;bundle-version="[0.2.0,3)",
- teavm-classlib;bundle-version="[0.2.0,3)",
- teavm-platform;bundle-version="[0.2.0,3)",
- teavm-chrome-rdp;bundle-version="[0.2.0,3)"
+ teavm-eclipse-core-plugin;bundle-version="0.2.0"
 Bundle-ClassPath: .
 Export-Package: org.teavm.eclipse.debugger,org.teavm.eclipse
 Bundle-ActivationPolicy: lazy
diff --git a/teavm-eclipse/teavm-eclipse-plugin/pom.xml b/teavm-eclipse/teavm-eclipse-plugin/pom.xml
index 1dba381ba..117bbbd9a 100644
--- a/teavm-eclipse/teavm-eclipse-plugin/pom.xml
+++ b/teavm-eclipse/teavm-eclipse-plugin/pom.xml
@@ -27,6 +27,14 @@
   <version>0.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.teavm</groupId>
+      <artifactId>teavm-eclipse-core-plugin</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
   <build>
     <pluginManagement>
       <plugins>
diff --git a/teavm-eclipse/teavm-eclipse-updatesite/.gitignore b/teavm-eclipse/teavm-eclipse-updatesite/.gitignore
index ea8c4bf7f..dc18fc4dc 100644
--- a/teavm-eclipse/teavm-eclipse-updatesite/.gitignore
+++ b/teavm-eclipse/teavm-eclipse-updatesite/.gitignore
@@ -1 +1,3 @@
 /target
+/.settings
+/.project