From 5de2ab943e781f08b6c5741fdf71bc4cfe95b91e Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@gopivotal.com>
Date: Mon, 17 Mar 2014 22:10:48 -0700
Subject: [PATCH] Add m2e integration to update site and tycho build

---
 .../.project                                     |  2 +-
 .../feature.xml                                  |  4 ++--
 .../pom.xml                                      | 16 ++++++++++++++++
 extras/org.codehaus.groovy.m2eclipse/pom.xml     | 13 +++++++++++++
 .../Site-org.codehaus.groovy.eclipse/site.xml    |  4 ++--
 pom.xml                                          |  5 ++++-
 6 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 extras/Feature-org.codehaus.groovy.m2eclipse/pom.xml
 create mode 100644 extras/org.codehaus.groovy.m2eclipse/pom.xml

diff --git a/extras/Feature-org.codehaus.groovy.m2eclipse/.project b/extras/Feature-org.codehaus.groovy.m2eclipse/.project
index e6efb87ca7..44fd80f891 100644
--- a/extras/Feature-org.codehaus.groovy.m2eclipse/.project
+++ b/extras/Feature-org.codehaus.groovy.m2eclipse/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Feature org.codehaus.groovy.m2eclipse</name>
+	<name>Feature-org.codehaus.groovy.m2eclipse</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/extras/Feature-org.codehaus.groovy.m2eclipse/feature.xml b/extras/Feature-org.codehaus.groovy.m2eclipse/feature.xml
index 7fce7e946f..adad118a69 100644
--- a/extras/Feature-org.codehaus.groovy.m2eclipse/feature.xml
+++ b/extras/Feature-org.codehaus.groovy.m2eclipse/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.codehaus.groovy.m2eclipse"
+      id="org.codehaus.groovy.m2eclipse.feature"
       label="%featureName"
       version="2.9.0.qualifier"
       provider-name="%providerName">
@@ -25,7 +25,7 @@
       <import plugin="org.codehaus.groovy.eclipse.core" version="2.0.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jdt.core" version="3.5.1" match="greaterOrEqual"/>
       <import feature="org.codehaus.groovy.eclipse.feature" version="2.8.0.qualifier"/>
-      <import feature="org.eclipse.m2e.feature" version="1.0.0" match="greaterOrEqual"/>
+      <!-- <import feature="org.eclipse.m2e.feature" version="1.0.0" match="greaterOrEqual"/> -->
    </requires>
 
    <plugin
diff --git a/extras/Feature-org.codehaus.groovy.m2eclipse/pom.xml b/extras/Feature-org.codehaus.groovy.m2eclipse/pom.xml
new file mode 100644
index 0000000000..37c42dcf8d
--- /dev/null
+++ b/extras/Feature-org.codehaus.groovy.m2eclipse/pom.xml
@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<relativePath>../../pom.xml</relativePath>
+		<groupId>org.codehaus.groovy.eclipse</groupId>
+		<artifactId>org.codehaus.groovy.eclipse.parent</artifactId>
+		<version>2.9.0-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.codehaus.groovy.eclipse</groupId>
+	<artifactId>org.codehaus.groovy.m2eclipse.feature</artifactId>
+	<version>2.9.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+
+</project>
\ No newline at end of file
diff --git a/extras/org.codehaus.groovy.m2eclipse/pom.xml b/extras/org.codehaus.groovy.m2eclipse/pom.xml
new file mode 100644
index 0000000000..2eee03fb5f
--- /dev/null
+++ b/extras/org.codehaus.groovy.m2eclipse/pom.xml
@@ -0,0 +1,13 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+  	<relativePath>../../pom.xml</relativePath>
+    <groupId>org.codehaus.groovy.eclipse</groupId>
+    <artifactId>org.codehaus.groovy.eclipse.parent</artifactId>
+    <version>2.9.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.codehaus.groovy.eclipse</groupId>
+  <artifactId>org.codehaus.groovy.m2eclipse</artifactId>
+  <version>2.9.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/jdt-patch/e43j8/Site-org.codehaus.groovy.eclipse/site.xml b/jdt-patch/e43j8/Site-org.codehaus.groovy.eclipse/site.xml
index d6e0a7af37..cc4b885bad 100644
--- a/jdt-patch/e43j8/Site-org.codehaus.groovy.eclipse/site.xml
+++ b/jdt-patch/e43j8/Site-org.codehaus.groovy.eclipse/site.xml
@@ -33,10 +33,10 @@
       <category name="org.codehaus.groovy.compilers"/>
    </feature>
    
-   <!--
-   <feature url="features/org.codehaus.groovy.m2eclipse_2.9.0.qualifier.jar" id="org.codehaus.groovy.m2eclipse" version="2.9.0.qualifier">
+   <feature url="features/org.codehaus.groovy.m2eclipse.feature_2.9.0.qualifier.jar" id="org.codehaus.groovy.m2eclipse.feature" version="2.9.0.qualifier">
       <category name="org.codehaus.groovy.m2eclipse"/>
    </feature>
+   <!--
    <feature url="features/org.codehaus.groovy.m2eclipse.source_2.9.0.qualifier.jar" id="org.codehaus.groovy.m2eclipse.source" version="2.9.0.qualifier">
       <category name="org.codehaus.groovy.m2eclipse"/>
    </feature>
diff --git a/pom.xml b/pom.xml
index c3a565de55..41c141a65f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,10 @@
 	</properties>
 
 	<modules>
-
+	
+		<!-- m2e integration -->
+		<module>extras/Feature-org.codehaus.groovy.m2eclipse</module>
+		<module>extras/org.codehaus.groovy.m2eclipse</module>
 		<!-- SDK and test bits -->
 
 		<module>ide-test</module> <!-- parent pom for all the ide-test modules -->