Closes #439

I moved the data element interfaces to the data bundle. I also updated
the tests and build of that bundle to use Junit 5.
Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>

org.eclipse.ice.data/.classpath

@@ -23,6 +23,33 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

org.eclipse.ice.data/.settings/org.eclipse.jdt.core.prefs

 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=11

org.eclipse.ice.data/pom.xml

@@ -5,21 +5,39 @@
 
 	<groupId>org.eclipse.ice</groupId>
 	<artifactId>org.eclipse.ice.data</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>3.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>org.eclipse.ice.data</name>
 	<url>https://www.eclipse.org/ice</url>
 
 	<properties>
+		<java.version>11</java.version>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.release>11</maven.compiler.release>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.22.2</version>
+			</plugin>
+			<plugin>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>2.22.2</version>
+			</plugin>
+		</plugins>
+	</build>
+
 	<dependencies>
+
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>5.6.2</version>
 			<scope>test</scope>
 		</dependency>
 

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/main/java/org/eclipse/ice/dev/annotations/IDataElement.java → org.eclipse.ice.data/src/main/java/org/eclipse/ice/data/IDataElement.java

-package org.eclipse.ice.dev.annotations;
+package org.eclipse.ice.data;
 
 import java.util.UUID;
 

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/main/java/org/eclipse/ice/dev/annotations/IPersistenceHandler.java → org.eclipse.ice.data/src/main/java/org/eclipse/ice/data/IPersistenceHandler.java

-package org.eclipse.ice.dev.annotations;
+package org.eclipse.ice.data;
 
 import java.util.UUID;
 

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/main/java/org/eclipse/ice/dev/annotations/JavascriptValidator.java → org.eclipse.ice.data/src/main/java/org/eclipse/ice/data/JavascriptValidator.java

@@ -9,7 +9,7 @@
  *   Initial API and implementation and/or initial documentation - 
  *   Jay Jay Billings
  *******************************************************************************/
-package org.eclipse.ice.dev.annotations;
+package org.eclipse.ice.data;
 
 import java.io.Serializable;
 import javax.script.Invocable;

org.eclipse.ice.data/src/test/java/org/eclipse/ice/tests/data/ComponentBuilderTest.java

@@ -11,7 +11,9 @@
  *****************************************************************************/
 package org.eclipse.ice.tests.data;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 import org.apache.jena.ontology.OntModel;
 import org.apache.jena.ontology.OntModelSpec;
@@ -21,8 +23,6 @@ import org.apache.jena.rdf.model.Resource;
 import org.apache.jena.util.FileManager;
 import org.eclipse.ice.data.ComponentBuilder;
 import org.eclipse.ice.data.ICEDataConstants;
-import org.junit.BeforeClass;
-import org.junit.Test;
 
 /**
  * This class tests {@link ComponentBuilder}.
@@ -46,7 +46,7 @@ public class ComponentBuilderTest {
 	/**
 	 * @throws java.lang.Exception
 	 */
