From 194c7bf8065fe8239a02a8a9e4cfce8287138988 Mon Sep 17 00:00:00 2001
From: konsoletyper <konsoletyper@gmail.com>
Date: Mon, 22 Sep 2014 22:27:19 +0400
Subject: [PATCH] Configuration

---
 teavm-core/pom.xml                                |  2 --
 teavm-eclipse/teavm-eclipse-feature/.gitignore    |  1 +
 teavm-eclipse/teavm-eclipse-feature/.project      |  6 ++++++
 teavm-eclipse/teavm-eclipse-feature/feature.xml   | 12 ++++++------
 teavm-eclipse/teavm-eclipse-plugin/.classpath     |  4 ++--
 teavm-eclipse/teavm-eclipse-plugin/.project       |  6 ++++++
 teavm-eclipse/teavm-eclipse-updatesite/.gitignore |  1 +
 teavm-eclipse/teavm-eclipse-updatesite/.project   |  6 ++++++
 8 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 teavm-eclipse/teavm-eclipse-feature/.gitignore
 create mode 100644 teavm-eclipse/teavm-eclipse-updatesite/.gitignore

diff --git a/teavm-core/pom.xml b/teavm-core/pom.xml
index 35170d7ea..e9185a16c 100644
--- a/teavm-core/pom.xml
+++ b/teavm-core/pom.xml
@@ -70,8 +70,6 @@
           <instructions>
             <Export-Package>org.teavm.*</Export-Package>
             <Bundle-SymbolicName>teavm-core</Bundle-SymbolicName>
-            <Import-Package>org.apache.commons.io;version="[1.4,2.5)",org.junit,org.objectweb.asm;version="[4.2,6)",
-              org.objectweb.asm.tree;version="[4.2,6)"</Import-Package>
           </instructions>
         </configuration>
       </plugin>
diff --git a/teavm-eclipse/teavm-eclipse-feature/.gitignore b/teavm-eclipse/teavm-eclipse-feature/.gitignore
new file mode 100644
index 000000000..ea8c4bf7f
--- /dev/null
+++ b/teavm-eclipse/teavm-eclipse-feature/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/teavm-eclipse/teavm-eclipse-feature/.project b/teavm-eclipse/teavm-eclipse-feature/.project
index 8302ff614..2de74d794 100644
--- a/teavm-eclipse/teavm-eclipse-feature/.project
+++ b/teavm-eclipse/teavm-eclipse-feature/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
 </projectDescription>
diff --git a/teavm-eclipse/teavm-eclipse-feature/feature.xml b/teavm-eclipse/teavm-eclipse-feature/feature.xml
index 4a1fea5cd..4be59e47c 100644
--- a/teavm-eclipse/teavm-eclipse-feature/feature.xml
+++ b/teavm-eclipse/teavm-eclipse-feature/feature.xml
@@ -416,42 +416,42 @@
          id="org.objectweb.asm"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="5.0.1"
          unpack="false"/>
 
    <plugin
          id="org.objectweb.asm.all.debug"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="4.2.0"
          unpack="false"/>
 
    <plugin
          id="org.objectweb.asm.commons"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="5.0.1"
          unpack="false"/>
 
    <plugin
          id="org.objectweb.asm.tree"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="5.0.1"
          unpack="false"/>
 
    <plugin
          id="slf4j.api"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.7.6"
          unpack="false"/>
 
    <plugin
          id="slf4j.api"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.7.7"
          unpack="false"/>
 
    <plugin
diff --git a/teavm-eclipse/teavm-eclipse-plugin/.classpath b/teavm-eclipse/teavm-eclipse-plugin/.classpath
index 0cd17ab4d..98ddc48ed 100644
--- a/teavm-eclipse/teavm-eclipse-plugin/.classpath
+++ b/teavm-eclipse/teavm-eclipse-plugin/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="target"/>
+	<classpathentry kind="src" path="src/main/java/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/teavm-eclipse/teavm-eclipse-plugin/.project b/teavm-eclipse/teavm-eclipse-plugin/.project
index f240a85f5..71be2fe7a 100644
--- a/teavm-eclipse/teavm-eclipse-plugin/.project
+++ b/teavm-eclipse/teavm-eclipse-plugin/.project
@@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/teavm-eclipse/teavm-eclipse-updatesite/.gitignore b/teavm-eclipse/teavm-eclipse-updatesite/.gitignore
new file mode 100644
index 000000000..ea8c4bf7f
--- /dev/null
+++ b/teavm-eclipse/teavm-eclipse-updatesite/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/teavm-eclipse/teavm-eclipse-updatesite/.project b/teavm-eclipse/teavm-eclipse-updatesite/.project
index dfe9370ed..a6fb38251 100644
--- a/teavm-eclipse/teavm-eclipse-updatesite/.project
+++ b/teavm-eclipse/teavm-eclipse-updatesite/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.UpdateSiteNature</nature>
 	</natures>
 </projectDescription>