From 41bcf0a06dedbc6c365119fc66f173a83669076c Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Fri, 6 Sep 2019 08:33:50 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31506 --- .../run-mediacube-server-bsh.launch | 6 +-- .../run-mediacube-server-slim.launch | 4 +- .../run-mediacube-server.launch | 2 +- server/-dependencies/jobengine.target | 42 ++++++++++++++++--- server/-dependencies/pom.xml | 4 -- 5 files changed, 43 insertions(+), 15 deletions(-) diff --git a/server/-configuration/run-mediacube-server-bsh.launch b/server/-configuration/run-mediacube-server-bsh.launch index b004926b..e4c9a562 100644 --- a/server/-configuration/run-mediacube-server-bsh.launch +++ b/server/-configuration/run-mediacube-server-bsh.launch @@ -21,10 +21,10 @@ - - + + - + diff --git a/server/-configuration/run-mediacube-server-slim.launch b/server/-configuration/run-mediacube-server-slim.launch index 982249b4..00a4ced4 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/-configuration/run-mediacube-server.launch b/server/-configuration/run-mediacube-server.launch index c0637894..346d82ae 100644 --- a/server/-configuration/run-mediacube-server.launch +++ b/server/-configuration/run-mediacube-server.launch @@ -22,7 +22,7 @@ - + diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target index ff93901c..ea7fad5d 100644 --- a/server/-dependencies/jobengine.target +++ b/server/-dependencies/jobengine.target @@ -12,27 +12,38 @@ + + + + + + + + + + - + - - + + + @@ -40,28 +51,43 @@ - + + + + + + + + + + + + + + + + + - @@ -72,6 +98,10 @@ + + + + @@ -83,6 +113,8 @@ + + diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml index 6c403cee..6c72fd77 100644 --- a/server/-dependencies/pom.xml +++ b/server/-dependencies/pom.xml @@ -262,14 +262,10 @@ - - org.eclipse.jetty.orbit:org.apache.jasper.glassfish:2.2.2.v201112011158 - org.eclipse.jetty:jetty-jsp:9.2.22.v20170606 true - org.eclipse.jetty.toolchain:jetty-schemas:3.1 -- 2.54.0