You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2021/01/13 14:54:28 UTC
[ignite-3] branch ignite-13987 updated (8aec96d -> 18aaa11)
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a change to branch ignite-13987
in repository https://gitbox.apache.org/repos/asf/ignite-3.git.
from 8aec96d Minor.
new 928c427 Fix dependency management.
new 18aaa11 Fix maven plugin management.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
modules/cli/pom.xml | 26 +--
modules/configuration-annotation-processor/pom.xml | 14 --
modules/configuration/pom.xml | 7 -
modules/ignite-runner/pom.xml | 11 -
pom.xml | 253 ++++++++++++++++++---
5 files changed, 217 insertions(+), 94 deletions(-)
[ignite-3] 02/02: Fix maven plugin management.
Posted by am...@apache.org.
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 18aaa1198bdf380efcbe0d4540e7af9940ed3c6e
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Wed Jan 13 17:54:16 2021 +0300
Fix maven plugin management.
---
modules/cli/pom.xml | 5 +-
modules/configuration-annotation-processor/pom.xml | 2 -
modules/ignite-runner/pom.xml | 1 -
pom.xml | 101 +++++++++++++++------
4 files changed, 72 insertions(+), 37 deletions(-)
diff --git a/modules/cli/pom.xml b/modules/cli/pom.xml
index ec41e98..9f03bf2 100644
--- a/modules/cli/pom.xml
+++ b/modules/cli/pom.xml
@@ -107,7 +107,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin.version}</version>
<configuration>
<finalName>ignite</finalName>
@@ -136,7 +135,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.plugin.version}</version>
<configuration>
<!-- Uncomment to enable incremental compilation -->
<!-- <useIncrementalCompilation>false</useIncrementalCompilation> -->
@@ -173,8 +171,8 @@
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>${maven.antrun.plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
@@ -228,7 +226,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <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 75764f4..698be5f 100644
--- a/modules/configuration-annotation-processor/pom.xml
+++ b/modules/configuration-annotation-processor/pom.xml
@@ -74,7 +74,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.plugin.version}</version>
<executions>
<execution>
<id>default-compile</id>
@@ -98,7 +97,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>${apache.rat.plugin.version}</version>
<configuration>
<excludes>
<exclude>src/main/resources/META-INF/services/javax.annotation.processing.Processor</exclude>
diff --git a/modules/ignite-runner/pom.xml b/modules/ignite-runner/pom.xml
index a1e6eee..b4b3441 100644
--- a/modules/ignite-runner/pom.xml
+++ b/modules/ignite-runner/pom.xml
@@ -74,7 +74,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <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 c81f12a..0d9f11e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,6 @@
<maven.surefire.plugin.version>3.0.0-M4</maven.surefire.plugin.version>
</properties>
-
<modules>
<module>modules/cli</module>
<module>modules/cli-common</module>
@@ -95,6 +94,11 @@
</repository>
</distributionManagement>
+ <issueManagement>
+ <system>Jira</system>
+ <url>https://issues.apache.org/jira/projects/IGNITE/issues</url>
+ </issueManagement>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -224,58 +228,95 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <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>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache.rat.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>check-licenses</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <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. -->
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.plugin.version}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven.antrun.plugin.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <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>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>${apache.rat.plugin.version}</version>
- <executions>
- <execution>
- <id>check-licenses</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <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. -->
- </excludes>
- </configuration>
</plugin>
</plugins>
</build>
[ignite-3] 01/02: Fix dependency management.
Posted by am...@apache.org.
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 <an...@gmail.com>
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>