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 91c1bb8ed0f18ccc04f98b5caa1b09693f07eaf9 Author: Andrew Mashenkov <[email protected]> AuthorDate: Wed Jan 13 16:41:53 2021 +0300 Fix dependencies versions. --- modules/cli-common/pom.xml | 2 +- modules/cli/pom.xml | 59 ++++++++++++---------- modules/configuration-annotation-processor/pom.xml | 40 ++++++++------- modules/configuration/pom.xml | 14 +++-- modules/ignite-runner/pom.xml | 30 ++++++----- pom.xml | 33 ++++++++++-- 6 files changed, 111 insertions(+), 67 deletions(-) diff --git a/modules/cli-common/pom.xml b/modules/cli-common/pom.xml index 06a5351..e932309 100644 --- a/modules/cli-common/pom.xml +++ b/modules/cli-common/pom.xml @@ -26,7 +26,7 @@ <groupId>org.apache.ignite</groupId> <artifactId>apache-ignite</artifactId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../..</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>ignite-cli-common</artifactId> diff --git a/modules/cli/pom.xml b/modules/cli/pom.xml index e79a94f..f460e59 100644 --- a/modules/cli/pom.xml +++ b/modules/cli/pom.xml @@ -28,26 +28,31 @@ <groupId>org.apache.ignite</groupId> <artifactId>apache-ignite</artifactId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../..</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>ignite-cli</artifactId> <properties> - <micronaut.version>2.1.2</micronaut.version> + <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> + <!-- 3-rd party dependencies. --> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>1.2.3</version> + <version>${logback.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.11.1</version> + <version>${jackson.databind.version}</version> </dependency> <dependency> <groupId>org.apache.ignite</groupId> @@ -57,7 +62,7 @@ <dependency> <groupId>org.apache.ivy</groupId> <artifactId>ivy</artifactId> - <version>2.5.0</version> + <version>${apache.ivy.version}</version> </dependency> <dependency> <groupId>info.picocli</groupId> @@ -65,9 +70,19 @@ <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>1.18</version> + <version>${jansi.version}</version> </dependency> <dependency> <groupId>info.picocli</groupId> @@ -77,38 +92,28 @@ <dependency> <groupId>org.jetbrains</groupId> <artifactId>annotations</artifactId> - <version>16.0.3</version> + <version>${jetbrains.annotations.version}</version> </dependency> + + <!-- Test dependencies. --> <dependency> <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter</artifactId> - <version>5.7.0</version> + <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>3.3.3</version> + <version>${mockito.junit.jupiter.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>io.micronaut.test</groupId> <artifactId>micronaut-test-junit5</artifactId> - <version>2.3.1</version> + <version>${micronaut.test.junit5.version}</version> <scope>test</scope> </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>1.4.1</version> - </dependency> </dependencies> <build> @@ -122,7 +127,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>3.2.0</version> + <version>${maven.assembly.plugin.version}</version> <configuration> <finalName>ignite</finalName> @@ -151,7 +156,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> + <version>${maven.compiler.plugin.version}</version> <configuration> <!-- Uncomment to enable incremental compilation --> <!-- <useIncrementalCompilation>false</useIncrementalCompilation> --> @@ -194,7 +199,7 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>3.0.0</version> + <version>${maven.antrun.plugin.version}</version> <executions> <execution> <phase>package</phase> @@ -248,7 +253,7 @@ <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.13</version> + <version>${apache.rat.plugin.version}</version> <configuration> <excludes> <exclude>**/builtin_modules.conf</exclude> diff --git a/modules/configuration-annotation-processor/pom.xml b/modules/configuration-annotation-processor/pom.xml index e01264e..fe163c5 100644 --- a/modules/configuration-annotation-processor/pom.xml +++ b/modules/configuration-annotation-processor/pom.xml @@ -28,49 +28,55 @@ <groupId>org.apache.ignite</groupId> <artifactId>apache-ignite</artifactId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../..</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <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>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> - <scope>test</scope> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-configuration</artifactId> + <version>${project.version}</version> </dependency> + <!-- 3-rd party dependencies. --> <dependency> <groupId>com.squareup</groupId> <artifactId>javapoet</artifactId> - <version>1.13.0</version> + <version>${javapoet.version}</version> </dependency> + <!-- Test dependencies. --> <dependency> - <groupId>org.apache.ignite</groupId> - <artifactId>ignite-configuration</artifactId> - <version>${project.version}</version> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j.version}</version> + <scope>test</scope> </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>3.4.6</version> + <version>${mockito.framework.version}</version> <scope>test</scope> </dependency> - <dependency> <groupId>com.google.testing.compile</groupId> <artifactId>compile-testing</artifactId> - <version>0.19</version> + <version>${compile.testing.library.version}</version> <scope>test</scope> </dependency> - <dependency> <groupId>fr.inria.gforge.spoon</groupId> <artifactId>spoon-core</artifactId> - <version>8.3.0</version> + <version>${spoon.framework.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -80,7 +86,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> + <version>${maven.compiler.plugin.version}</version> <executions> <execution> <id>default-compile</id> @@ -104,7 +110,7 @@ <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.13</version> + <version>${apache.rat.plugin.version}</version> <configuration> <excludes> <exclude>src/main/resources/META-INF/services/javax.annotation.processing.Processor</exclude> diff --git a/modules/configuration/pom.xml b/modules/configuration/pom.xml index 65af22f..7627929 100644 --- a/modules/configuration/pom.xml +++ b/modules/configuration/pom.xml @@ -28,29 +28,33 @@ <groupId>org.apache.ignite</groupId> <artifactId>apache-ignite</artifactId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../..</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>ignite-configuration</artifactId> + <properties> + <log4j.version>1.2.17</log4j.version> + </properties> + <dependencies> <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> - <version>2.0.1.Final</version> + <version>${javax.validation.version}</version> </dependency> + <!-- Test dependencies. --> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.17</version> + <version>${log4j.version}</version> <scope>test</scope> </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>3.4.6</version> + <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 f6d068d..05694f4 100644 --- a/modules/ignite-runner/pom.xml +++ b/modules/ignite-runner/pom.xml @@ -23,12 +23,17 @@ <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> <artifactId>apache-ignite</artifactId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../..</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>ignite-runner</artifactId> @@ -41,28 +46,29 @@ </dependency> <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-configuration-annotation-processor</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <!-- 3rd party dependencies. --> + <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.6</version> + <version>${gson.version}</version> </dependency> <dependency> <groupId>io.javalin</groupId> <artifactId>javalin</artifactId> - <version>3.12.0</version> + <version>${javalin.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> - <version>1.7.30</version> - </dependency> - - <dependency> - <groupId>org.apache.ignite</groupId> - <artifactId>ignite-configuration-annotation-processor</artifactId> - <version>${project.version}</version> - <scope>compile</scope> + <version>${slf4j.version}</version> </dependency> </dependencies> @@ -78,7 +84,7 @@ <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.13</version> + <version>${apache.rat.plugin.version}</version> <configuration> <excludes> <exclude>src/main/resources/bootstrap-config.json</exclude> diff --git a/pom.xml b/pom.xml index 61b5716..3f03881 100644 --- a/pom.xml +++ b/pom.xml @@ -46,23 +46,40 @@ <maven.compiler.source>11</maven.compiler.source> <maven.compiler.target>11</maven.compiler.target> <maven.compiler.release>11</maven.compiler.release> + + <!-- Dependencies versions. --> + <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> + <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> + + <!-- Maven plugins --> + <apache.rat.plugin.version>0.13</apache.rat.plugin.version> + <maven.antrun.plugin.version>3.0.0</maven.antrun.plugin.version> + <maven.assembly.plugin.version>3.2.0</maven.assembly.plugin.version> + <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version> + <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>5.6.2</version> + <version>${junit.jupiter.version}</version> <scope>test</scope> </dependency> </dependencies> <modules> + <module>modules/cli</module> + <module>modules/cli-common</module> <module>modules/configuration</module> <module>modules/configuration-annotation-processor</module> <module>modules/ignite-runner</module> - <module>modules/cli-common</module> - <module>modules/cli</module> </modules> <distributionManagement> @@ -78,7 +95,13 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> + <version>${maven.compiler.plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven.surefire.plugin.version}</version> </plugin> <plugin> @@ -97,7 +120,7 @@ <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.13</version> + <version>${apache.rat.plugin.version}</version> <executions> <execution> <id>check-licenses</id>
