Use current dependencies

52North · Nov 21, 2018 · 92eeee1 · 92eeee1
1 parent a487489
commit 92eeee1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/NOTICE b/NOTICE
@@ -31,13 +31,11 @@ This project includes:
   52°North Shetland under The Apache Software License, Version 2.0
   52°North Svalbard Core under The Apache Software License, Version 2.0
   Animal Sniffer Annotations under MIT license
-  AOP alliance under Public Domain
   Apache Commons Codec under Apache License, Version 2.0
   Apache Commons Configuration under Apache License, Version 2.0
   Apache Commons Lang under The Apache Software License, Version 2.0
   Apache Commons Logging under The Apache Software License, Version 2.0
   Apache HttpClient under Apache License, Version 2.0
-  Apache HttpClient Fluent API under Apache License, Version 2.0
   Apache HttpCore under Apache License, Version 2.0
   Apache Log4j API under The Apache Software License, Version 2.0
   Apache Log4j Core under The Apache Software License, Version 2.0
@@ -52,32 +50,28 @@ This project includes:
   EXIficient-Grammars under MIT License
   FindBugs-jsr305 under The Apache Software License, Version 2.0
   Guava: Google Core Libraries for Java under The Apache Software License, Version 2.0
-  Hamcrest All under New BSD License
   J2ObjC Annotations under The Apache Software License, Version 2.0
   Jackson-annotations under The Apache Software License, Version 2.0
   Jackson-core under The Apache Software License, Version 2.0
   jackson-databind under The Apache Software License, Version 2.0
   Java Property Utility under The Apache Software License, Version 2.0
-  Java Servlet API under CDDL 1.1 or GPL2 w/ CPE
   javax.inject under The Apache Software License, Version 2.0
   JCL 1.2 implemented over SLF4J under MIT License
   Joda-Time under Apache 2
-  JUnit under Eclipse Public License 1.0
   org.locationtech.jts:jts-core under Eclipse Publish License, Version 1.0 or Eclipse Distribution License - v 1.0
   PJL Compressing Filter under Apache Software License V2.0
   SLF4J API Module under MIT License
   SLF4J Simple Binding under MIT License
-  Spring AOP under The Apache Software License, Version 2.0
-  Spring Beans under The Apache Software License, Version 2.0
-  Spring Context under The Apache Software License, Version 2.0
-  Spring Core under The Apache Software License, Version 2.0
-  Spring Expression Language (SpEL) under The Apache Software License, Version 2.0
-  Spring Web under The Apache Software License, Version 2.0
-  Spring Web MVC under The Apache Software License, Version 2.0
+  Spring AOP under Apache License, Version 2.0
+  Spring Beans under Apache License, Version 2.0
+  Spring Commons Logging Bridge under Apache License, Version 2.0
+  Spring Context under Apache License, Version 2.0
+  Spring Core under Apache License, Version 2.0
+  Spring Expression Language (SpEL) under Apache License, Version 2.0
+  Spring Web under Apache License, Version 2.0
+  Spring Web MVC under Apache License, Version 2.0
   StAX API under The Apache Software License, Version 2.0
   Xerces2-j under The Apache Software License, Version 2.0
   XML Commons External Components XML APIs under The Apache Software License, Version 2.0 or The SAX License or The W3C License
-  xml-matchers under Apache License, Version 2.0
   XmlBeans under The Apache Software License, Version 2.0
-  XMLUnit for Java under BSD License
 
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.n52</groupId>
         <artifactId>parent</artifactId>
-        <version>4</version>
+        <version>12</version>
     </parent>
 
     <groupId>org.n52.wps</groupId>
@@ -94,7 +94,7 @@
         <version.spring>5.0.9.RELEASE</version.spring>
         <version.slf4j>1.7.25</version.slf4j>
         <version.log4j>2.3</version.log4j>
-        <version.arctic.sea>5.0.0</version.arctic.sea>
+        <version.arctic.sea>5.0.1</version.arctic.sea>
     </properties>
 
     <dependencyManagement>
@@ -119,6 +119,14 @@
                         <artifactId>joda-time</artifactId>
                         <groupId>joda-time</groupId>
                     </exclusion>
+				    <exclusion>
+				    	<groupId>com.fasterxml.jackson.core</groupId>
+				    	<artifactId>jackson-core</artifactId>
+				    </exclusion>
+				    <exclusion>
+				    	<groupId>com.fasterxml.jackson.core</groupId>
+				    	<artifactId>jackson-databind</artifactId>
+				    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -135,6 +143,10 @@
                         <artifactId>jackson-core</artifactId>
                         <groupId>com.fasterxml.jackson.core</groupId>
                     </exclusion>
+				    <exclusion>
+				    	<groupId>com.fasterxml.jackson.core</groupId>
+				    	<artifactId>jackson-databind</artifactId>
+				    </exclusion>
                     <exclusion>
                         <artifactId>joda-time</artifactId>
                         <groupId>joda-time</groupId>
@@ -299,7 +311,7 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>2.9.2</version>
+                <version>2.9.5</version>
             </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>