Browse Source

[fi fw-only Java/servlet] Update dependencies (#4085)

* Update dependencies

* fix missing ]
Radoslav Petrov 6 years ago
parent
commit
c1927aa4b6
2 changed files with 11 additions and 9 deletions
  1. 6 6
      frameworks/Java/servlet/README.md
  2. 5 3
      frameworks/Java/servlet/pom.xml

+ 6 - 6
frameworks/Java/servlet/README.md

@@ -29,12 +29,12 @@ DB, Queries and Fortune use the same implementation as MySQL.
 
 
 The tests were run with:
 The tests were run with:
 
 
-* [Java Oracle JDK 1.8.0](http://openjdk.java.net/)
-* [Resin 4.0.55](http://www.caucho.com/)
-* [Jackson 2.9.3](http://wiki.fasterxml.com/JacksonHome)
-* [MySQL 5.7](https://dev.mysql.com/)
-* [Postgres 9.3](http://www.postgresql.org/)
-* [cache2k 1.0.2Final](https://cache2k.org/)
+* [Java Oracle JDK](http://openjdk.java.net/)
+* [Resin](http://www.caucho.com/)
+* [Jackson](http://wiki.fasterxml.com/JacksonHome)
+* [MySQL](https://dev.mysql.com/)
+* [Postgres](http://www.postgresql.org/)
+* [cache2k](https://cache2k.org/)
 
 
 Please confirm the versions data with the latest install scripts of TFB project.
 Please confirm the versions data with the latest install scripts of TFB project.
 
 

+ 5 - 3
frameworks/Java/servlet/pom.xml

@@ -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>