You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sk...@apache.org on 2021/07/19 12:34:37 UTC
[ignite-3] branch main updated: IGNITE-15137 Fixed javadoc phase
for ignite-cli module. Fixes #222
This is an automated email from the ASF dual-hosted git repository.
sk0x50 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 8167d63 IGNITE-15137 Fixed javadoc phase for ignite-cli module. Fixes #222
8167d63 is described below
commit 8167d63055d282d5801856630f31aa63e5eb4157
Author: Semyon Danilov <sa...@yandex.ru>
AuthorDate: Mon Jul 19 15:34:05 2021 +0300
IGNITE-15137 Fixed javadoc phase for ignite-cli module. Fixes #222
Signed-off-by: Slava Koptilin <sl...@gmail.com>
---
modules/cli/pom.xml | 37 ++++++++++++++++++++-----------------
parent/pom.xml | 7 +++++++
pom.xml | 11 +++++++++++
3 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/modules/cli/pom.xml b/modules/cli/pom.xml
index 13fdf61..82ad111 100644
--- a/modules/cli/pom.xml
+++ b/modules/cli/pom.xml
@@ -126,28 +126,31 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
-
- <configuration>
- <finalName>ignite</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- <archive>
- <manifest>
- <mainClass>org.apache.ignite.cli.IgniteCliApp</mainClass>
- </manifest>
- </archive>
- </configuration>
-
+ <artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <id>make-assembly</id>
<phase>package</phase>
<goals>
- <goal>single</goal>
+ <goal>shade</goal>
</goals>
+ <configuration>
+ <finalName>ignite</finalName>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <manifestEntries>
+ <Main-Class>org.apache.ignite.cli.IgniteCliApp</Main-Class>
+ </manifestEntries>
+ </transformer>
+ </transformers>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>module-info.class</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
</execution>
</executions>
</plugin>
diff --git a/parent/pom.xml b/parent/pom.xml
index d59ecdf..1b3fecb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -104,6 +104,7 @@
<maven.fmpp.plugin.version>1.0</maven.fmpp.plugin.version>
<maven.javadoc.plugin.version>3.2.0</maven.javadoc.plugin.version>
<maven.pmd.plugin.version>3.14.0</maven.pmd.plugin.version>
+ <maven.shade.plugin.version>3.2.4</maven.shade.plugin.version>
<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
<maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
</properties>
@@ -759,6 +760,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>${maven.shade.plugin.version}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven.antrun.plugin.version}</version>
</plugin>
diff --git a/pom.xml b/pom.xml
index 6b82b3e..88c77be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,6 +87,17 @@
</execution>
</executions>
</plugin>
+
+ <!--
+ Reset sourcepath configuration from parent for fixing javadoc:aggregate
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <sourcepath combine.self="override"></sourcepath>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>