Commit 3f6e0265 authored by Robert Smith's avatar Robert Smith

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's avatarRobert Smith <smithrw@ornl.gov>
parent b9cb4747
......@@ -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>
......
......@@ -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,
......
......@@ -32,7 +32,7 @@ import org.eclipse.ice.item.ItemType;
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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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
......@@ -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>
......
......@@ -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",
......
......@@ -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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment