Skip to content

Commit

Permalink
Push some common dependencies/configs into parent module pom.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
carltonwhitehead committed Jun 14, 2024
1 parent 2d3713e commit 0dfefae
Show file tree
Hide file tree
Showing 30 changed files with 80 additions and 283 deletions.
5 changes: 1 addition & 4 deletions admin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@
<artifactId>datasource-crispy-fish</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>

<dependency>
<groupId>org.kodein.di</groupId>
<artifactId>kodein-di-jvm</artifactId>
Expand Down
10 changes: 1 addition & 9 deletions api-client-motorsportreg-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
<artifactId>api-client-motorsportreg-test</artifactId>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>

<dependency>
<groupId>com.willowtreeapps.assertk</groupId>
<artifactId>assertk-jvm</artifactId>
Expand All @@ -42,11 +39,6 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-migrationsupport</artifactId>
Expand Down
5 changes: 1 addition & 4 deletions api-client-motorsportreg/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@
</properties>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>

<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
Expand Down
10 changes: 1 addition & 9 deletions core-kodein-di/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,12 @@
<artifactId>core</artifactId>
<version>0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>

<dependency>
<groupId>org.kodein.di</groupId>
<artifactId>kodein-di-jvm</artifactId>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>tech.coner.trailer</groupId>
<artifactId>core-test</artifactId>
Expand Down
10 changes: 1 addition & 9 deletions core-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
<artifactId>core-test</artifactId>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>

<dependency>
<groupId>tech.coner.trailer</groupId>
<artifactId>core</artifactId>
Expand All @@ -33,11 +30,6 @@
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
5 changes: 1 addition & 4 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
<artifactId>core</artifactId>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>

<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
Expand Down
10 changes: 0 additions & 10 deletions datasource-crispy-fish-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
</properties>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>
<dependency>
<groupId>tech.coner.trailer</groupId>
<artifactId>core-test</artifactId>
Expand All @@ -29,12 +25,6 @@
<artifactId>datasource-crispy-fish</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
5 changes: 1 addition & 4 deletions datasource-crispy-fish/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@
<artifactId>crispyfish-library</artifactId>
<version>${crispyfish.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>

</dependencies>

<build>
Expand Down
5 changes: 1 addition & 4 deletions datasource-snoozle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@
<artifactId>snoozle</artifactId>
<version>${snoozle.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>

</dependencies>

<build>
Expand Down
5 changes: 1 addition & 4 deletions io-kodein-di-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@
<artifactId>io-kodein-di</artifactId>
<version>0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>

<dependency>
<groupId>io.mockk</groupId>
<artifactId>mockk-jvm</artifactId>
Expand Down
10 changes: 1 addition & 9 deletions io-kodein-di/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
<artifactId>io</artifactId>
<version>0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>

<dependency>
<groupId>org.kodein.di</groupId>
<artifactId>kodein-di-jvm</artifactId>
Expand All @@ -36,11 +33,6 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>tech.coner.trailer</groupId>
<artifactId>core-test</artifactId>
Expand Down
14 changes: 0 additions & 14 deletions io-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,12 @@
<artifactId>io</artifactId>
<version>0.1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>
<dependency>
<groupId>com.willowtreeapps.assertk</groupId>
<artifactId>assertk-jvm</artifactId>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>tech.coner.trailer</groupId>
<artifactId>core-test</artifactId>
Expand All @@ -51,10 +41,6 @@
<version>0.1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines-test-jvm</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
5 changes: 1 addition & 4 deletions io-testsupport/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
<version>0.1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>

<dependency>
<groupId>com.willowtreeapps.assertk</groupId>
<artifactId>assertk-jvm</artifactId>
Expand Down
26 changes: 2 additions & 24 deletions io/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
<artifactId>io</artifactId>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>

<dependency>
<groupId>tech.coner.trailer</groupId>
<artifactId>core</artifactId>
Expand Down Expand Up @@ -58,21 +55,6 @@
<version>3.12.0</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.mockk</groupId>
<artifactId>mockk-jvm</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.willowtreeapps.assertk</groupId>
<artifactId>assertk-jvm</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>tech.coner.trailer</groupId>
<artifactId>core-test</artifactId>
Expand All @@ -97,11 +79,7 @@
<version>1.5.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines-test-jvm</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>
Expand Down
56 changes: 56 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
<kotlin.version>1.9.22</kotlin.version>
<kotlin.compiler.languageVersion>2.0</kotlin.compiler.languageVersion>
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
<kotlin.code.style>official</kotlin.code.style>
<properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
<kotlinx.coroutines.version>1.7.3</kotlinx.coroutines.version>
<kotlinx.html.version>0.8.0</kotlinx.html.version>
Expand All @@ -77,6 +78,34 @@
<turbine.version>1.0.0</turbine.version>
</properties>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines-core</artifactId>
</dependency>

<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines-test-jvm</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
</dependency>
<dependency>
<groupId>com.willowtreeapps.assertk</groupId>
<artifactId>assertk-jvm</artifactId>
</dependency>
<dependency>
<groupId>io.mockk</groupId>
<artifactId>mockk-jvm</artifactId>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -181,6 +210,12 @@
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit5</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.willowtreeapps.assertk</groupId>
<artifactId>assertk-jvm</artifactId>
Expand Down Expand Up @@ -236,6 +271,23 @@
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>

<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<plugin>
Expand Down Expand Up @@ -407,6 +459,10 @@
</profiles>

<repositories>
<repository>
<id>mavenCentral</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<snapshots>
<enabled>true</enabled>
Expand Down
5 changes: 1 addition & 4 deletions presentation/presentation-all-kodein-di/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@
<artifactId>presentation-text</artifactId>
<version>0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>

<dependency>
<groupId>org.kodein.di</groupId>
<artifactId>kodein-di-jvm</artifactId>
Expand Down
5 changes: 1 addition & 4 deletions presentation/presentation-all-testsupport-mockk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@
</properties>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>

<dependency>
<groupId>tech.coner.trailer</groupId>
<artifactId>presentation</artifactId>
Expand Down
Loading

0 comments on commit 0dfefae

Please sign in to comment.