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

diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target
index 56d2c20f2f711f49b53235e6a85ff29c6341a42d..ff93901cb5f7255b48a82f3dbbeb623da3709a14 100644 (file)
--- a/server/-dependencies/jobengine.target
+++ b/server/-dependencies/jobengine.target
@@ -29,10 +29,10 @@
 <plugin id="org.apache.aries.spifly.dynamic.bundle"/>\r
 <plugin id="org.apache.aries.util" version="1.1.3"/>\r
 <plugin id="org.apache.commons.beanutils"/>\r
-<plugin id="org.apache.commons.collections"/>\r
+<plugin id="org.apache.commons.collections" version="3.2.2"/>\r
 <plugin id="org.apache.commons.digester"/>\r
-<plugin id="org.apache.commons.io" version="2.2.0.v201405211200"/>\r
-<plugin id="org.apache.commons.lang"/>\r
+<plugin id="org.apache.commons.io" version="2.6.0"/>\r
+<plugin id="org.apache.commons.lang" version="2.6"/>\r
 <plugin id="org.apache.commons.logging" version="1.1.1.v201101211721"/>\r
 <plugin id="org.apache.commons.net" version="3.6.0"/>\r
 <plugin id="org.apache.felix.gogo.command"/>\r
@@ -40,7 +40,7 @@
 <plugin id="org.apache.felix.gogo.shell"/>\r
 <plugin id="org.apache.httpcomponents.httpclient" version="4.2.6"/>\r
 <plugin id="org.apache.httpcomponents.httpcore" version="4.2.5"/>\r
-<plugin id="org.apache.jasper.glassfish"/>\r
+<plugin id="org.apache.jasper.glassfish" version="2.2.2.v201112011158"/>\r
 <plugin id="org.apache.logging.log4j.api"/>\r
 <plugin id="org.apache.logging.log4j.core"/>\r
 <plugin id="org.apache.logging.log4j.slf4j-impl"/>\r
@@ -49,7 +49,6 @@
 <plugin id="org.eclipse.equinox.console"/>\r
 <plugin id="org.eclipse.equinox.ds"/>\r
 <plugin id="org.eclipse.equinox.util"/>\r
-<plugin id="org.eclipse.jetty.apache-jsp"/>\r
 <plugin id="org.eclipse.jetty.deploy"/>\r
 <plugin id="org.eclipse.jetty.http" version="9.3.9.v20160517"/>\r
 <plugin id="org.eclipse.jetty.io" version="9.3.9.v20160517"/>\r
@@ -62,6 +61,7 @@
 <plugin id="org.eclipse.jetty.server" version="9.3.9.v20160517"/>\r
 <plugin id="org.eclipse.jetty.servlet" version="9.3.9.v20160517"/>\r
 <plugin id="org.eclipse.jetty.servlet.source"/>\r
+<plugin id="org.eclipse.jetty.servlets"/>\r
 <plugin id="org.eclipse.jetty.util" version="9.3.9.v20160517"/>\r
 <plugin id="org.eclipse.jetty.webapp" version="9.3.9.v20160517"/>\r
 <plugin id="org.eclipse.jetty.websocket.api"/>\r
@@ -83,8 +83,6 @@
 <plugin id="org.jmock"/>\r
 <plugin id="org.jmock.junit4"/>\r
 <plugin id="org.junit"/>\r
-<plugin id="org.mortbay.jasper.apache-jsp"/>\r
-<plugin id="org.mortbay.jasper.apache-jsp.source"/>\r
 <plugin id="org.mybatis.mybatis"/>\r
 <plugin id="org.objectweb.asm" version="5.0.1"/>\r
 <plugin id="org.objectweb.asm.commons"/>\r

diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml
index 2900b7adc3f9a8dae6729a79445db534a64e8585..6c403ceed83fb7d38a13abe6adadd345e06b67f7 100644 (file)
--- a/server/-dependencies/pom.xml
+++ b/server/-dependencies/pom.xml
@@ -11,7 +11,7 @@
                <maven.compiler.target>1.7</maven.compiler.target>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-               <jetty.version>9.3.9.v20160517</jetty.version>\r
+               <jetty.version>9.3.9.v20160517</jetty.version> \r
                <swagger-core-version>1.5.9</swagger-core-version>\r
                <resteasy-version>3.0.11.Final</resteasy-version>\r
                <fasterxml-jackson-core>2.4.5</fasterxml-jackson-core>\r
@@ -132,13 +132,37 @@
                                                <id>default-cli</id>\r
                                                <configuration>\r
                                                        <artifacts>\r
