|
@@ -12,7 +12,7 @@
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
<java-version>1.8</java-version>
|
|
<java-version>1.8</java-version>
|
|
<cache2k-version>1.0.2.Final</cache2k-version>
|
|
<cache2k-version>1.0.2.Final</cache2k-version>
|
|
- <jackson-version>2.9.3</jackson-version>
|
|
|
|
|
|
+ <jackson-version>2.9.7</jackson-version>
|
|
<!-- This is the default web.xml for plaintext and json only -->
|
|
<!-- This is the default web.xml for plaintext and json only -->
|
|
<maven.war.xml>src/main/webapp/WEB-INF/web.xml</maven.war.xml>
|
|
<maven.war.xml>src/main/webapp/WEB-INF/web.xml</maven.war.xml>
|
|
</properties>
|
|
</properties>
|
|
@@ -30,11 +30,13 @@
|
|
<version>${jackson-version}</version>
|
|
<version>${jackson-version}</version>
|
|
</dependency>
|
|
</dependency>
|
|
|
|
|
|
|
|
+ <!-- Turn off to use the implementation provided from Resin
|
|
<dependency>
|
|
<dependency>
|
|
<groupId>org.apache.taglibs</groupId>
|
|
<groupId>org.apache.taglibs</groupId>
|
|
<artifactId>taglibs-standard-impl</artifactId>
|
|
<artifactId>taglibs-standard-impl</artifactId>
|
|
<version>1.2.5</version>
|
|
<version>1.2.5</version>
|
|
</dependency>
|
|
</dependency>
|
|
|
|
+ -->
|
|
|
|
|
|
<!-- @Inject -->
|
|
<!-- @Inject -->
|
|
<dependency>
|
|
<dependency>
|
|
@@ -128,7 +130,7 @@
|
|
<dependency>
|
|
<dependency>
|
|
<groupId>mysql</groupId>
|
|
<groupId>mysql</groupId>
|
|
<artifactId>mysql-connector-java</artifactId>
|
|
<artifactId>mysql-connector-java</artifactId>
|
|
- <version>5.1.42</version>
|
|
|
|
|
|
+ <version>5.1.47</version>
|
|
</dependency>
|
|
</dependency>
|
|
</dependencies>
|
|
</dependencies>
|
|
<build>
|
|
<build>
|
|
@@ -163,7 +165,7 @@
|
|
<dependency>
|
|
<dependency>
|
|
<groupId>org.postgresql</groupId>
|
|
<groupId>org.postgresql</groupId>
|
|
<artifactId>postgresql</artifactId>
|
|
<artifactId>postgresql</artifactId>
|
|
- <version>42.1.4</version>
|
|
|
|
|
|
+ <version>42.2.5</version>
|
|
</dependency>
|
|
</dependency>
|
|
</dependencies>
|
|
</dependencies>
|
|
<build>
|
|
<build>
|