From 3f6e0265f5b476ff90a660397ce83992944142c4 Mon Sep 17 00:00:00 2001
From: Robert Smith <smithrw@ornl.gov>
Date: Thu, 6 Jul 2017 10:27:54 -0400
Subject: [PATCH] Updated build for changes in target

Updated the branch so that it can now be built again, after changes in
target repos had made the build fail.

Also updated some plug-in version numbers that were still left as 2.2.0.

Signed-off-by: Robert Smith <smithrw@ornl.gov>
---
 org.eclipse.ice.filesimulation/pom.xml        |  4 ++--
 org.eclipse.ice.item/META-INF/MANIFEST.MF     |  4 ++--
 .../ice/item/geometry/GeometryEditor.java     |  2 +-
 org.eclipse.ice.servicetester/pom.xml         |  4 ++--
 org.eclipse.ice.tablecomponenttester/pom.xml  |  4 ++--
 org.eclipse.ice.target.mars/pom.xml           |  2 +-
 org.eclipse.ice.target.neon/pom.xml           |  2 +-
 org.eclipse.ice.target.oxygen/oxygen.target   | 20 +++++++++++++------
 org.eclipse.ice.tests.core.jaxrs/pom.xml      |  4 ++--
 .../META-INF/MANIFEST.MF                      |  4 ----
 org.eclipse.ice.tests.ui.swtbot/pom.xml       |  2 +-
 11 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/org.eclipse.ice.filesimulation/pom.xml b/org.eclipse.ice.filesimulation/pom.xml
index 7c2b0a69d..789afaba8 100644
--- a/org.eclipse.ice.filesimulation/pom.xml
+++ b/org.eclipse.ice.filesimulation/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
 		<artifactId>org.eclipse.ice.parent</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>
 	<artifactId>org.eclipse.ice.filesimulation</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
+	<version>2.2.1-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>	
 	<properties>
 		<sonar.skip>true</sonar.skip>
diff --git a/org.eclipse.ice.item/META-INF/MANIFEST.MF b/org.eclipse.ice.item/META-INF/MANIFEST.MF
index e0f3d8f7a..b074b510c 100644
--- a/org.eclipse.ice.item/META-INF/MANIFEST.MF
+++ b/org.eclipse.ice.item/META-INF/MANIFEST.MF
@@ -10,8 +10,8 @@ Import-Package: com.google.common.collect;version="10.0.1",
  com.spotify.docker.client,
  com.spotify.docker.client.messages,
  org.apache.commons.io,
- org.eclipse.eavp.viz.datastructures.ui,
  org.eclipse.eavp.viz.datastructures.VizObject,
+ org.eclipse.eavp.viz.datastructures.ui,
  org.eclipse.eavp.viz.modeling,
  org.eclipse.eavp.viz.modeling.base,
  org.eclipse.eavp.viz.service.mesh.datastructures,
@@ -26,7 +26,7 @@ Import-Package: com.google.common.collect;version="10.0.1",
  org.eclipse.ice.io.serializable,
  org.eclipse.ice.materials,
  org.eclipse.january.geometry,
- org.eclipse.january.geometry.xtext.obj.importer,
+ org.eclipse.january.geometry.dsl.obj.importer,
  org.eclipse.jface.images,
  org.eclipse.remote.core,
  org.eclipse.remote.core.exception,
diff --git a/org.eclipse.ice.item/src/org/eclipse/ice/item/geometry/GeometryEditor.java b/org.eclipse.ice.item/src/org/eclipse/ice/item/geometry/GeometryEditor.java
index 37ea78db3..177978b3a 100644
--- a/org.eclipse.ice.item/src/org/eclipse/ice/item/geometry/GeometryEditor.java
+++ b/org.eclipse.ice.item/src/org/eclipse/ice/item/geometry/GeometryEditor.java
@@ -32,7 +32,7 @@
 import org.eclipse.january.geometry.Geometry;
 import org.eclipse.january.geometry.GeometryFactory;
 import org.eclipse.january.geometry.INode;