-                                                               <artifact>\r
-                                                                       <id>org.mybatis:mybatis:3.5.2</id>\r
-                                                               </artifact>\r
-                                                       \r
+\r
                                                                <!-- <artifact> -->\r
                                                                <!-- <id>org.apache.solr:solr-sorlj:7.5.0</id> -->\r
                                                                <!-- </artifact> -->\r
+\r
+                                                               <!-- https://mvnrepository.com/artifact/commons-io/commons-io -->\r
+\r
+                                                               <artifact>\r
+                                                                       <id>commons-lang:commons-lang:2.6</id>\r
+                                                               </artifact>\r
+                                                               <artifact>\r
+                                                                       <id>commons-beanutils:commons-beanutils:1.8.3</id>\r
+                                                               </artifact>\r
+                                                               <artifact>\r
+                                                                       <id>commons-collections:commons-collections:3.2.2</id>\r
+                                                               </artifact>\r
+                                                               <artifact>\r
+                                                                       <id>org.apache.commons:commons-digester3:3.2</id>\r
+                                                               </artifact>\r
+                                                               <artifact>\r
+                                                                       <id>commons-logging:commons-logging:1.1.1</id>\r
+                                                               </artifact>\r
+                                                               <artifact>\r
+                                                                       <id>commons-net:commons-net:3.6</id>\r
+                                                               </artifact>\r
+                                                               <artifact>\r
+                                                                       <id>commons-io:commons-io:2.6</id>\r
+                                                               </artifact>\r
+                                                               <artifact>\r
+                                                                       <id>org.mybatis:mybatis:3.5.2</id>\r
+                                                               </artifact>\r
                                                                <artifact>\r
                                                                        <id>humble.video:linux:0.2.1</id>\r
                                                                </artifact>\r
@@ -149,10 +173,6 @@
                                                                        <id>humble.video:noarch:0.2.1</id>\r
                                                                </artifact>\r
 \r
-                                                               <artifact>\r
-                                                                       <id>com.google.guava:guava:18.0</id>\r
-                                                               </artifact>\r
-\r
                                                                <artifact>\r
                                                                        <id>com.fasterxml.jackson.core:jackson-core:${fasterxml-jackson-core}</id>\r
                                                                </artifact>\r
@@ -165,9 +185,6 @@
                                                                <artifact>\r
                                                                        <id>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${fasterxml-jackson-core}</id>\r
                                                                </artifact>\r
-                                                               <artifact>\r
-                                                                       <id>com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${fasterxml-jackson-core}</id>\r
-                                                               </artifact>\r
                                                                <artifact>\r
                                                                        <id>com.fasterxml.jackson.datatype:jackson-datatype-joda:${fasterxml-jackson-core}</id>\r
                                                                </artifact>\r
@@ -207,15 +224,9 @@
                                                                        <!-- <Export-Package>*</Export-Package> -->\r
                                                                        <!-- </instructions> -->\r
                                                                </artifact>\r
-                                                               <artifact>\r
-                                                                       <id>org.apache.commons:commons-digester3:3.2</id>\r
-                                                               </artifact>\r
                                                                <artifact>\r
                                                                        <id>jcifs:jcifs:1.3.17</id>\r
                                                                </artifact>\r
-                                                               <artifact>\r
-                                                                       <id>commons-net:commons-net:3.6</id>\r
-                                                               </artifact>\r
                                                                <artifact>\r
                                                                        <id>org.jmock:jmock:2.6.0</id>\r
                                                                </artifact>\r
@@ -231,10 +242,6 @@
                                                                <artifact>\r
                                                                        <id>org.slf4j:slf4j-simple:1.6.3</id>\r
                                                                </artifact>\r
-                                                               <!-- JWT -->\r
-                                                               <artifact>\r
-                                                                       <id>com.auth0:java-jwt:3.2.0</id>\r
-                                                               </artifact>\r
                                                                <!-- JSP -->\r
                                                                <artifact>\r
                                                                        <id>javax.transaction:javax.transaction-api:1.2</id>\r
@@ -253,12 +260,16 @@
                                                                        <id>org.eclipse.tycho:org.eclipse.osgi:3.11.2.v20161107-1947</id>\r
                                                                </artifact>\r
 \r
-\r
                                                                <!-- JETTY -->\r
+                                                               \r
+                                                               <artifact>\r
+                                                                       <id>org.eclipse.jetty.orbit:org.apache.jasper.glassfish:2.2.2.v201112011158</id>\r
+                                                               </artifact>\r
                                                                <artifact>\r
                                                                        <id>org.eclipse.jetty:jetty-jsp:9.2.22.v20170606</id>\r
                                                                        <source>true</source>\r
                                                                </artifact>\r
+\r
                                                                <artifact>\r
                                                                        <id>org.eclipse.jetty.toolchain:jetty-schemas:3.1</id>\r
                                                                </artifact>\r