From: Vásáry Dániel Date: Mon, 9 Sep 2019 14:46:17 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=21d27427cac01065a01c34a525fdf525d08362cd;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31510 --- diff --git a/server/-configuration/run-mediacube-server-bsh.launch b/server/-configuration/run-mediacube-server-bsh.launch index e4c9a562..bd1033bd 100644 --- a/server/-configuration/run-mediacube-server-bsh.launch +++ b/server/-configuration/run-mediacube-server-bsh.launch @@ -21,8 +21,8 @@ - - + + diff --git a/server/-configuration/run-mediacube-server-slim.launch b/server/-configuration/run-mediacube-server-slim.launch index 00a4ced4..b2543fff 100644 --- a/server/-configuration/run-mediacube-server-slim.launch +++ b/server/-configuration/run-mediacube-server-slim.launch @@ -21,8 +21,8 @@ - - + + diff --git a/server/-dependencies/jobengine-new.target b/server/-dependencies/jobengine-new.target deleted file mode 100644 index ff93901c..00000000 --- a/server/-dependencies/jobengine-new.target +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -win32 -win32 -x86_64 -en_US - - --Dosgi.requiredJavaVersion=1.8 -XX:+UseG1GC -XX:+UseStringDeduplication -Dosgi.requiredJavaVersion=1.8 -Xms256m -Xmx1024m -Dorg.eclipse.epp.logging.aeri.skipReports=true - - diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target index f86d48ad..a59ba7dc 100644 --- a/server/-dependencies/jobengine.target +++ b/server/-dependencies/jobengine.target @@ -24,7 +24,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -93,9 +93,9 @@ - + - + diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml index 6c72fd77..168e7ba1 100644 --- a/server/-dependencies/pom.xml +++ b/server/-dependencies/pom.xml @@ -12,6 +12,9 @@ UTF-8 UTF-8 9.3.9.v20160517 + 1.5.9 3.0.11.Final 2.4.5 diff --git a/server/user.jobengine.osgi.db/sql/3-EnableJSON.db2 b/server/user.jobengine.osgi.db/sql/3-EnableJSON.db2 index 5e55ab29..b300c9cd 100644 --- a/server/user.jobengine.osgi.db/sql/3-EnableJSON.db2 +++ b/server/user.jobengine.osgi.db/sql/3-EnableJSON.db2 @@ -1,3 +1,5 @@ +--elsore elbassza: https://www.ibm.com/support/pages/551-error-when-enabling-json-environment + --execute with -- cd /home/db2admin/sqllib/json/bin -- ./db2nosql.sh -db MC -user db2admin -password password -enable true