Commit b0285f1c authored by Jay Jay Billings's avatar Jay Jay Billings
Browse files

Fixed missing materials feature and build after merge.


Signed-off-by: default avatarJay Jay Billings <billingsjj@ornl.gov>
parent 46637c3d
......@@ -36,6 +36,7 @@
<module>../org.eclipse.ice.materials</module>
<module>../org.eclipse.ice.materials.test</module>
<module>../org.eclipse.ice.materials.ui</module>
<module>../org.eclipse.ice.materials.feature</module>
<module>../org.eclipse.ice.mesh</module>
<module>../org.eclipse.ice.mesh.test</module>
<module>../org.eclipse.ice.nek5000</module>
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="deps/snakeyaml/com.springsource.snakeyaml-1.6.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src/"/>
<classpathentry exported="true" kind="lib" path="deps/snakeyaml/com.springsource.snakeyaml-1.6.0.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
......@@ -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>
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
......@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ice.materials.feature"
label="ICE Advanced Materials Feature"
version="2.1.8"
version="2.1.8.20160208"
provider-name="Oak Ridge National Laboratory"
os="linux,macosx,win32"
ws="cocoa,gtk,win32"
......
......@@ -8,8 +8,9 @@
<packaging>eclipse-feature</packaging>
<parent>
<groupId>ICE</groupId>
<artifactId>org.eclipse.ice.build</artifactId>
<version>2.1.8</version>
<groupId>org.eclipse.ice</groupId>
<version>2.1.8.20160208</version>
<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
</parent>
</project>
......@@ -257,7 +257,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<feature id="org.eclipse.draw2d"/>
<feature id="org.eclipse.draw2d.sdk"/>
<feature id="org.eclipse.e4.core.tools.feature"/>
<feature id="org.eclipse.fx.runtime.min.feature" version="2.1.0.201508240501"/>
<feature id="org.eclipse.fx.runtime.min.feature"/>
<feature id="org.eclipse.ice.materials.feature"/>
</features>
<configurations>
......@@ -311,4 +312,5 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<cssInfo>
</cssInfo>
</product>
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