From bbd66660116daf8ea768e5e5187b2cdf4672aa91 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Thu, 30 Apr 2015 18:05:03 +0200
Subject: [PATCH] Update plugin version to 1.2.0 GenModel Addon is now in
 version 1.2.0

Change-Id: I24d1bcb5a1397e93b1a8c32f94ff6854e4c44a76
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 build/com.opcoach.genmodeladdon.feature/feature.xml         | 6 +++++-
 build/com.opcoach.genmodeladdon.feature/pom.xml             | 4 ++--
 build/com.opcoach.genmodeladdon.parent/pom.xml              | 6 +++---
 build/com.opcoach.genmodeladdon.repository/category.xml     | 2 +-
 build/com.opcoach.genmodeladdon.repository/pom.xml          | 2 +-
 com.opcoach.genmodeladdon.core/META-INF/MANIFEST.MF         | 2 +-
 com.opcoach.genmodeladdon.core/pom.xml                      | 2 +-
 .../opcoach/genmodeladdon/core/GenerateDevStructure.xtend   | 3 ++-
 .../opcoach/genmodeladdon/core/GenerateDevStructure.java    | 4 +++-
 com.opcoach.genmodeladdon.ui/META-INF/MANIFEST.MF           | 2 +-
 com.opcoach.genmodeladdon.ui/pom.xml                        | 2 +-
 11 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/build/com.opcoach.genmodeladdon.feature/feature.xml b/build/com.opcoach.genmodeladdon.feature/feature.xml
index 75a6098..5f97806 100644
--- a/build/com.opcoach.genmodeladdon.feature/feature.xml
+++ b/build/com.opcoach.genmodeladdon.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.opcoach.genmodeladdon.feature"
       label="Emf override generated code feature"
-      version="1.1.0.qualifier"
+      version="1.2.0.qualifier"
       provider-name="OPCOACH">
 
    <description url="http://www.example.com/description">
@@ -27,6 +27,10 @@
       <import plugin="com.opcoach.genmodeladdon.core" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.expressions"/>
       <import plugin="com.google.guava" version="10.0.1"/>
+      <import plugin="org.eclipse.xtext.xbase.lib" version="2.7.3" match="greaterOrEqual"/>
+      <import plugin="org.apache.commons.io"/>
+      <import plugin="org.eclipse.jdt.core" version="3.10.2" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.resources" version="3.9.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/build/com.opcoach.genmodeladdon.feature/pom.xml b/build/com.opcoach.genmodeladdon.feature/pom.xml
index 8f4dbb5..530a500 100644
--- a/build/com.opcoach.genmodeladdon.feature/pom.xml
+++ b/build/com.opcoach.genmodeladdon.feature/pom.xml
@@ -13,7 +13,7 @@
 
 	<groupId>com.opcoach.genmodeladdon</groupId>
 	<artifactId>com.opcoach.genmodeladdon.feature</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/build/com.opcoach.genmodeladdon.parent/pom.xml b/build/com.opcoach.genmodeladdon.parent/pom.xml
index 29925de..b3f848b 100644
--- a/build/com.opcoach.genmodeladdon.parent/pom.xml
+++ b/build/com.opcoach.genmodeladdon.parent/pom.xml
@@ -67,10 +67,10 @@
 
 	<!-- the modules that should be built together -->
 	<modules>
-		<module>../../com.opcoach.genmodeladdon.core</module>
-		<module>../../com.opcoach.genmodeladdon.ui</module>
-		<module>../com.opcoach.genmodeladdon.feature</module>
 		<module>../com.opcoach.genmodeladdon.repository</module>
+		<module>../com.opcoach.genmodeladdon.feature</module>
+		<module>../../com.opcoach.genmodeladdon.ui</module>
+		<module>../../com.opcoach.genmodeladdon.core</module>
 	</modules>
 
 </project>
\ No newline at end of file
diff --git a/build/com.opcoach.genmodeladdon.repository/category.xml b/build/com.opcoach.genmodeladdon.repository/category.xml
index 85bfca8..fc5ab33 100644
--- a/build/com.opcoach.genmodeladdon.repository/category.xml
+++ b/build/com.opcoach.genmodeladdon.repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/com.opcoach.genmodeladdon.feature_1.1.0.qualifier.jar" id="com.opcoach.genmodeladdon.feature" version="1.1.0.qualifier">
+   <feature url="features/com.opcoach.genmodeladdon.feature_1.2.0.qualifier.jar" id="com.opcoach.genmodeladdon.feature" version="1.2.0.qualifier">
       <category name="com.opcoach.genModelAddon"/>
    </feature>
    <category-def name="com.opcoach.genModelAddon" label="Addon for genmodel">
diff --git a/build/com.opcoach.genmodeladdon.repository/pom.xml b/build/com.opcoach.genmodeladdon.repository/pom.xml
index acff23d..4393fb0 100644
--- a/build/com.opcoach.genmodeladdon.repository/pom.xml
+++ b/build/com.opcoach.genmodeladdon.repository/pom.xml
@@ -13,7 +13,7 @@
 
 	<groupId>com.opcoach.genmodeladdon</groupId>
 	<artifactId>com.opcoach.genmodeladdon.repository</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 
 
