dependencies updated

pull/1300/head
Nikita 7 years ago
parent bb3807c6c9
commit 581a7ac60f

@ -17,7 +17,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
<version>6.0.48</version>
<version>6.0.53</version>
<scope>provided</scope>
</dependency>
</dependencies>

@ -17,25 +17,25 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>7.0.73</version>
<version>7.0.84</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
<version>7.0.73</version>
<version>7.0.84</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<version>7.0.73</version>
<version>7.0.84</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
<version>7.0.73</version>
<version>7.0.84</version>
<scope>provided</scope>
</dependency>
</dependencies>

@ -17,25 +17,25 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>8.0.39</version>
<version>8.0.48</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
<version>8.0.39</version>
<version>8.0.48</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<version>8.0.39</version>
<version>8.0.48</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
<version>8.0.39</version>
<version>8.0.48</version>
<scope>provided</scope>
</dependency>
</dependencies>

@ -17,25 +17,19 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>9.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
<version>9.0.0.M6</version>
<version>9.0.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<version>9.0.2</version>
<version>9.0.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
<version>9.0.2</version>
<version>9.0.4</version>
<scope>provided</scope>
</dependency>
</dependencies>

@ -112,31 +112,31 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>7.0.73</version>
<version>8.0.48</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
<version>7.0.73</version>
<version>8.0.48</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<version>7.0.73</version>
<version>8.0.48</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
<version>7.0.73</version>
<version>8.0.48</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>fluent-hc</artifactId>
<version>4.5.2</version>
<version>4.5.5</version>
<scope>test</scope>
</dependency>
<dependency>
@ -156,7 +156,7 @@
<dependency>
<groupId>org.msgpack</groupId>
<artifactId>jackson-dataformat-msgpack</artifactId>
<version>0.8.11</version>
<version>0.8.14</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
@ -193,7 +193,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.7.9</version>
<version>2.7.9.2</version>
</dependency>
<dependency>

@ -9,7 +9,8 @@ import javax.servlet.ServletException;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.startup.Tomcat;
import org.apache.naming.resources.VirtualDirContext;
import org.apache.catalina.webresources.DirResourceSet;
import org.apache.catalina.webresources.StandardRoot;
public class TomcatServer {
@ -32,8 +33,11 @@ public class TomcatServer {
ctx.setDelegate(true);
File additionWebInfClasses = new File("target/test-classes");
VirtualDirContext resources = new VirtualDirContext();
resources.setExtraResourcePaths("/WEB-INF/classes=" + additionWebInfClasses);
StandardRoot resources = new StandardRoot();
DirResourceSet webResourceSet = new DirResourceSet();
webResourceSet.setBase(additionWebInfClasses.toString());
webResourceSet.setWebAppMount("/WEB-INF/classes");
resources.addPostResources(webResourceSet);
ctx.setResources(resources);
}

Loading…
Cancel
Save