From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Thu, 5 Sep 2019 14:40:12 +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=1e95e3d659d509d40ef39a66da48c4144e501f18;p=mediacube.git

git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31502
---

diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target
index 56d2c20f..ff93901c 100644
--- a/server/-dependencies/jobengine.target
+++ b/server/-dependencies/jobengine.target
@@ -29,10 +29,10 @@
 <plugin id="org.apache.aries.spifly.dynamic.bundle"/>
 <plugin id="org.apache.aries.util" version="1.1.3"/>
 <plugin id="org.apache.commons.beanutils"/>
-<plugin id="org.apache.commons.collections"/>
+<plugin id="org.apache.commons.collections" version="3.2.2"/>
 <plugin id="org.apache.commons.digester"/>
-<plugin id="org.apache.commons.io" version="2.2.0.v201405211200"/>
-<plugin id="org.apache.commons.lang"/>
+<plugin id="org.apache.commons.io" version="2.6.0"/>
+<plugin id="org.apache.commons.lang" version="2.6"/>
 <plugin id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
 <plugin id="org.apache.commons.net" version="3.6.0"/>
 <plugin id="org.apache.felix.gogo.command"/>
@@ -40,7 +40,7 @@
 <plugin id="org.apache.felix.gogo.shell"/>
 <plugin id="org.apache.httpcomponents.httpclient" version="4.2.6"/>
 <plugin id="org.apache.httpcomponents.httpcore" version="4.2.5"/>
-<plugin id="org.apache.jasper.glassfish"/>
+<plugin id="org.apache.jasper.glassfish" version="2.2.2.v201112011158"/>
 <plugin id="org.apache.logging.log4j.api"/>
 <plugin id="org.apache.logging.log4j.core"/>
 <plugin id="org.apache.logging.log4j.slf4j-impl"/>
@@ -49,7 +49,6 @@
 <plugin id="org.eclipse.equinox.console"/>
 <plugin id="org.eclipse.equinox.ds"/>
 <plugin id="org.eclipse.equinox.util"/>
-<plugin id="org.eclipse.jetty.apache-jsp"/>
 <plugin id="org.eclipse.jetty.deploy"/>
 <plugin id="org.eclipse.jetty.http" version="9.3.9.v20160517"/>
 <plugin id="org.eclipse.jetty.io" version="9.3.9.v20160517"/>
@@ -62,6 +61,7 @@
 <plugin id="org.eclipse.jetty.server" version="9.3.9.v20160517"/>
 <plugin id="org.eclipse.jetty.servlet" version="9.3.9.v20160517"/>
 <plugin id="org.eclipse.jetty.servlet.source"/>
+<plugin id="org.eclipse.jetty.servlets"/>
 <plugin id="org.eclipse.jetty.util" version="9.3.9.v20160517"/>
 <plugin id="org.eclipse.jetty.webapp" version="9.3.9.v20160517"/>
 <plugin id="org.eclipse.jetty.websocket.api"/>
@@ -83,8 +83,6 @@
 <plugin id="org.jmock"/>
 <plugin id="org.jmock.junit4"/>
 <plugin id="org.junit"/>
-<plugin id="org.mortbay.jasper.apache-jsp"/>
-<plugin id="org.mortbay.jasper.apache-jsp.source"/>
 <plugin id="org.mybatis.mybatis"/>
 <plugin id="org.objectweb.asm" version="5.0.1"/>
 <plugin id="org.objectweb.asm.commons"/>
diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml
index 2900b7ad..6c403cee 100644
--- a/server/-dependencies/pom.xml
+++ b/server/-dependencies/pom.xml
@@ -11,7 +11,7 @@
 		<maven.compiler.target>1.7</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<jetty.version>9.3.9.v20160517</jetty.version>
+ 		<jetty.version>9.3.9.v20160517</jetty.version> 
 		<swagger-core-version>1.5.9</swagger-core-version>
 		<resteasy-version>3.0.11.Final</resteasy-version>
 		<fasterxml-jackson-core>2.4.5</fasterxml-jackson-core>
