From ad2bd27a8772bf9168fe04b4abe967924cb0b2b5 Mon Sep 17 00:00:00 2001
From: Marshall McDonnell <mcdonnellmt@ornl.gov>
Date: Thu, 12 Nov 2020 10:01:45 -0500
Subject: [PATCH] Re #488 - Move build pom.xml + delete org.eclipse.ice.build

Signed-off-by: Marshall McDonnell <mcdonnellmt@ornl.gov>
---
 org.eclipse.ice.build/.classpath         | 27 ------------------------
 org.eclipse.ice.build/.gitignore         |  1 -
 org.eclipse.ice.build/.project           | 23 --------------------
 org.eclipse.ice.build/pom.xml => pom.xml | 14 ++++++------
 4 files changed, 7 insertions(+), 58 deletions(-)
 delete mode 100644 org.eclipse.ice.build/.classpath
 delete mode 100644 org.eclipse.ice.build/.gitignore
 delete mode 100644 org.eclipse.ice.build/.project
 rename org.eclipse.ice.build/pom.xml => pom.xml (63%)

diff --git a/org.eclipse.ice.build/.classpath b/org.eclipse.ice.build/.classpath
deleted file mode 100644
index 1247f9fa4..000000000
--- a/org.eclipse.ice.build/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/org.eclipse.ice.build/.gitignore b/org.eclipse.ice.build/.gitignore
deleted file mode 100644
index b83d22266..000000000
--- a/org.eclipse.ice.build/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/
diff --git a/org.eclipse.ice.build/.project b/org.eclipse.ice.build/.project
deleted file mode 100644
index 0bd88ffb0..000000000
--- a/org.eclipse.ice.build/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ice.build</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.ice.build/pom.xml b/pom.xml
similarity index 63%
rename from org.eclipse.ice.build/pom.xml
rename to pom.xml
index 3b119cb95..817b5d4e1 100644
--- a/org.eclipse.ice.build/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.eclipse.ice</groupId>
-	<artifactId>org.eclipse.ice.build</artifactId>
+	<artifactId>org.eclipse.ice</artifactId>
 	<version>3.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
@@ -16,11 +16,11 @@
 	</properties>
 
 	<modules>
-		<module>../org.eclipse.ice.tests.util</module>
-		<module>../org.eclipse.ice.data</module>
-		<module>../org.eclipse.ice.dev</module>
-		<module>../org.eclipse.ice.archetypes</module>
-		<module>../org.eclipse.ice.commands</module>
-		<module>../org.eclipse.ice.bats</module>
+		<module>org.eclipse.ice.tests.util</module>
+		<module>org.eclipse.ice.data</module>
+		<module>org.eclipse.ice.dev</module>
+		<module>org.eclipse.ice.archetypes</module>
+		<module>org.eclipse.ice.commands</module>
+		<module>org.eclipse.ice.bats</module>
 	</modules>
 </project>