Merge branch 'release/1.2'

goksel · Sep 20, 2021 · 1a2e617 · 1a2e617
2 parents b260395 + 3c633e5
commit 1a2e617
Show file tree

Hide file tree

Showing 220 changed files with 11,270 additions and 2,333 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ target
 .classpath
 build
 bin
+.settings/
diff --git a/_config.yml b/_config.yml
diff --git a/libSBOLj3/.classpath b/libSBOLj3/.classpath
@@ -23,5 +23,10 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/libSBOLj3/.settings/org.eclipse.jdt.core.prefs b/libSBOLj3/.settings/org.eclipse.jdt.core.prefs
diff --git a/libSBOLj3/.settings/org.eclipse.m2e.core.prefs b/libSBOLj3/.settings/org.eclipse.m2e.core.prefs
diff --git a/libSBOLj3/input/gfp.nt b/libSBOLj3/input/gfp.nt
diff --git a/libSBOLj3/output/BBa_F2620_PoPSReceiver/BBa_F2620_PoPSReceiver.jsonld b/libSBOLj3/output/BBa_F2620_PoPSReceiver/BBa_F2620_PoPSReceiver.jsonld
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,4 @@ target @@
     .classpath
     build
     bin
+    .settings/