This is an automated email from the ASF dual-hosted git repository. ipavlukhin 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 d225980 IGNITE-11933 Build scalar scaladoc only if javadoc profile is active - Fixes #6617. d225980 is described below commit d225980e99f6f5b0d7244ffcec861587ab2d314b Author: pavlukhin <vololo...@gmail.com> AuthorDate: Wed Jun 19 11:51:17 2019 +0300 IGNITE-11933 Build scalar scaladoc only if javadoc profile is active - Fixes #6617. Signed-off-by: ipavlukhin <vololo...@gmail.com> --- modules/scalar/pom.xml | 214 ++++++++++++++++++++++++++----------------------- 1 file changed, 113 insertions(+), 101 deletions(-) diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml index e0056a1..06d4cf4 100644 --- a/modules/scalar/pom.xml +++ b/modules/scalar/pom.xml @@ -85,112 +85,124 @@ <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> - <dependencies> - <dependency> - <groupId>org.apache.ignite</groupId> - <artifactId>ignite-tools</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>scaladoc-postprocessing</id> - <goals> - <goal>run</goal> - </goals> - <phase>prepare-package</phase> - <configuration> - <target> - <copy todir="target/site/scaladocs"> - <fileset dir="../../assembly/docfiles"> - <include name="img/**" /> - <include name="*.js" /> - </fileset> - </copy> - - <taskdef name="doctask" classname="org.apache.ignite.tools.ant.beautifier.GridJavadocAntTask" /> - - <doctask css="dotted" dir="target/site/scaladocs" verify="false"> - <include name="**/*.html" /> - </doctask> - - <property name="footer"> - <![CDATA[ - <table style="padding: 0px 10px 10px 10px; width: 100%" border="0"> - <tr> - <td> - <nobr>Ignite™ - Scalar DSL, ver. <strong>${project.version}</strong></nobr> - <br> - <a target=_blank href="https://ignite.apache.org"><nobr>2019 Copyright © Apache Software Foundation</nobr></a> - </td> - </tr> - </table> - ]]> - </property> - - <replace dir="target/site/scaladocs" token="<!--FOOTER-->" value="${footer}"> - <include name="**/*.html" /> - </replace> - - <replace dir="target/site/scaladocs"> - <replacetoken>src="package.html"</replacetoken> - <replacevalue>src=org/apache/ignite/scalar/scalar$.html</replacevalue> - <include name="**/index.html" /> - </replace> - - <replace dir="target/site/scaladocs"> - <replacetoken>location.replace("package.html")</replacetoken> - <replacevalue>location.replace("org/apache/ignite/scalar/scalar$.html")</replacevalue> - <include name="**/index.js" /> - </replace> - - <replace dir="target/site/scaladocs"> - <replacetoken>docs.scala-lang.org/overviews/scaladoc/usage.html#members</replacetoken> - <replacevalue>docs.scala-lang.org/overviews/scaladoc/interface.html</replacevalue> - <fileset dir="target/site/scaladocs" /> - </replace> - - <replaceregexp byline="true" flags="im" encoding="UTF-8"> - <regexp pattern="(<dt>Attributes</dt><dd>protected\[)<a.+>(.+)</a>(\]\s+</dd>)" /> - <substitution expression="\1\2\3" /> - <fileset dir="target/site/scaladocs" /> - </replaceregexp> - - <zip destfile="target/ignite-scalar-${project.version}-javadoc.jar" basedir="target/site/scaladocs" encoding="UTF-8" /> - </target> - </configuration> - </execution> - </executions> - </plugin> - <!-- Generate the OSGi MANIFEST.MF for this bundle. --> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> </plugin> - + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> + </plugin> </plugins> </build> + + <profiles> + <profile> + <id>javadoc</id> + <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> + <dependencies> + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-tools</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>scaladoc-postprocessing</id> + <goals> + <goal>run</goal> + </goals> + <phase>prepare-package</phase> + <configuration> + <target> + <copy todir="target/site/scaladocs"> + <fileset dir="../../assembly/docfiles"> + <include name="img/**" /> + <include name="*.js" /> + </fileset> + </copy> + + <taskdef name="doctask" classname="org.apache.ignite.tools.ant.beautifier.GridJavadocAntTask" /> + + <doctask css="dotted" dir="target/site/scaladocs" verify="false"> + <include name="**/*.html" /> + </doctask> + + <property name="footer"> + <![CDATA[ + <table style="padding: 0px 10px 10px 10px; width: 100%" border="0"> + <tr> + <td> + <nobr>Ignite™ - Scalar DSL, ver. <strong>${project.version}</strong></nobr> + <br> + <a target=_blank href="https://ignite.apache.org"><nobr>2019 Copyright © Apache Software Foundation</nobr></a> + </td> + </tr> + </table> + ]]> + </property> + + <replace dir="target/site/scaladocs" token="<!--FOOTER-->" value="${footer}"> + <include name="**/*.html" /> + </replace> + + <replace dir="target/site/scaladocs"> + <replacetoken>src="package.html"</replacetoken> + <replacevalue>src=org/apache/ignite/scalar/scalar$.html</replacevalue> + <include name="**/index.html" /> + </replace> + + <replace dir="target/site/scaladocs"> + <replacetoken>location.replace("package.html")</replacetoken> + <replacevalue>location.replace("org/apache/ignite/scalar/scalar$.html")</replacevalue> + <include name="**/index.js" /> + </replace> + + <replace dir="target/site/scaladocs"> + <replacetoken>docs.scala-lang.org/overviews/scaladoc/usage.html#members</replacetoken> + <replacevalue>docs.scala-lang.org/overviews/scaladoc/interface.html</replacevalue> + <fileset dir="target/site/scaladocs" /> + </replace> + + <replaceregexp byline="true" flags="im" encoding="UTF-8"> + <regexp pattern="(<dt>Attributes</dt><dd>protected\[)<a.+>(.+)</a>(\]\s+</dd>)" /> + <substitution expression="\1\2\3" /> + <fileset dir="target/site/scaladocs" /> + </replaceregexp> + + <zip destfile="target/ignite-scalar-${project.version}-javadoc.jar" basedir="target/site/scaladocs" encoding="UTF-8" /> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project>