You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by al...@apache.org on 2021/02/05 06:21:43 UTC
[ignite] branch master updated: IGNITE-13623 Fix ScalaDoc creation
during release process - Fixes #8735.
This is an automated email from the ASF dual-hosted git repository.
alexpl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 5f4301e IGNITE-13623 Fix ScalaDoc creation during release process - Fixes #8735.
5f4301e is described below
commit 5f4301eb95915be9c5f9b1bf262987384219acea
Author: Maksim Timonin <ti...@gmail.com>
AuthorDate: Fri Feb 5 09:03:57 2021 +0300
IGNITE-13623 Fix ScalaDoc creation during release process - Fixes #8735.
Signed-off-by: Aleksey Plekhanov <pl...@gmail.com>
---
modules/scalar/pom.xml | 45 ++++++++++++++++++++-----------------------
modules/visor-console/pom.xml | 2 ++
parent/pom.xml | 6 ++++++
pom.xml | 2 +-
4 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 906ad03..6e9864a 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -99,11 +99,6 @@
</plugin>
<plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
@@ -111,6 +106,26 @@
<skip>false</skip>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>scaladoc</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>doc</goal>
+ <goal>doc-jar</goal>
+ </goals>
+ <configuration>
+ <doctitle>Ignite Scalar</doctitle>
+ <windowtitle>Ignite Scalar</windowtitle>
+ <skip>${maven.javadoc.skip}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -120,24 +135,6 @@
<build>
<plugins>
<plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>scaladoc</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>doc</goal>
- </goals>
- <configuration>
- <doctitle>Ignite Scalar</doctitle>
- <windowtitle>Ignite Scalar</windowtitle>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
@@ -154,7 +151,7 @@
<goals>
<goal>run</goal>
</goals>
- <phase>prepare-package</phase>
+ <phase>initialize</phase>
<configuration>
<target>
<copy todir="target/site/scaladocs">
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index 9e8ba87..afed120 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -131,10 +131,12 @@
<phase>prepare-package</phase>
<goals>
<goal>doc</goal>
+ <goal>doc-jar</goal>
</goals>
<configuration>
<doctitle>Ignite Console Visor</doctitle>
<windowtitle>Ignite Console Visor</windowtitle>
+ <skip>${maven.javadoc.skip}</skip>
</configuration>
</execution>
</executions>
diff --git a/parent/pom.xml b/parent/pom.xml
index f965732..bbbb0f5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1292,5 +1292,11 @@
</pluginManagement>
</build>
</profile>
+ <profile>
+ <id>skip-docs</id>
+ <properties>
+ <maven.javadoc.skip>true</maven.javadoc.skip>
+ </properties>
+ </profile>
</profiles>
</project>
diff --git a/pom.xml b/pom.xml
index 33c0e05..e75a29f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,7 +192,7 @@
<execution>
<id>core-javadoc</id>
<goals>
- <goal>aggregate</goal>
+ <goal>aggregate-no-fork</goal>
</goals>
<phase>validate</phase>
<configuration>