Skip to content
This repository has been archived by the owner on Sep 28, 2021. It is now read-only.

Commit

Permalink
Bom should not have a parent (#364)
Browse files Browse the repository at this point in the history 
* bom should not have a parent

* Move dependecyManagement of apollo-bom to apollo-parent
  • Loading branch information
@klaraward
klaraward committed Aug 26, 2021
1 parent c1961d2 commit edf32fe
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 135 deletions.
12 changes: 0 additions & 12 deletions apollo-api-impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 0 additions & 12 deletions apollo-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
32 changes: 16 additions & 16 deletions apollo-bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,71 +2,67 @@
<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>
<dependencies>
<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>
Expand All @@ -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>
12 changes: 0 additions & 12 deletions apollo-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 0 additions & 12 deletions apollo-entity/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 0 additions & 12 deletions apollo-environment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
11 changes: 0 additions & 11 deletions apollo-extra/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 0 additions & 12 deletions apollo-route/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 0 additions & 12 deletions apollo-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 0 additions & 12 deletions modules/metrics/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 0 additions & 12 deletions modules/okhttp-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 7 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit edf32fe

Please sign in to comment.