From edf32fe503fecc84b37716a585b9283f92e31549 Mon Sep 17 00:00:00 2001
From: Klara <klaraw@spotify.com>
Date: Thu, 26 Aug 2021 11:59:36 +0200
Subject: [PATCH] Bom should not have a parent (#364)

* bom should not have a parent

* Move dependecyManagement of apollo-bom to apollo-parent
---
 apollo-api-impl/pom.xml       | 12 ------------
 apollo-api/pom.xml            | 12 ------------
 apollo-bom/pom.xml            | 32 ++++++++++++++++----------------
 apollo-core/pom.xml           | 12 ------------
 apollo-entity/pom.xml         | 12 ------------
 apollo-environment/pom.xml    | 12 ------------
 apollo-extra/pom.xml          | 11 -----------
 apollo-route/pom.xml          | 12 ------------
 apollo-test/pom.xml           | 12 ------------
 modules/metrics/pom.xml       | 12 ------------
 modules/okhttp-client/pom.xml | 12 ------------
 pom.xml                       |  7 +++++++
 12 files changed, 23 insertions(+), 135 deletions(-)

diff --git a/apollo-api-impl/pom.xml b/apollo-api-impl/pom.xml
index 4ae386a6..8d0310ee 100644
--- a/apollo-api-impl/pom.xml
+++ b/apollo-api-impl/pom.xml
@@ -12,18 +12,6 @@
     <artifactId>apollo-api-impl</artifactId>
     <packaging>jar</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.spotify</groupId>
-                <artifactId>apollo-bom</artifactId>
-                <version>${project.parent.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>com.spotify</groupId>
diff --git a/apollo-api/pom.xml b/apollo-api/pom.xml
index 3a7bd465..e6ae54e5 100644
--- a/apollo-api/pom.xml
+++ b/apollo-api/pom.xml
@@ -12,18 +12,6 @@
     <artifactId>apollo-api</artifactId>
     <packaging>jar</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.spotify</groupId>
-                <artifactId>apollo-bom</artifactId>
-                <version>${project.parent.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>
diff --git a/apollo-bom/pom.xml b/apollo-bom/pom.xml
index 002f6272..64f41bc3 100644
--- a/apollo-bom/pom.xml
+++ b/apollo-bom/pom.xml
@@ -2,15 +2,11 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>com.spotify</groupId>
-        <artifactId>apollo-parent</artifactId>
-        <version>1.19.2-SNAPSHOT</version>
-    </parent>
-
     <name>Spotify Apollo Bill of Materials</name>
 
+    <groupId>com.spotify</groupId>
     <artifactId>apollo-bom</artifactId>
+    <version>1.19.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencyManagement>
@@ -18,55 +14,55 @@
             <dependency>
                 <groupId>com.spotify</groupId>
                 <artifactId>apollo-core</artifactId>
-                <version>${project.parent.version}</version>
+                <version>${project.version}</version>
             </dependency>
 
             <!-- modules -->
             <dependency>
                 <groupId>com.spotify</groupId>
                 <artifactId>apollo-okhttp-client</artifactId>
-                <version>${project.parent.version}</version>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>com.spotify</groupId>
                 <artifactId>apollo-api</artifactId>
-                <version>${project.parent.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.spotify</groupId>
                 <artifactId>apollo-api-impl</artifactId>
-                <version>${project.parent.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.spotify</groupId>
                 <artifactId>apollo-environment</artifactId>
-                <version>${project.parent.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.spotify</groupId>
                 <artifactId>apollo-route</artifactId>
-                <version>${project.parent.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.spotify</groupId>
                 <artifactId>apollo-extra</artifactId>
-                <version>${project.parent.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.spotify</groupId>
                 <artifactId>apollo-entity</artifactId>
-                <version>${project.parent.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.spotify</groupId>
                 <artifactId>apollo-metrics</artifactId>
-                <version>${project.parent.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.spotify</groupId>
                 <artifactId>apollo-test</artifactId>
-                <version>${project.parent.version}</version>
+                <version>${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -76,5 +72,9 @@
             <id>ossrh</id>
             <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
         </snapshotRepository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
     </distributionManagement>
 </project>
diff --git a/apollo-core/pom.xml b/apollo-core/pom.xml
index c34a7f36..83712a52 100644
--- a/apollo-core/pom.xml
+++ b/apollo-core/pom.xml
@@ -12,18 +12,6 @@
     <artifactId>apollo-core</artifactId>
     <packaging>jar</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.spotify</groupId>
-                <artifactId>apollo-bom</artifactId>
-                <version>${project.parent.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/apollo-entity/pom.xml b/apollo-entity/pom.xml
index 1d990efb..a758c8e1 100644
--- a/apollo-entity/pom.xml
+++ b/apollo-entity/pom.xml
@@ -12,18 +12,6 @@
     <artifactId>apollo-entity</artifactId>
     <packaging>jar</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.spotify</groupId>
-                <artifactId>apollo-bom</artifactId>
-                <version>${project.parent.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>com.spotify</groupId>
diff --git a/apollo-environment/pom.xml b/apollo-environment/pom.xml
index 8ccda937..7b7962e4 100644
--- a/apollo-environment/pom.xml
+++ b/apollo-environment/pom.xml
@@ -13,18 +13,6 @@
     <artifactId>apollo-environment</artifactId>
     <packaging>jar</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.spotify</groupId>
-                <artifactId>apollo-bom</artifactId>
-                <version>${project.parent.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>com.spotify</groupId>
diff --git a/apollo-extra/pom.xml b/apollo-extra/pom.xml
index a4fd72fb..6e7283b6 100644
--- a/apollo-extra/pom.xml
+++ b/apollo-extra/pom.xml
@@ -12,17 +12,6 @@
     <artifactId>apollo-extra</artifactId>
     <packaging>jar</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.spotify</groupId>
-                <artifactId>apollo-bom</artifactId>
-                <version>${project.parent.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 
     <dependencies>
         <dependency>
diff --git a/apollo-route/pom.xml b/apollo-route/pom.xml
index 2c6d22e7..52c4fc62 100644
--- a/apollo-route/pom.xml
+++ b/apollo-route/pom.xml
@@ -12,18 +12,6 @@
     <artifactId>apollo-route</artifactId>
     <packaging>jar</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.spotify</groupId>
-                <artifactId>apollo-bom</artifactId>
-                <version>${project.parent.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>com.spotify</groupId>
diff --git a/apollo-test/pom.xml b/apollo-test/pom.xml
index 77968c17..eee4b102 100644
--- a/apollo-test/pom.xml
+++ b/apollo-test/pom.xml
@@ -12,18 +12,6 @@
     <artifactId>apollo-test</artifactId>
     <packaging>jar</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.spotify</groupId>
-                <artifactId>apollo-bom</artifactId>
-                <version>${project.parent.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>com.spotify</groupId>
diff --git a/modules/metrics/pom.xml b/modules/metrics/pom.xml
index 78ca8f4b..1a0886f6 100644
--- a/modules/metrics/pom.xml
+++ b/modules/metrics/pom.xml
@@ -13,18 +13,6 @@
     <artifactId>apollo-metrics</artifactId>
     <packaging>jar</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.spotify</groupId>
-                <artifactId>apollo-bom</artifactId>
-                <version>${project.parent.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>com.spotify</groupId>
diff --git a/modules/okhttp-client/pom.xml b/modules/okhttp-client/pom.xml
index f62b4ed3..8611e7d0 100644
--- a/modules/okhttp-client/pom.xml
+++ b/modules/okhttp-client/pom.xml
@@ -13,18 +13,6 @@
     <artifactId>apollo-okhttp-client</artifactId>
     <packaging>jar</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.spotify</groupId>
-                <artifactId>apollo-bom</artifactId>
-                <version>${project.parent.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>com.spotify</groupId>
diff --git a/pom.xml b/pom.xml
index 0bfd4a9b..055f39e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,13 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.spotify</groupId>
+                <artifactId>apollo-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>