diff --git a/com.opcoach.genmodeladdon.core/META-INF/MANIFEST.MF b/com.opcoach.genmodeladdon.core/META-INF/MANIFEST.MF
index ac1b05c..82e77e1 100644
--- a/com.opcoach.genmodeladdon.core/META-INF/MANIFEST.MF
+++ b/com.opcoach.genmodeladdon.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Core
 Bundle-SymbolicName: com.opcoach.genmodeladdon.core
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-Vendor: OPCOACH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.xtend;bundle-version="2.0.0";resolution:=optional,
diff --git a/com.opcoach.genmodeladdon.core/pom.xml b/com.opcoach.genmodeladdon.core/pom.xml
index 7128926..5ecef95 100644
--- a/com.opcoach.genmodeladdon.core/pom.xml
+++ b/com.opcoach.genmodeladdon.core/pom.xml
@@ -13,7 +13,7 @@
 
 	<groupId>com.opcoach.genmodeladdon</groupId>
 	<artifactId>com.opcoach.genmodeladdon.core</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 </project>
\ No newline at end of file
diff --git a/com.opcoach.genmodeladdon.core/src/com/opcoach/genmodeladdon/core/GenerateDevStructure.xtend b/com.opcoach.genmodeladdon.core/src/com/opcoach/genmodeladdon/core/GenerateDevStructure.xtend
index 1bbb327..cfd61ac 100644
--- a/com.opcoach.genmodeladdon.core/src/com/opcoach/genmodeladdon/core/GenerateDevStructure.xtend
+++ b/com.opcoach.genmodeladdon.core/src/com/opcoach/genmodeladdon/core/GenerateDevStructure.xtend
@@ -15,6 +15,7 @@ import org.eclipse.emf.codegen.ecore.genmodel.GenPackage
 import org.eclipse.jdt.core.IClasspathEntry
 import org.eclipse.jdt.core.IJavaProject
 import org.eclipse.jdt.core.JavaCore
+import org.eclipse.core.runtime.NullProgressMonitor
 
 class GenerateDevStructure {
 
@@ -120,7 +121,7 @@ class GenerateDevStructure {
 				val srcEntry = JavaCore::newSourceEntry(path)
 				val newClassPath = new ArrayList<IClasspathEntry>(jvp.rawClasspath)
 				newClassPath.add(srcEntry)
-				jvp.setRawClasspath(newClassPath, null);
+				jvp.setRawClasspath(newClassPath, new NullProgressMonitor);
 			}
 		}
 
diff --git a/com.opcoach.genmodeladdon.core/xtend-gen/com/opcoach/genmodeladdon/core/GenerateDevStructure.java b/com.opcoach.genmodeladdon.core/xtend-gen/com/opcoach/genmodeladdon/core/GenerateDevStructure.java
index a9b11a3..3372253 100644
--- a/com.opcoach.genmodeladdon.core/xtend-gen/com/opcoach/genmodeladdon/core/GenerateDevStructure.java
+++ b/com.opcoach.genmodeladdon.core/xtend-gen/com/opcoach/genmodeladdon/core/GenerateDevStructure.java
@@ -17,6 +17,7 @@
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
 import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
@@ -188,7 +189,8 @@ public void setFolderAsSourceFolder(final IProject proj, final String srcDir) {
           IClasspathEntry[] _rawClasspath = jvp.getRawClasspath();
           final ArrayList<IClasspathEntry> newClassPath = new ArrayList<IClasspathEntry>((Collection<? extends IClasspathEntry>)Conversions.doWrapArray(_rawClasspath));
           newClassPath.add(srcEntry);
-          jvp.setRawClasspath(((IClasspathEntry[])Conversions.unwrapArray(newClassPath, IClasspathEntry.class)), null);
+          NullProgressMonitor _nullProgressMonitor = new NullProgressMonitor();
+          jvp.setRawClasspath(((IClasspathEntry[])Conversions.unwrapArray(newClassPath, IClasspathEntry.class)), _nullProgressMonitor);
         }
       }
     } catch (Throwable _e) {
diff --git a/com.opcoach.genmodeladdon.ui/META-INF/MANIFEST.MF b/com.opcoach.genmodeladdon.ui/META-INF/MANIFEST.MF
index 473a9c4..cadb975 100644
--- a/com.opcoach.genmodeladdon.ui/META-INF/MANIFEST.MF
+++ b/com.opcoach.genmodeladdon.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Genmodeladdon
 Bundle-SymbolicName: com.opcoach.genmodeladdon.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-Vendor: OPCOACH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.ui,
diff --git a/com.opcoach.genmodeladdon.ui/pom.xml b/com.opcoach.genmodeladdon.ui/pom.xml
index 7476393..3289608 100644
--- a/com.opcoach.genmodeladdon.ui/pom.xml
+++ b/com.opcoach.genmodeladdon.ui/pom.xml
@@ -13,7 +13,7 @@
 
 	<groupId>com.opcoach.genmodeladdon</groupId>
 	<artifactId>com.opcoach.genmodeladdon.ui</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 </project>
\ No newline at end of file