-import org.eclipse.january.geometry.xtext.obj.importer.OBJGeometryImporter;
+import org.eclipse.january.geometry.dsl.obj.importer.OBJGeometryImporter;
 
 /**
  * <p>
diff --git a/org.eclipse.ice.servicetester/pom.xml b/org.eclipse.ice.servicetester/pom.xml
index bb523023b..009770877 100644
--- a/org.eclipse.ice.servicetester/pom.xml
+++ b/org.eclipse.ice.servicetester/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
 		<artifactId>org.eclipse.ice.parent</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>
 	<artifactId>org.eclipse.ice.servicetester</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
+	<version>2.2.1-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
 		<sonar.skip>true</sonar.skip>
diff --git a/org.eclipse.ice.tablecomponenttester/pom.xml b/org.eclipse.ice.tablecomponenttester/pom.xml
index bdd5506ee..3dde7b729 100644
--- a/org.eclipse.ice.tablecomponenttester/pom.xml
+++ b/org.eclipse.ice.tablecomponenttester/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
 		<artifactId>org.eclipse.ice.parent</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>
 	<artifactId>org.eclipse.ice.tablecomponenttester</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
+	<version>2.2.1-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
 		<sonar.skip>true</sonar.skip>
diff --git a/org.eclipse.ice.target.mars/pom.xml b/org.eclipse.ice.target.mars/pom.xml
index 64889be50..214048254 100644
--- a/org.eclipse.ice.target.mars/pom.xml
+++ b/org.eclipse.ice.target.mars/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.eclipse.ice</groupId>
       <artifactId>org.eclipse.ice.parent</artifactId>
-      <version>2.2.0-SNAPSHOT</version>
+      <version>2.2.1-SNAPSHOT</version>
       <relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
    </parent>
 
diff --git a/org.eclipse.ice.target.neon/pom.xml b/org.eclipse.ice.target.neon/pom.xml
index 0544aaa13..145cc7be5 100644
--- a/org.eclipse.ice.target.neon/pom.xml
+++ b/org.eclipse.ice.target.neon/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.eclipse.ice</groupId>
       <artifactId>org.eclipse.ice.parent</artifactId>
-      <version>2.2.0-SNAPSHOT</version>
+      <version>2.2.1-SNAPSHOT</version>
       <relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
    </parent>
 
diff --git a/org.eclipse.ice.target.oxygen/oxygen.target b/org.eclipse.ice.target.oxygen/oxygen.target
index dad20f449..c62029a4e 100644
--- a/org.eclipse.ice.target.oxygen/oxygen.target
+++ b/org.eclipse.ice.target.oxygen/oxygen.target
@@ -85,12 +85,7 @@
 <unit id="org.eclipse.equinox.p2.extras.feature.source.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.equinox.p2.user.ui.source.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.fx.ide.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.tooling.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.graphiti.export.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.graphiti.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.graphiti.feature.tools.feature.group" version="0.0.0"/>
@@ -169,5 +164,18 @@
 <unit id="org.eclipse.remote.proxy.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/tools/ptp/builds/remote/nightly"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.fx.ide.feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/efxclipse/updates-released/1.0.0/site"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.january.form" version="2.1.0.v201705241711"/>
+<unit id="org.eclipse.january.geometry.dsl.iges" version="2.1.0.v201704041521"/>
+<unit id="org.eclipse.january.geometry.dsl.mtl" version="2.1.0.v201704041521"/>
+<unit id="org.eclipse.january.geometry.dsl.obj" version="2.1.0.v201704041521"/>
+<unit id="org.eclipse.january.geometry.dsl.vtk" version="2.1.0.v201704041521"/>
+<unit id="org.eclipse.january.geometry.model" version="2.1.0.v201705241711"/>
+<repository location="http://download.eclipse.org/january/builds/january-forms-master/latest/repository/"/>
+</location>
 </locations>
-</target>
+</target>
\ No newline at end of file
diff --git a/org.eclipse.ice.tests.core.jaxrs/pom.xml b/org.eclipse.ice.tests.core.jaxrs/pom.xml
index 9dfa24ab9..2155ae1b4 100644
--- a/org.eclipse.ice.tests.core.jaxrs/pom.xml
+++ b/org.eclipse.ice.tests.core.jaxrs/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
 		<artifactId>org.eclipse.ice.parent</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>
 	<artifactId>org.eclipse.ice.tests.core.jaxrs</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
+	<version>2.2.1-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
 		<sonar.skip>true</sonar.skip>
diff --git a/org.eclipse.ice.tests.ui.swtbot/META-INF/MANIFEST.MF b/org.eclipse.ice.tests.ui.swtbot/META-INF/MANIFEST.MF
index 81e7bbdc1..8aaf60f25 100644
--- a/org.eclipse.ice.tests.ui.swtbot/META-INF/MANIFEST.MF
+++ b/org.eclipse.ice.tests.ui.swtbot/META-INF/MANIFEST.MF
@@ -72,10 +72,6 @@ Import-Package: ca.odell.glazedlists,
  org.eclipse.ice.vibe.model,
  org.eclipse.january.geometry,
  org.eclipse.january.geometry.model.importer,
- org.eclipse.january.geometry.xtext.obj.importer,
- org.eclipse.january.geometry.xtext.obj.ui.internal,
- org.eclipse.january.geometry.xtext.vtk.importer,
- org.eclipse.january.geometry.xtext.vtk.ui.internal,
  org.eclipse.nebula.widgets.nattable;version="1.3.0",
  org.eclipse.osgi.framework.console;version="1.1.0",
  org.eclipse.osgi.framework.eventmgr;version="1.2.0",
diff --git a/org.eclipse.ice.tests.ui.swtbot/pom.xml b/org.eclipse.ice.tests.ui.swtbot/pom.xml
index b8c403cc8..ded643efd 100644
--- a/org.eclipse.ice.tests.ui.swtbot/pom.xml
+++ b/org.eclipse.ice.tests.ui.swtbot/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
 		<artifactId>org.eclipse.ice.parent</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>