Merge branch 'develop'

pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>net.sumaris</groupId>
   <artifactId>sumaris-pod</artifactId>
-  <version>2.8.11</version>
+  <version>2.8.12-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>SUMARiS</name>
   <description>SUMARiS :: Maven parent</description>

sumaris-core-shared/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sumaris</groupId>
     <artifactId>sumaris-pod</artifactId>
-    <version>2.8.11</version>
+    <version>2.8.12-SNAPSHOT</version>
   </parent>
 
   <artifactId>sumaris-core-shared</artifactId>

sumaris-core/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sumaris</groupId>
     <artifactId>sumaris-pod</artifactId>
-    <version>2.8.11</version>
+    <version>2.8.12-SNAPSHOT</version>
   </parent>
 
   <artifactId>sumaris-core</artifactId>

sumaris-extraction/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>net.sumaris</groupId>
 		<artifactId>sumaris-pod</artifactId>
-		<version>2.8.11</version>
+		<version>2.8.12-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>sumaris-extraction</artifactId>

sumaris-importation/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>sumaris-pod</artifactId>
     <groupId>net.sumaris</groupId>
-    <version>2.8.11</version>
+    <version>2.8.12-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

sumaris-rdf/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sumaris-pod</artifactId>
         <groupId>net.sumaris</groupId>
-        <version>2.8.11</version>
+        <version>2.8.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sumaris-server/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sumaris</groupId>
     <artifactId>sumaris-pod</artifactId>
-    <version>2.8.11</version>
+    <version>2.8.12-SNAPSHOT</version>
   </parent>
 
   <artifactId>sumaris-server</artifactId>

sumaris-server/src/main/docker/run/app.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+#
+# %L
+# SUMARiS
+# %%
+# Copyright (C) 2019 SUMARiS Consortium
+# %%
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program.  If not, see
+# <http://www.gnu.org/licenses/gpl-3.0.html>.
+# L%
+#
+
+APP_NAME=sumaris
+BASEDIR=/app
+LOG_DIR=/app/logs
+TNS_ADMIN=/home/tnsnames
+JAVA_OPTS="${JAVA_OPTS} --enable-preview" # Fix Java 17 error
+JAVA_OPTS="${JAVA_OPTS} -D${APP_NAME}.basedir=${BASEDIR}"
+JAVA_OPTS="${JAVA_OPTS} -Dspring.config.location=file:${BASEDIR}/config/"
+JAVA_OPTS="${JAVA_OPTS} -Dsumaris.log.file=${LOG_DIR}/${APP_NAME}-pod.log"
+JAVA_OPTS="${JAVA_OPTS} -Doracle.net.tns_admin=${TNS_ADMIN}"
+JAVA_OPTS="${JAVA_OPTS} -Doracle.jdbc.timezoneAsRegion=false"
+[[ "_${PROFILES}" != "_" ]] && JAVA_OPTS="${JAVA_OPTS} -Dspring.profiles.active=${PROFILES}"
+[[ "_${TZ}" != "_" ]] && JAVA_OPTS="${JAVA_OPTS} -Duser.timezone=${TZ}"
+[[ "_${PORT}" != "_" ]] && JAVA_OPTS="${JAVA_OPTS} -Dserver.port=${PORT}"
+[[ "_${XMS}" != "_" ]] && JAVA_OPTS="${JAVA_OPTS} -Xms${XMS}"
+[[ "_${XMX}" != "_" ]] && JAVA_OPTS="${JAVA_OPTS} -Xmx${XMX}"
+
+ARGS=
+# TODO test this
+#ARGS=${@:2}
+
+echo "*** Starting ${APP_NAME}-pod - args: ${ARGS} - profiles: ${PROFILES} ***"
+
+java ${JAVA_OPTS} -server -jar ${BASEDIR}/app.war ${ARGS}

sumaris-test-shared/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sumaris</groupId>
     <artifactId>sumaris-pod</artifactId>
-    <version>2.8.11</version>
+    <version>2.8.12-SNAPSHOT</version>
   </parent>
 
   <artifactId>sumaris-test-shared</artifactId>

sumaris-xml-query/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>net.sumaris</groupId>
 		<artifactId>sumaris-pod</artifactId>
-		<version>2.8.11</version>
+		<version>2.8.12-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>sumaris-xml-query</artifactId>