Merge pull request jhipster#5 from erikkemperman/spring-platform

Inherit from spring-platform instead of spring-boot-dependencies
erikkemperman · Oct 9, 2017 · 70deea6 · 70deea6
2 parents e65f4f8 + 03141a4
commit 70deea6
Showing 1 changed file with 9 additions and 34 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,9 +4,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>1.5.7.RELEASE</version>
+        <groupId>io.spring.platform</groupId>
+        <artifactId>platform-bom</artifactId>
+        <version>Brussels-SR5</version>
         <relativePath/>
     </parent>
 
@@ -23,8 +23,6 @@
         <bucket4j.version>3.0.1</bucket4j.version>
         <cassandra-driver-extras.version>3.3.0</cassandra-driver-extras.version>
         <cassandra-unit-spring.version>3.0.0.1</cassandra-unit-spring.version>
-        <commons-io.version>2.5</commons-io.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <cucumber.version>1.2.4</cucumber.version>
         <dropwizard-metrics.version>3.2.2</dropwizard-metrics.version>
         <gatling.version>2.2.5</gatling.version>
@@ -50,6 +48,9 @@
         <prometheus-simpleclient.version>0.0.20</prometheus-simpleclient.version>
         <springfox.version>2.7.0</springfox.version>
         <validation-api.version>1.1.0.Final</validation-api.version>
+        <!-- The spring-boot version should match the one in
+        https://github.com/spring-io/platform/blob/v${project.parent.version}/platform-bom/pom.xml -->
+        <spring-boot.version>1.5.7.RELEASE</spring-boot.version>
         <spring-cloud.version>Dalston.SR2</spring-cloud.version>
         <!-- The netflix version should match the one in
         https://github.com/spring-cloud/spring-cloud-release/blob/v${spring-cloud.version}/spring-cloud-dependencies/pom.xml -->
@@ -95,16 +96,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>${commons-io.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${commons-lang3.version}</version>
-            </dependency>
             <dependency>
                 <groupId>info.cukes</groupId>
                 <artifactId>cucumber-junit</artifactId>
@@ -120,11 +111,6 @@
                 <artifactId>gatling-charts-highcharts</artifactId>
                 <version>${gatling.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>${guava.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.hazelcast</groupId>
                 <artifactId>hazelcast-hibernate52</artifactId>
@@ -272,21 +258,10 @@
                 <artifactId>simpleclient_servlet</artifactId>
                 <version>${prometheus-simpleclient.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-core</artifactId>
-                <version>${spring.version}</version>
-                <exclusions>
-                  <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                  </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-configuration-processor</artifactId>
-                <version>${project.parent.version}</version>
+                <version>${spring-boot.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>com.vaadin.external.google</groupId>
@@ -297,7 +272,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-test</artifactId>
-                <version>${project.parent.version}</version>
+                <version>${spring-boot.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>com.vaadin.external.google</groupId>
@@ -312,7 +287,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-web</artifactId>
-                <version>${project.parent.version}</version>
+                <version>${spring-boot.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.springframework.boot</groupId>