This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch ignite-13987 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 928c427cb5bf847bbd35d415d7000ebe30e40c40 Author: Andrew Mashenkov <[email protected]> AuthorDate: Wed Jan 13 17:33:33 2021 +0300 Fix dependency management. --- modules/cli/pom.xml | 21 --- modules/configuration-annotation-processor/pom.xml | 12 -- modules/configuration/pom.xml | 7 - modules/ignite-runner/pom.xml | 10 -- pom.xml | 156 +++++++++++++++++++-- 5 files changed, 147 insertions(+), 59 deletions(-) diff --git a/modules/cli/pom.xml b/modules/cli/pom.xml index d2ccfb9..ec41e98 100644 --- a/modules/cli/pom.xml +++ b/modules/cli/pom.xml @@ -33,15 +33,6 @@ <artifactId>ignite-cli</artifactId> - <properties> - <apache.ivy.version>2.5.0</apache.ivy.version> - <jackson.databind.version>2.11.1</jackson.databind.version> - <jansi.version>1.18</jansi.version> - <logback.version>1.2.3</logback.version> - <picocli.version>4.5.2</picocli.version> - <typesafe.version>1.4.1</typesafe.version> - </properties> - <dependencies> <dependency> <groupId>org.apache.ignite</groupId> @@ -53,66 +44,54 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>${logback.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson.databind.version}</version> </dependency> <dependency> <groupId>org.apache.ivy</groupId> <artifactId>ivy</artifactId> - <version>${apache.ivy.version}</version> </dependency> <dependency> <groupId>info.picocli</groupId> <artifactId>picocli-shell-jline3</artifactId> - <version>${picocli.version}</version> </dependency> <dependency> <groupId>io.micronaut</groupId> <artifactId>micronaut-inject-java</artifactId> - <version>${micronaut.version}</version> </dependency> <dependency> <groupId>com.typesafe</groupId> <artifactId>config</artifactId> - <version>${typesafe.version}</version> </dependency> <dependency> <groupId>org.fusesource.jansi</groupId> <artifactId>jansi</artifactId> - <version>${jansi.version}</version> </dependency> <dependency> <groupId>info.picocli</groupId> <artifactId>picocli</artifactId> - <version>${picocli.version}</version> </dependency> <dependency> <groupId>org.jetbrains</groupId> <artifactId>annotations</artifactId> - <version>${jetbrains.annotations.version}</version> </dependency> <!-- Test dependencies. --> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-api</artifactId> - <version>${junit.jupiter.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-junit-jupiter</artifactId> - <version>${mockito.junit.jupiter.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>io.micronaut.test</groupId> <artifactId>micronaut-test-junit5</artifactId> - <version>${micronaut.test.junit5.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/modules/configuration-annotation-processor/pom.xml b/modules/configuration-annotation-processor/pom.xml index fe163c5..75764f4 100644 --- a/modules/configuration-annotation-processor/pom.xml +++ b/modules/configuration-annotation-processor/pom.xml @@ -33,13 +33,6 @@ <artifactId>ignite-configuration-annotation-processor</artifactId> - <properties> - <compile.testing.library.version>0.19</compile.testing.library.version> - <javapoet.version>1.13.0</javapoet.version> - <log4j.version>1.2.17</log4j.version> - <spoon.framework.version>8.3.0</spoon.framework.version> - </properties> - <dependencies> <dependency> <groupId>org.apache.ignite</groupId> @@ -51,32 +44,27 @@ <dependency> <groupId>com.squareup</groupId> <artifactId>javapoet</artifactId> - <version>${javapoet.version}</version> </dependency> <!-- Test dependencies. --> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito.framework.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>com.google.testing.compile</groupId> <artifactId>compile-testing</artifactId> - <version>${compile.testing.library.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>fr.inria.gforge.spoon</groupId> <artifactId>spoon-core</artifactId> - <version>${spoon.framework.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/modules/configuration/pom.xml b/modules/configuration/pom.xml index 7627929..987caec 100644 --- a/modules/configuration/pom.xml +++ b/modules/configuration/pom.xml @@ -33,28 +33,21 @@ <artifactId>ignite-configuration</artifactId> - <properties> - <log4j.version>1.2.17</log4j.version> - </properties> - <dependencies> <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> - <version>${javax.validation.version}</version> </dependency> <!-- Test dependencies. --> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito.framework.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/modules/ignite-runner/pom.xml b/modules/ignite-runner/pom.xml index 05694f4..a1e6eee 100644 --- a/modules/ignite-runner/pom.xml +++ b/modules/ignite-runner/pom.xml @@ -23,11 +23,6 @@ <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> - <properties> - <gson.version>2.8.6</gson.version> - <javalin.version>3.12.0</javalin.version> - <slf4j.version>1.7.30</slf4j.version> - </properties> <parent> <groupId>org.apache.ignite</groupId> @@ -56,19 +51,14 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>${gson.version}</version> </dependency> - <dependency> <groupId>io.javalin</groupId> <artifactId>javalin</artifactId> - <version>${javalin.version}</version> </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> - <version>${slf4j.version}</version> </dependency> </dependencies> diff --git a/pom.xml b/pom.xml index 310465e..c81f12a 100644 --- a/pom.xml +++ b/pom.xml @@ -48,14 +48,27 @@ <maven.compiler.release>11</maven.compiler.release> <!-- Dependencies versions. --> + <apache.ivy.version>2.5.0</apache.ivy.version> + <compile.testing.library.version>0.19</compile.testing.library.version> + <gson.version>2.8.6</gson.version> + <jackson.databind.version>2.11.1</jackson.databind.version> + <jansi.version>1.18</jansi.version> + <javalin.version>3.12.0</javalin.version> + <javapoet.version>1.13.0</javapoet.version> <javax.annotation.api.version>1.3.2</javax.annotation.api.version> <javax.validation.version>2.0.1.Final</javax.validation.version> <jetbrains.annotations.version>20.1.0</jetbrains.annotations.version> <junit.jupiter.version>5.7.0</junit.jupiter.version> + <log4j.version>1.2.17</log4j.version> + <logback.version>1.2.3</logback.version> <micronaut.version>2.1.2</micronaut.version> <micronaut.test.junit5.version>2.3.1</micronaut.test.junit5.version> <mockito.framework.version>3.4.6</mockito.framework.version> <mockito.junit.jupiter.version>3.3.3</mockito.junit.jupiter.version> + <picocli.version>4.5.2</picocli.version> + <slf4j.version>1.7.30</slf4j.version> + <spoon.framework.version>8.3.0</spoon.framework.version> + <typesafe.version>1.4.1</typesafe.version> <!-- Maven plugins. --> <apache.rat.plugin.version>0.13</apache.rat.plugin.version> @@ -65,14 +78,6 @@ <maven.surefire.plugin.version>3.0.0-M4</maven.surefire.plugin.version> </properties> - <dependencies> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - <version>${junit.jupiter.version}</version> - <scope>test</scope> - </dependency> - </dependencies> <modules> <module>modules/cli</module> @@ -90,6 +95,138 @@ </repository> </distributionManagement> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jetbrains</groupId> + <artifactId>annotations</artifactId> + <version>${jetbrains.annotations.version}</version> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>${logback.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${jackson.databind.version}</version> + </dependency> + <dependency> + <groupId>org.apache.ivy</groupId> + <artifactId>ivy</artifactId> + <version>${apache.ivy.version}</version> + </dependency> + <dependency> + <groupId>info.picocli</groupId> + <artifactId>picocli-shell-jline3</artifactId> + <version>${picocli.version}</version> + </dependency> + <dependency> + <groupId>io.micronaut</groupId> + <artifactId>micronaut-inject-java</artifactId> + <version>${micronaut.version}</version> + </dependency> + <dependency> + <groupId>com.typesafe</groupId> + <artifactId>config</artifactId> + <version>${typesafe.version}</version> + </dependency> + <dependency> + <groupId>org.fusesource.jansi</groupId> + <artifactId>jansi</artifactId> + <version>${jansi.version}</version> + </dependency> + <dependency> + <groupId>info.picocli</groupId> + <artifactId>picocli</artifactId> + <version>${picocli.version}</version> + </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>${javax.validation.version}</version> + </dependency> + <dependency> + <groupId>com.squareup</groupId> + <artifactId>javapoet</artifactId> + <version>${javapoet.version}</version> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>${gson.version}</version> + </dependency> + <dependency> + <groupId>io.javalin</groupId> + <artifactId>javalin</artifactId> + <version>${javalin.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>${slf4j.version}</version> + </dependency> + + <!-- Test dependencies. --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${mockito.framework.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-junit-jupiter</artifactId> + <version>${mockito.junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>io.micronaut.test</groupId> + <artifactId>micronaut-test-junit5</artifactId> + <version>${micronaut.test.junit5.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.google.testing.compile</groupId> + <artifactId>compile-testing</artifactId> + <version>${compile.testing.library.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>fr.inria.gforge.spoon</groupId> + <artifactId>spoon-core</artifactId> + <version>${spoon.framework.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + </dependency> + </dependencies> + <build> <plugins> <plugin> @@ -135,7 +272,8 @@ <exclude>README.md</exclude> <exclude>DEVNOTES.md</exclude> <exclude>docs/assets/images/**</exclude> - <exclude>docs/assets/js/anchor.min.js</exclude><!-- Distributed under the MIT license. The original license header is badly formatted. --> + <exclude>docs/assets/js/anchor.min.js + </exclude><!-- Distributed under the MIT license. The original license header is badly formatted. --> </excludes> </configuration> </plugin>
