From 3430e62da37e13ae8ee442ea3eb2966eaf6ce27a Mon Sep 17 00:00:00 2001
From: Henning Bredel <bredel@52north.org>
Date: Tue, 29 May 2018 09:26:38 +0200
Subject: [PATCH] Make series-api dependencies Spring Boot compliant

---
 io/pom.xml   |   2 +-
 pom.xml      | 205 ++++++---------------------------------------------
 rest/pom.xml |   2 +-
 spi/pom.xml  |  26 +++----
 4 files changed, 37 insertions(+), 198 deletions(-)

diff --git a/io/pom.xml b/io/pom.xml
index 8e4b37e5d..493695289 100644
--- a/io/pom.xml
+++ b/io/pom.xml
@@ -127,7 +127,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
+            <artifactId>hamcrest-library</artifactId>
         </dependency>
 
         <!-- IS THIS REALLY REQUIRED??? -->
diff --git a/pom.xml b/pom.xml
index ade198340..4cace46bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.n52</groupId>
         <artifactId>parent</artifactId>
-        <version>11</version>
+        <version>12</version>
     </parent>
 
     <groupId>org.n52.series-api</groupId>
@@ -52,18 +54,12 @@
     <properties>
         <!-- dev | ci | prod -->
         <env>dev</env>
-        
-        <!-- optional properties file -->
-        <local.configFile>file:${user.home}/${project.build.finalName}.properties</local.configFile>
-    
+
         <version.swc>3.2.0</version.swc>
-        <version.spring>4.2.5.RELEASE</version.spring>
-        <version.logback>1.2.3</version.logback>
-        <version.jackson>2.8.5</version.jackson>
+        <jackson.version>2.8.5</jackson.version>
         <version.geotools>19.0</version.geotools>
-        <version.slf4j>1.7.25</version.slf4j>
-        <version.hamcrest>1.3</version.hamcrest>
-        <version.arctic-sea>3.1.0</version.arctic-sea>
+        <arctic-sea.version>3.1.0</arctic-sea.version>
+        <spring-boot.version>2.0.2.RELEASE</spring-boot.version>
 
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
@@ -74,6 +70,15 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <!-- Import dependency management from Spring Boot -->
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>spi</artifactId>
@@ -94,35 +99,23 @@
                 <artifactId>xml-pdf-format</artifactId>
                 <version>3.2.0</version>
             </dependency>
-
             <dependency>
                 <groupId>org.n52.arctic-sea</groupId>
                 <artifactId>svalbard-odata</artifactId>
