Merge branch 'master' into opv2

.gitignore

@@ -1,3 +1,6 @@
+portal/.classpath
+planner/.classpath
+.settings
 target
 !/.gitignore
 !/.travis.yml
@@ -42,6 +45,10 @@ tmp/
 *~.nib
 local.properties
 .settings/
+portal/.settings/
+planner/.settings/
+portal/.project/
+planner/.project/
 .loadpath
 .recommenders
 
@@ -100,3 +107,105 @@ local.properties
 
 # End of https://www.toptal.com/developers/gitignore/api/eclipse
 
+# Created by https://www.toptal.com/developers/gitignore/api/eclipse
+# Edit at https://www.toptal.com/developers/gitignore?templates=eclipse
+
+### Eclipse ###
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# CDT- autotools
+.autotools
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Annotation Processing
+.apt_generated/
+.apt_generated_test/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+# Uncomment this line if you wish to ignore the project description file.
+# Typically, this file would be tracked if it contains build/dependency configurations:
+#.project
+
+### Eclipse Patch ###
+# Spring Boot Tooling
+.sts4-cache/
+
+# End of https://www.toptal.com/developers/gitignore/api/eclipse
+
+# Created by https://www.toptal.com/developers/gitignore/api/java
+# Edit at https://www.toptal.com/developers/gitignore?templates=java
+
+### Java ###
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+# End of https://www.toptal.com/developers/gitignore/api/java
+

core/pom.xml

@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>edu.isi.wings</groupId>
   <artifactId>wings-core</artifactId>
-  <version>5.4.2</version>
+  <version>5.4.3</version>
   <name>Wings Core</name>
   <packaging>pom</packaging>
   <description>Wings project for the IKCAP group</description>

docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3"
 services:
   wings:
-    image: "ikcap/wings:latest"
+    image: ikcap/wings:latest
     build:
       context: .
       dockerfile: wings-docker/docker/default/Dockerfile

planner/pom.xml

@@ -11,13 +11,13 @@
 	<parent>
 		<groupId>edu.isi.wings</groupId>
 		<artifactId>wings-core</artifactId>
-		<version>5.4.2</version>
+		<version>5.4.3</version>
 		<relativePath>../core/pom.xml</relativePath>
 	</parent>
 
 	<properties>
 		<jsch.version>0.1.53</jsch.version>
-		<ontapi.version>1.3.1</ontapi.version>
+		<ontapi.version>1.3.2</ontapi.version>
 		<nanocloud.version>0.8.11</nanocloud.version>
 		<gson.version>2.2.4</gson.version>
 		<junit.version>4.5</junit.version>
@@ -129,6 +129,12 @@
 			<version>${commons-io.version}</version>
 		</dependency>
 
+		<!-- https://mvnrepository.com/artifact/net.sourceforge.owlapi/owlapi-distribution -->
+		<dependency>
+			<groupId>net.sourceforge.owlapi</groupId>
+			<artifactId>owlapi-distribution</artifactId>
+			<version>5.1.6</version>
+		</dependency>
 	</dependencies>
 
 </project>

pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.isi.wings</groupId>
     <artifactId>wings-core</artifactId>
-    <version>5.4.2</version>
+    <version>5.4.3</version>
     <relativePath>core/pom.xml</relativePath>
   </parent>