-	@BeforeClass
+	@BeforeAll
 	public static void setUpBeforeClass() throws Exception {
 		// Load the ontology
 		Model baseModel = FileManager.get().loadModel("data/org.eclipse.ice.data.owl.ttl", null, "TURTLE");

org.eclipse.ice.data/src/test/java/org/eclipse/ice/tests/data/CompositeBuilderTest.java

@@ -11,10 +11,10 @@
  *****************************************************************************/
 package org.eclipse.ice.tests.data;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /**
  * This class tests {@link CompositeBuilder}.
@@ -26,7 +26,7 @@ public class CompositeBuilderTest {
 	/**
 	 * @throws java.lang.Exception
 	 */
-	@BeforeClass
+	@BeforeAll
 	public static void setUpBeforeClass() throws Exception {
 	}
 

org.eclipse.ice.data/src/test/java/org/eclipse/ice/tests/data/ICEModelFactoryTest.java

@@ -11,13 +11,13 @@
  *****************************************************************************/
 package org.eclipse.ice.tests.data;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 import org.apache.jena.rdf.model.Model;
 import org.eclipse.ice.data.ComponentBuilder;
 import org.eclipse.ice.data.ICEModelFactory;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /**
  * This class tests the ModelFactory used to build ICE's data structures.
@@ -30,7 +30,7 @@ public class ICEModelFactoryTest {
 	/**
 	 * @throws java.lang.Exception
 	 */
-	@BeforeClass
+	@BeforeAll
 	public static void setUpBeforeClass() throws Exception {
 	}
 

org.eclipse.ice.data/src/test/java/org/eclipse/ice/tests/data/ModelValidatorTest.java

@@ -11,10 +11,10 @@
  *****************************************************************************/
 package org.eclipse.ice.tests.data;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /**
  * This class is responsible for insuring that the ModelValidator can correctly
@@ -28,7 +28,7 @@ public class ModelValidatorTest {
 	/**
 	 * @throws java.lang.Exception
 	 */
-	@BeforeClass
+	@BeforeAll
 	public static void setUpBeforeClass() throws Exception {
 	}
 

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations.proxytest/pom.xml

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.ice.dev</groupId>
@@ -78,5 +80,11 @@
 			<artifactId>org.eclipse.ice.dev.annotations</artifactId>
 			<version>3.0.0-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.ice</groupId>
+			<artifactId>org.eclipse.ice.data</artifactId>
+			<version>3.0.0-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations.proxytest/src/test/java/org/eclipse/ice/dev/annotations/proxytest/GeneratedDataElementTest.java

@@ -13,7 +13,7 @@ package org.eclipse.ice.dev.annotations.proxytest;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import org.eclipse.ice.dev.annotations.JavascriptValidator;
+import org.eclipse.ice.data.JavascriptValidator;
 import org.junit.jupiter.api.Test;
 
 /**

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations.proxytest/src/test/java/org/eclipse/ice/dev/annotations/proxytest/JavascriptValidatorTest.java

@@ -2,7 +2,7 @@ package org.eclipse.ice.dev.annotations.proxytest;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import org.eclipse.ice.dev.annotations.JavascriptValidator;
+import org.eclipse.ice.data.JavascriptValidator;
 import org.junit.jupiter.api.Test;
 
 /**

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/pom.xml

@@ -96,6 +96,12 @@
 			<artifactId>mongo-java-driver</artifactId>
 			<version>3.12.2</version>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.ice</groupId>
+			<artifactId>org.eclipse.ice.data</artifactId>
+			<version>3.0.0-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<parent>

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/main/java/org/eclipse/ice/dev/annotations/DataElement.java

@@ -38,7 +38,7 @@ import java.lang.annotation.RetentionPolicy;
  * {@code PersonImplementation}) that fulfills that interface.
  *
  *
- * @see org.eclipse.ice.dev.annotations.IDataElement
+ * @see org.eclipse.ice.data.IDataElement
  * @see org.eclipse.ice.dev.annotations.DataField
  * @author Daniel Bluhm
  */

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/main/java/org/eclipse/ice/dev/annotations/DataField.java

@@ -34,7 +34,7 @@ public @interface DataField {
 
 	/**
 	 * Flag whether this field should be included in
-	 * {@link org.eclipse.ice.dev.annotations.IDataElement#matches(Object)}.
+	 * {@link org.eclipse.ice.data.IDataElement#matches(Object)}.
 	 * @return match annotation value
 	 * @see org.eclipse.ice.dev.annotations.processors.Field#match
 	 */

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/main/java/org/eclipse/ice/dev/annotations/processors/DefaultFields.java

@@ -4,7 +4,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
-import org.eclipse.ice.dev.annotations.JavascriptValidator;
+import org.eclipse.ice.data.JavascriptValidator;
 
 /**
  * Aggregation of fields generated and included in <code>@DataElement</code>

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/main/java/org/eclipse/ice/dev/annotations/processors/Field.java

@@ -43,7 +43,7 @@ public class Field {
 	 *
 	 * This handles cases like the default field {@link DefaultFields#privateId}
 	 * being accessible through the method
-	 * {@link org.eclipse.ice.dev.annotations.IDataElement#getUUID()} rather than
+	 * {@link org.eclipse.ice.data.IDataElement#getUUID()} rather than
 	 * {@code getPrivateId()}. In that example, the variable name would be
 	 * {@code privateId} and the field name would be {@code UUID}.
 	 */

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/main/java/org/eclipse/ice/dev/annotations/processors/Fields.java

@@ -65,7 +65,7 @@ public class Fields implements Iterable<Field> {
 	 * Return iterator over fields that are set to be used in matches.
 	 *
 	 * @return iterator over the fields
-	 * @see org.eclipse.ice.dev.annotations.IDataElement#matches(Object)
+	 * @see org.eclipse.ice.data.IDataElement#matches(Object)
 	 */
 	public Iterator<Field> getMatch() {
 		return fields.stream()

org.eclipse.ice.renderer/pom.xml

@@ -55,6 +55,12 @@
 			<artifactId>dagger</artifactId>
 			<version>2.16</version>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.ice</groupId>
+			<artifactId>org.eclipse.ice.data</artifactId>
+			<version>3.0.0-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.eclipse.ice.dev</groupId>
 			<artifactId>org.eclipse.ice.dev.annotations</artifactId>