Merge branch 'master' into task/fix_centos_7_7_dockerfile

telefonicaid · Jun 16, 2020 · 413634e · 413634e
2 parents 533d8a6 + dc5eb58
commit 413634e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,6 @@
 ADD: fix Centos 7.7.1908 version in dockerfile
+ADD: Fix net.sf.ehcache.skipUpdateCheck (#136)
+ADD: upgrade java mysql connector from 5.1.47 to 5.1.49
 ADD: fix /opt/keypass directory to 1000 user for docker
 ADD: autoReconnect to jdbc url configuration (#116)
 ADD: disable usage of SSL for mysql in jdbc url configuration (#126)

diff --git a/pom.xml b/pom.xml
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.47</version>
+            <version>5.1.49</version>
         </dependency>
         <dependency>
             <groupId>net.sf.ehcache</groupId>

diff --git a/src/main/java/es/tid/fiware/iot/ac/AcService.java b/src/main/java/es/tid/fiware/iot/ac/AcService.java
@@ -55,6 +55,7 @@ public DataSourceFactory getDataSourceFactory(AcConfig configuration) {
     };
 
     public static void main(String[] args) throws Exception {
+        System.setProperty("net.sf.ehcache.skipUpdateCheck", "true");
         new AcService().run(args);
     }