@@ -132,13 +132,37 @@
 						<id>default-cli</id>
 						<configuration>
 							<artifacts>
-								<artifact>
-									<id>org.mybatis:mybatis:3.5.2</id>
-								</artifact>
-							
+
 								<!-- <artifact> -->
 								<!-- <id>org.apache.solr:solr-sorlj:7.5.0</id> -->
 								<!-- </artifact> -->
+
+								<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
+
+								<artifact>
+									<id>commons-lang:commons-lang:2.6</id>
+								</artifact>
+								<artifact>
+									<id>commons-beanutils:commons-beanutils:1.8.3</id>
+								</artifact>
+								<artifact>
+									<id>commons-collections:commons-collections:3.2.2</id>
+								</artifact>
+								<artifact>
+									<id>org.apache.commons:commons-digester3:3.2</id>
+								</artifact>
+								<artifact>
+									<id>commons-logging:commons-logging:1.1.1</id>
+								</artifact>
+								<artifact>
+									<id>commons-net:commons-net:3.6</id>
+								</artifact>
+								<artifact>
+									<id>commons-io:commons-io:2.6</id>
+								</artifact>
+								<artifact>
+									<id>org.mybatis:mybatis:3.5.2</id>
+								</artifact>
 								<artifact>
 									<id>humble.video:linux:0.2.1</id>
 								</artifact>
@@ -149,10 +173,6 @@
 									<id>humble.video:noarch:0.2.1</id>
 								</artifact>
 
-								<artifact>
-									<id>com.google.guava:guava:18.0</id>
-								</artifact>
-
 								<artifact>
 									<id>com.fasterxml.jackson.core:jackson-core:${fasterxml-jackson-core}</id>
 								</artifact>
@@ -165,9 +185,6 @@
 								<artifact>
 									<id>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${fasterxml-jackson-core}</id>
 								</artifact>
-								<artifact>
-									<id>com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${fasterxml-jackson-core}</id>
-								</artifact>
 								<artifact>
 									<id>com.fasterxml.jackson.datatype:jackson-datatype-joda:${fasterxml-jackson-core}</id>
 								</artifact>
@@ -207,15 +224,9 @@
 									<!-- <Export-Package>*</Export-Package> -->
 									<!-- </instructions> -->
 								</artifact>
-								<artifact>
-									<id>org.apache.commons:commons-digester3:3.2</id>
-								</artifact>
 								<artifact>
 									<id>jcifs:jcifs:1.3.17</id>
 								</artifact>
-								<artifact>
-									<id>commons-net:commons-net:3.6</id>
-								</artifact>
 								<artifact>
 									<id>org.jmock:jmock:2.6.0</id>
 								</artifact>
@@ -231,10 +242,6 @@
 								<artifact>
 									<id>org.slf4j:slf4j-simple:1.6.3</id>
 								</artifact>
-								<!-- JWT -->
-								<artifact>
-									<id>com.auth0:java-jwt:3.2.0</id>
-								</artifact>
 								<!-- JSP -->
 								<artifact>
 									<id>javax.transaction:javax.transaction-api:1.2</id>
@@ -253,12 +260,16 @@
 									<id>org.eclipse.tycho:org.eclipse.osgi:3.11.2.v20161107-1947</id>
 								</artifact>
 
-
 								<!-- JETTY -->
+								
+								<artifact>
+									<id>org.eclipse.jetty.orbit:org.apache.jasper.glassfish:2.2.2.v201112011158</id>
+								</artifact>
 								<artifact>
 									<id>org.eclipse.jetty:jetty-jsp:9.2.22.v20170606</id>
 									<source>true</source>
 								</artifact>
+
 								<artifact>
 									<id>org.eclipse.jetty.toolchain:jetty-schemas:3.1</id>
 								</artifact>