POM: Align scijava-persist with incubator model

gselzer · hinerm · commit 19c65fd8894a · 2021-06-16T10:50:50.000-05:00
This commit makes a few changes which are needed in combination,
     resulting in a incubator ready Maven module

     1) Adds scijava-persist as a child module of the incubator
     2) Denotes the incubator as the parent of scijava-persist
     3) Removes the ImageJ dependency in favor of SciJava Common
diff --git a/pom.xml b/pom.xml
@@ -47,6 +47,7 @@
 	<modules>
 		<module>imagej/imagej-ops2</module>
 		<module>imagej/imagej-testutil</module>
+		<module>scijava/scijava-persist</module>
 		<module>scijava/scijava-ops</module>
 		<module>scijava/scijava-testutil</module>
 		<module>scijava/scijava-types</module>
diff --git a/scijava/scijava-persist/pom.xml b/scijava/scijava-persist/pom.xml
@@ -5,20 +5,13 @@
 		http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<!-- <parent>
+	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>scijava-incubator</artifactId>
 		<version>0-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
-	</parent> -->
-
-	<parent>
-		<groupId>org.scijava</groupId>
-		<artifactId>pom-scijava</artifactId>
-		<version>30.0.0</version>
-		<relativePath />
 	</parent>
-	
+
 	<artifactId>scijava-persist</artifactId>
 
 	<name>SciJava Persist</name>
@@ -103,8 +96,8 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>net.imagej</groupId>
-			<artifactId>imagej</artifactId>
+			<groupId>org.scijava</groupId>
+			<artifactId>scijava-common</artifactId>
 		</dependency>
 
 		<dependency>
diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/SerializationTests.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/SerializationTests.java
@@ -1,43 +1,42 @@
 package org.scijava.persist;
 
 import com.google.gson.Gson;
-import net.imagej.ImageJ;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.scijava.Context;
 import org.scijava.persist.testobjects.Circle;
 import org.scijava.persist.testobjects.Shape;
 import org.scijava.persist.testobjects.Shapes;
 
 public class SerializationTests {
-    static ImageJ ij;
+    static Context context;
     static Gson gson;
 
     public static void main(String... args) {
-        ij = new ImageJ();
-        ij.ui().showUI();
-        if (ij.context()==null) {
+    		context = new Context(IObjectScijavaAdapterService.class);
+        if (context==null) {
             System.out.println("Null context");
         }
-        gson = ScijavaGsonHelper.getGson(ij.context());
+        gson = ScijavaGsonHelper.getGson(context);
     }
 
     @Before
     public void openFiji() {
         // Initializes static SourceService and Display Service and plugins for serialization
-        ij = new ImageJ();
-        ij.ui().showUI();
-        if (ij.context()==null) {
+    		context = new Context(IObjectScijavaAdapterService.class);
+        if (context==null) {
             System.out.println("Null context");
         }
-        gson = ScijavaGsonHelper.getGson(ij.context(), true);
+        gson = ScijavaGsonHelper.getGson(context, true);
     }
 
     @After
     public void closeFiji() throws Exception {
-        // Closes ij context
-        ij.context().close(); //TODO : understand why this is not working
+    	context.dispose();
+    	context = null;
+    	gson = null;
     }
 
     /**
