Merge remote-tracking branch 'origin/master'

Author: pavelhoral

pom.xml

@@ -134,7 +134,7 @@
             </goals>
             <configuration>
               <includes>
-                <include>trustedkeys.properties</include>
+                <include>wrensec-trusted-keys.list</include>
               </includes>
             </configuration>
           </execution>

src/main/resources/trustedkeys.properties …main/resources/wrensec-trusted-keys.listsrc/main/resources/trustedkeys.properties renamed to src/main/resources/wrensec-trusted-keys.list src/main/resources/trustedkeys.properties renamed to src/main/resources/wrensec-trusted-keys.list

@@ -41,15 +41,15 @@ com.google.inject:guice=0xF0DF21D1D0A3C384
 com.google.j2objc:j2objc-annotations=0x29579F18FA8FD93B
 com.google.oauth-client=0xD01DBF93D06A19ED
 com.google.protobuf:protobuf-java:3.0.0-alpha-3.1=0x5D67BFFCBA1F9A39
-com.google.protobuf:protobuf-java=0xA7764F502A938C99
+com.google.protobuf:protobuf-java=0xA7764F502A938C99, 0x4B1E11D5A4B91E89
 com.h2database:h2=0x0A4B343F2A55FDAE
 com.jayway.jsonpath:json-path=0x3684155E9365C30E
 com.jayway.restassured=0x368557390486F2C5
 com.jcraft:jsch=0xA50569C7CA7FA1F0
 com.lmax:disruptor=0xBFFA420097F49C8A
 com.maxmind.db=0x4B70CD29736FC6E7
 com.maxmind.geoip2=0x4B70CD29736FC6E7
-commons-beanutils:commons-beanutils=0x1861C322C56014B2, 0x411063A3A0FFD119, 0x1861C322C56014B2
+commons-beanutils:commons-beanutils=0x1861C322C56014B2, 0x411063A3A0FFD119
 commons-cli:commons-cli=0x1241BC872C5E4EC0
 commons-cli:commons-cli=0x9DAADC1C9FCC82D0
 commons-codec:commons-codec=0x86FDC7E2A11262CB
@@ -75,11 +75,11 @@ com.thoughtworks.qdox:qdox=0xAE5A7FB608A0221C, 0x1B2718089CE964B8
 com.xebialabs.restito:restito=0xB15600AB6BFD0EF7, 0xDB4E8C0626B06686, 0x737A1E72E46178CE
 com.zaxxer:HikariCP=0x4CC08E7F47C3EC76
 de.matrixweb.osgi.wrapped:osgi-wrapped-rhino:1.7R4=0x62E19BAB2431A477
-de.odysseus.juel=0x552ABE33DCD478ED, 0x552ABE33DCD478ED
+de.odysseus.juel=0x552ABE33DCD478ED
 info.picocli:picocli=0x379CE192D401AB61
 io.dropwizard.metrics:metrics-core=0x7863C5234D13335B
 io.netty:netty-all=0x96FB9DB219F3338D, 0x056ACA74D46000BF
-io.reactivex:rxjava=0x94B291AEF984A085, 0x94B291AEF984A085
+io.reactivex:rxjava=0x94B291AEF984A085
 io.reactivex.rxjava2:rxjava=0x94B291AEF984A085
 io.rest-assured=0x368557390486F2C5
 io.swagger=0xF9133FD0175F39D4, 0xA49C3E34F6FF8B9D, 0x69F66542F6D54506, 0x704514F6556102E5
@@ -127,7 +127,7 @@ org.apache.geronimo.bundles:json=0xE126833F9CF64915
 org.apache.geronimo.ext.tomcat:juli=0xF97EDF900C94DEEE
 org.apache.geronimo.specs=0xECDFEA3CB4493B94, 0xE126833F9CF64915
 org.apache.httpcomponents=0x7C25280EAE63EBE5
-org.apache.ivy:ivy:2.4.0-rc1=0x5BE0BA8CB80602AE
+org.apache.ivy:ivy=0x5BE0BA8CB80602AE, 0xDDBCC1270A29D081
 org.apache.maven.doxia=0xC92C5FEC70161C62, 0x33CD6733AF5EC452, 0xC7CA19B7B620D787
 org.apache.maven:maven-aether-provider=0x2E2010F8A7FF4A41, 0x873A8E86B4372146, 0xC7BF26D0BB617866
 org.apache.maven:maven-archiver=0x466CAED6E0747D50
@@ -186,10 +186,10 @@ org.codehaus.plexus=0x2E2010F8A7FF4A41
 org.codehaus.woodstox=0x9CD8549ACF9BD0CE, 0xC9FBAA83A8753994
 org.dbunit:dbunit=0xD4F8EA28DFAC3DAF
 org.easymock:easymock=0x7C7D8456294423BA
-org.easytesting=0x1768F3F2B1F96385, 0x1768F3F2B1F96385
+org.easytesting=0x1768F3F2B1F96385, 0xCF84722DFC242EB9
 org.easytesting:fest-assert-core:2.0M10=0xCF84722DFC242EB9
 org.eclipse.aether=0x2E2010F8A7FF4A41
-org.eclipse.jetty=0xE7AE839CD7C58886
+org.eclipse.jetty=0xE7AE839CD7C58886, 0x2D0E1FB8FE4B68B4
 org.eclipse.jetty.orbit=0xE7AE839CD7C58886
 org.eclipse.jetty.websocket=0xE7AE839CD7C58886
 org.eclipse.sisu=0x01D734EE5EE9C3F8
@@ -240,6 +240,7 @@ org.twdata.maven:mojo-executor=0x99561A757E742D31
 org.xerial.snappy:snappy-java=0x42575E0CCD6BA16A
 org.yaml:snakeyaml=0x99EAEDDECFCF8216, 0x55C7E5E701832382
 wsdl4j:wsdl4j=0xFB633DE8F5CBAE6B
+mysql:mysql-connector-java=0x467B942D3A79BD29
 
 # Always trust  Wren Security (not optimal, but makes our life easier)
 *=0xAA781E12D7F749B5, 0x0E17DF45C081F89B