You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2020/12/27 18:57:51 UTC
[ignite-3] branch ignite-3.0.0-alpha1 updated: IGNITE-13916 - Fixed
POM structure (#19)
This is an automated email from the ASF dual-hosted git repository.
vkulichenko pushed a commit to branch ignite-3.0.0-alpha1
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/ignite-3.0.0-alpha1 by this push:
new 91e2e9f IGNITE-13916 - Fixed POM structure (#19)
91e2e9f is described below
commit 91e2e9f8007b7a1fd642219ec8351e761ac4c626
Author: Valentin Kulichenko <va...@gmail.com>
AuthorDate: Sun Dec 27 10:56:27 2020 -0800
IGNITE-13916 - Fixed POM structure (#19)
---
modules/cli-common/pom.xml | 14 +-----------
modules/cli/pom.xml | 3 +--
modules/configuration-annotation-processor/pom.xml | 16 ++++++-------
modules/configuration/pom.xml | 26 ++++++----------------
modules/ignite-runner/pom.xml | 25 +++++++--------------
pom.xml | 23 +++++++++++++++++++
6 files changed, 47 insertions(+), 60 deletions(-)
diff --git a/modules/cli-common/pom.xml b/modules/cli-common/pom.xml
index a0799cc..32f9d3e 100644
--- a/modules/cli-common/pom.xml
+++ b/modules/cli-common/pom.xml
@@ -25,20 +25,8 @@
<groupId>org.apache.ignite</groupId>
<artifactId>apache-ignite</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
</parent>
<artifactId>ignite-cli-common</artifactId>
- <!-- Must be changed together with ignite-runner module version fix -->
- <version>3.0-SNAPSHOT</version>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/modules/cli/pom.xml b/modules/cli/pom.xml
index ad090db..3d178d0 100644
--- a/modules/cli/pom.xml
+++ b/modules/cli/pom.xml
@@ -27,11 +27,10 @@
<groupId>org.apache.ignite</groupId>
<artifactId>apache-ignite</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
</parent>
<artifactId>ignite-cli</artifactId>
- <!-- Must be changed together with ignite-runner module version fix -->
- <version>3.0-SNAPSHOT</version>
<properties>
<micronaut.version>2.1.2</micronaut.version>
diff --git a/modules/configuration-annotation-processor/pom.xml b/modules/configuration-annotation-processor/pom.xml
index 98758a8..0d2c30f 100644
--- a/modules/configuration-annotation-processor/pom.xml
+++ b/modules/configuration-annotation-processor/pom.xml
@@ -24,10 +24,14 @@
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>
- <groupId>org.apache.ignite</groupId>
+ <parent>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>apache-ignite</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+
<artifactId>ignite-configuration-annotation-processor</artifactId>
- <version>3.0-SNAPSHOT</version>
- <url>http://ignite.apache.org</url>
<dependencies>
<dependency>
@@ -83,12 +87,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
- <configuration>
- <!-- disable processing because the definition in META-INF/services breaks javac -->
-<!-- <compilerArgument>-proc:none</compilerArgument>-->
- <source>8</source>
- <target>8</target>
- </configuration>
<executions>
<execution>
<id>default-compile</id>
diff --git a/modules/configuration/pom.xml b/modules/configuration/pom.xml
index 7eaa507..65af22f 100644
--- a/modules/configuration/pom.xml
+++ b/modules/configuration/pom.xml
@@ -24,15 +24,14 @@
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>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-configuration</artifactId>
- <version>3.0-SNAPSHOT</version>
- <url>http://ignite.apache.org</url>
+ <parent>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>apache-ignite</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
- <properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- </properties>
+ <artifactId>ignite-configuration</artifactId>
<dependencies>
<dependency>
@@ -55,15 +54,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/modules/ignite-runner/pom.xml b/modules/ignite-runner/pom.xml
index b357f90..69ff56a 100644
--- a/modules/ignite-runner/pom.xml
+++ b/modules/ignite-runner/pom.xml
@@ -24,15 +24,14 @@
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>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-runner</artifactId>
- <version>3.0-SNAPSHOT</version>
- <url>http://ignite.apache.org</url>
+ <parent>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>apache-ignite</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
- <properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- </properties>
+ <artifactId>ignite-runner</artifactId>
<dependencies>
<dependency>
@@ -74,13 +73,5 @@
<filtering>true</filtering>
</resource>
</resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- </plugin>
- </plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 557eb44..4a2f835 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,4 +44,27 @@
<module>modules/cli-common</module>
<module>modules/cli</module>
</modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</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>
+ </plugins>
+ </build>
</project>