Merge pull request #65 from zalando-stups/gh-55-update-cve-plugin

Update plugin and dependency versions
zalando-stups · Jan 7, 2021 · 8e12b19 · 8e12b19
2 parents b0946c0 + d41487a
commit 8e12b19
Show file tree

Hide file tree

Showing 7 changed files with 156 additions and 138 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Changed
+
+- Change base package from `de.zalando` to `org.zalando`
+- Update `postgresql` ([CVE-2020-13692](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-13692))
+- Update `guava` ([CVE-2020-8908](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-8908))
+- Update `spring` ([CVE-2020-5421](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-5421))
+
 ## [2.0.0] - 2017-08-04
 
 ### Added

diff --git a/pom.xml b/pom.xml
@@ -61,7 +61,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <spring.version>5.2.5.RELEASE</spring.version>
+        <spring.version>5.2.12.RELEASE</spring.version>
         <postgresql.version>42.2.14</postgresql.version>
     </properties>
 
@@ -115,7 +115,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>28.0-jre</version>
+            <version>30.1-jre</version>
         </dependency>
         <dependency>
             <groupId>javax.persistence</groupId>
@@ -133,7 +133,7 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
-            <version>4.12</version>
+            <version>4.13.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -198,7 +198,7 @@
             <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>5.0.0</version>
+                <version>6.0.5</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/src/test/java/org/zalando/typemapper/core/fieldMapper/DoubleFieldMapperTest.java b/src/test/java/org/zalando/typemapper/core/fieldMapper/DoubleFieldMapperTest.java
@@ -2,8 +2,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.nullValue;
-
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -13,7 +12,7 @@ public class DoubleFieldMapperTest {
     private DoubleFieldMapper doubleFieldMapper;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         doubleFieldMapper = new DoubleFieldMapper();
     }
 

diff --git a/src/test/java/org/zalando/typemapper/core/fieldMapper/FloatFieldMapperTest.java b/src/test/java/org/zalando/typemapper/core/fieldMapper/FloatFieldMapperTest.java
@@ -2,8 +2,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.nullValue;
-
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -18,7 +17,7 @@ public void setUp() {
     }
 
     @Test
-    public void testShoulMapNullStringToNull() {
+    public void testShouldMapNullStringToNull() {
         assertThat(floatFieldMapper.mapField(null, Float.class), nullValue());
     }
 

diff --git a/src/test/java/org/zalando/typemapper/postgres/HStoreTest.java b/src/test/java/org/zalando/typemapper/postgres/HStoreTest.java
@@ -2,9 +2,9 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Map;

diff --git a/src/test/java/org/zalando/typemapper/postgres/PgSerializerTest.java b/src/test/java/org/zalando/typemapper/postgres/PgSerializerTest.java
@@ -13,11 +13,14 @@
 import java.util.Date;
 import java.util.regex.Pattern;
 
+
 import static org.zalando.typemapper.postgres.PgArray.ARRAY;
 import static org.zalando.typemapper.postgres.PgRow.ROW;
+
+
 import static org.cthul.matchers.CthulMatchers.matchesPattern;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 @RunWith(Parameterized.class)
 public class PgSerializerTest {