-                <version>${version.arctic-sea}</version>
+                <version>${arctic-sea.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.n52.arctic-sea</groupId>
                 <artifactId>svalbard</artifactId>
-                <version>${version.arctic-sea}</version>
+                <version>${arctic-sea.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.n52.arctic-sea</groupId>
                 <artifactId>shetland</artifactId>
-                <version>${version.arctic-sea}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>joda-time</groupId>
-                <artifactId>joda-time</artifactId>
-                <version>2.9.9</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>3.0.1</version>
-                <scope>provided</scope>
+                <version>${arctic-sea.version}</version>
             </dependency>
 
+            <!-- geotools dependencies -->
             <dependency>
                 <groupId>org.geotools</groupId>
                 <artifactId>gt-api</artifactId>
@@ -154,7 +147,6 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <!-- ensure loading before ealier versions -->
                 <groupId>org.geotools</groupId>
                 <artifactId>gt-opengis</artifactId>
                 <version>${version.geotools}</version>
@@ -242,58 +234,6 @@
                 </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-core</artifactId>
-                <version>${version.spring}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-beans</artifactId>
-                <version>${version.spring}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-context</artifactId>
-                <version>${version.spring}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-web</artifactId>
-                <version>${version.spring}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-webmvc</artifactId>
-                <version>${version.spring}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-oxm</artifactId>
-                <version>${version.spring}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-context-support</artifactId>
-                <version>${version.spring}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-tx</artifactId>
-                <version>${version.spring}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-orm</artifactId>
-                <version>${version.spring}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.quartz-scheduler</groupId>
-                <artifactId>quartz</artifactId>
-                <version>2.2.3</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.jfree</groupId>
                 <artifactId>jfreechart</artifactId>
@@ -326,19 +266,12 @@
                 <version>2.7.2</version>
                 <exclusions>
                     <exclusion>
-                        <!-- uses older xml-apis than other fop dependencies -->
                         <groupId>xml-apis</groupId>
                         <artifactId>xml-apis</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>xml-apis</groupId>
-                <artifactId>xml-apis</artifactId>
-                <version>1.3.04</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.avalon.framework</groupId>
                 <artifactId>avalon-framework-api</artifactId>
@@ -350,11 +283,6 @@
                 <version>4.3.1</version>
             </dependency>
 
-            <dependency>
-                <groupId>commons-codec</groupId>
-                <artifactId>commons-codec</artifactId>
-                <version>1.11</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-math</artifactId>
@@ -366,98 +294,9 @@
                 <version>2.4</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-core</artifactId>
-                <version>${version.jackson}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-databind</artifactId>
-                <version>${version.jackson}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-annotations</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-annotations</artifactId>
-                <version>${version.jackson}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>${version.slf4j}</version>
-            </dependency>
-            <dependency>
-                <!-- drop-in replacement for JCL -->
-                <groupId>org.slf4j</groupId>
-                <artifactId>jcl-over-slf4j</artifactId>
-                <version>${version.slf4j}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <!-- drop-in replacement for jog4j -->
-                <groupId>org.slf4j</groupId>
-                <artifactId>log4j-over-slf4j</artifactId>
-                <version>${version.slf4j}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <!-- excludes commons logging -->
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>1.2</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-core</artifactId>
-                <version>${version.logback}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-classic</artifactId>
-                <version>${version.logback}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.12</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.hamcrest</groupId>
-                <artifactId>hamcrest-core</artifactId>
-                <version>${version.hamcrest}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.hamcrest</groupId>
-                <artifactId>hamcrest-all</artifactId>
-                <version>${version.hamcrest}</version>
-                <scope>test</scope>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>
 
-    <dependencies>
-
-        <!-- ==================================================== -->
-        <!-- ======== DEBENDENCIES ACTIVE BY DEFAULT ============ -->
-        <!-- ==================================================== -->
-
-        <!-- LOGGING DEPENDENCIES -->
-
-    </dependencies>
-
     <build>
         <resources>
             <resource>
@@ -479,7 +318,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
diff --git a/rest/pom.xml b/rest/pom.xml
index c2a0a595a..d40f973de 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -89,7 +89,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
+            <artifactId>hamcrest-library</artifactId>
         </dependency>
     </dependencies>
     <build>
diff --git a/spi/pom.xml b/spi/pom.xml
index 9e28c41b8..158eec9f0 100644
--- a/spi/pom.xml
+++ b/spi/pom.xml
@@ -10,6 +10,18 @@
     <name>Series REST API - SPI module</name>
     <packaging>jar</packaging>
     <dependencies>
+        <dependency>
+            <groupId>org.n52.arctic-sea</groupId>
+            <artifactId>svalbard-odata</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.n52.arctic-sea</groupId>
+            <artifactId>svalbard</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.n52.arctic-sea</groupId>
+            <artifactId>shetland</artifactId>
+        </dependency>
     
         <dependency>
             <groupId>joda-time</groupId>
@@ -85,19 +97,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.n52.arctic-sea</groupId>
-            <artifactId>svalbard-odata</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.n52.arctic-sea</groupId>
-            <artifactId>svalbard</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.n52.arctic-sea</groupId>
-            <artifactId>shetland</artifactId>
+            <artifactId>hamcrest-library</artifactId>
         </dependency>
     </dependencies>
 </project>