You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ah...@apache.org on 2019/11/14 13:13:43 UTC
[commons-rng] branch master updated (c224dac -> 88eb56d)
This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-rng.git.
from c224dac Doxia is not rendering <code> tag. Switch to <kbd>.
new 47c16f2 Update the svn site checkout to use regex for modules.
new c353c66 Update MathJax URL.
new 848189a Update to 1.4-SNAPSHOT in dist-archive.
new d16824b Updated to create empty site-content directories for child modules.
new 88eb56d Customise jira report.
The 5 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:
commons-rng-client-api/pom.xml | 1 +
commons-rng-core/pom.xml | 1 +
commons-rng-examples/pom.xml | 1 +
commons-rng-sampling/pom.xml | 1 +
commons-rng-simple/pom.xml | 1 +
dist-archive/pom.xml | 68 +++++++++++++++----------------
doc/release/release.howto.txt | 4 +-
pom.xml | 91 ++++++++++++++++--------------------------
src/site/site.xml | 2 +-
9 files changed, 77 insertions(+), 93 deletions(-)
[commons-rng] 05/05: Customise jira report.
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-rng.git
commit 88eb56dd7dd433f940c90721b12ee9b0e198461a
Author: aherbert <ah...@apache.org>
AuthorDate: Thu Nov 14 13:13:38 2019 +0000
Customise jira report.
Removed duplicate configuration from commons-parent.
Jira report for modules to only include those tickets using the
component tag.
---
commons-rng-client-api/pom.xml | 1 +
commons-rng-core/pom.xml | 1 +
commons-rng-examples/pom.xml | 1 +
commons-rng-sampling/pom.xml | 1 +
commons-rng-simple/pom.xml | 1 +
pom.xml | 21 ++++-----------------
6 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/commons-rng-client-api/pom.xml b/commons-rng-client-api/pom.xml
index 3aa3ebe..83cd518 100644
--- a/commons-rng-client-api/pom.xml
+++ b/commons-rng-client-api/pom.xml
@@ -40,6 +40,7 @@
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/..</rng.parent.dir>
<commons.release.isDistModule>false</commons.release.isDistModule>
+ <rng.jira.component>client-api</rng.jira.component>
</properties>
<profiles>
diff --git a/commons-rng-core/pom.xml b/commons-rng-core/pom.xml
index cd1d720..a568811 100644
--- a/commons-rng-core/pom.xml
+++ b/commons-rng-core/pom.xml
@@ -43,6 +43,7 @@
<commons.automatic.module.name>org.apache.commons.rng.core</commons.automatic.module.name>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/..</rng.parent.dir>
+ <rng.jira.component>core</rng.jira.component>
</properties>
<dependencies>
diff --git a/commons-rng-examples/pom.xml b/commons-rng-examples/pom.xml
index ca25553..28a280a 100644
--- a/commons-rng-examples/pom.xml
+++ b/commons-rng-examples/pom.xml
@@ -52,6 +52,7 @@
<!-- Disable JApiCmp failures (but keep the report). The examples API is allowed to change. -->
<commons.japicmp.breakBuildOnBinaryIncompatibleModifications>false</commons.japicmp.breakBuildOnBinaryIncompatibleModifications>
<commons.japicmp.breakBuildOnSourceIncompatibleModifications>false</commons.japicmp.breakBuildOnSourceIncompatibleModifications>
+ <rng.jira.component>examples</rng.jira.component>
</properties>
<dependencyManagement>
diff --git a/commons-rng-sampling/pom.xml b/commons-rng-sampling/pom.xml
index 90538c5..495045f 100644
--- a/commons-rng-sampling/pom.xml
+++ b/commons-rng-sampling/pom.xml
@@ -40,6 +40,7 @@
<commons.automatic.module.name>org.apache.commons.rng.sampling</commons.automatic.module.name>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/..</rng.parent.dir>
+ <rng.jira.component>sampling</rng.jira.component>
</properties>
<dependencies>
diff --git a/commons-rng-simple/pom.xml b/commons-rng-simple/pom.xml
index 71cbc5f..14134eb 100644
--- a/commons-rng-simple/pom.xml
+++ b/commons-rng-simple/pom.xml
@@ -40,6 +40,7 @@
<commons.automatic.module.name>org.apache.commons.rng.simple</commons.automatic.module.name>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/..</rng.parent.dir>
+ <rng.jira.component>simple</rng.jira.component>
</properties>
<dependencies>
diff --git a/pom.xml b/pom.xml
index 8d8f8b6..02f4788 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,6 +98,9 @@
<!-- Workaround to avoid the SVN site checkout in all modules.
This flag should be deactivated by child modules. -->
<perform.site.checkout>true</perform.site.checkout>
+
+ <!-- Set by modules to create a custom jira report -->
+ <rng.jira.component></rng.jira.component>
</properties>
<modules>
@@ -298,28 +301,12 @@
<artifactId>maven-changes-plugin</artifactId>
<version>${commons.changes.version}</version>
<configuration>
- <xmlPath>${basedir}/src/changes/changes.xml</xmlPath>
- <columnNames>Fix Version,Key,Component,Summary,Type,Resolution,Status</columnNames>
- <!-- Sort cols in natural order when using JQL for JIRA 5.1 -->
- <sortColumnNames>Fix Version DESC,Type,Key DESC</sortColumnNames>
<resolutionIds>Fixed,Implemented</resolutionIds>
<statusIds>Resolved,Closed</statusIds>
<!-- Don't include sub-task -->
<typeIds>Bug,New Feature,Task,Improvement,Wish,Test</typeIds>
- <!-- For JIRA >= 5.1 -->
- <useJql>true</useJql>
- <onlyCurrentVersion>${commons.changes.onlyCurrentVersion}</onlyCurrentVersion>
- <maxEntries>${commons.changes.maxEntries}</maxEntries>
- <runOnlyAtExecutionRoot>${commons.changes.runOnlyAtExecutionRoot}</runOnlyAtExecutionRoot>
+ <component>${rng.jira.component}</component>
</configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- <report>jira-report</report>
- </reports>
- </reportSet>
- </reportSets>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
[commons-rng] 03/05: Update to 1.4-SNAPSHOT in dist-archive.
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-rng.git
commit 848189a8bd0a577774ec0944f92543cd77eba33c
Author: aherbert <ah...@apache.org>
AuthorDate: Thu Nov 14 11:43:57 2019 +0000
Update to 1.4-SNAPSHOT in dist-archive.
Fix command in release howto to update the versions.
---
dist-archive/pom.xml | 68 +++++++++++++++++++++----------------------
doc/release/release.howto.txt | 4 ++-
2 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/dist-archive/pom.xml b/dist-archive/pom.xml
index 1dd9ccb..90a6604 100644
--- a/dist-archive/pom.xml
+++ b/dist-archive/pom.xml
@@ -17,20 +17,18 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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>
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-parent</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Commons RNG (full distribution)</name>
<description>This module creates the Apache Commons RNG distribution.</description>
@@ -70,18 +68,18 @@ under the License.
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-client-api</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-client-api</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-client-api</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>javadoc</classifier>
</dependency>
@@ -89,18 +87,18 @@ under the License.
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>javadoc</classifier>
</dependency>
@@ -108,18 +106,18 @@ under the License.
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-simple</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-simple</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-simple</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>javadoc</classifier>
</dependency>
@@ -127,18 +125,18 @@ under the License.
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-sampling</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-sampling</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-sampling</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>javadoc</classifier>
</dependency>
@@ -146,18 +144,18 @@ under the License.
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-examples-jmh</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-examples-jmh</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-examples-jmh</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>javadoc</classifier>
</dependency>
@@ -165,35 +163,35 @@ under the License.
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-examples-jpms-app</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-examples-jpms-app</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-examples-jpms-app</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-examples-jpms-lib</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-examples-jpms-lib</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-examples-jpms-lib</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>javadoc</classifier>
</dependency>
@@ -201,18 +199,18 @@ under the License.
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-examples-quadrature</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-examples-quadrature</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-examples-quadrature</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>javadoc</classifier>
</dependency>
@@ -220,18 +218,18 @@ under the License.
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-examples-sampling</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-examples-sampling</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-examples-sampling</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>javadoc</classifier>
</dependency>
@@ -239,18 +237,18 @@ under the License.
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-examples-stress</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-examples-stress</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rng-examples-stress</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<classifier>javadoc</classifier>
</dependency>
diff --git a/doc/release/release.howto.txt b/doc/release/release.howto.txt
index 76c5906..67f4176 100644
--- a/doc/release/release.howto.txt
+++ b/doc/release/release.howto.txt
@@ -786,9 +786,11 @@ next version will be 1.4).
This can be done using maven:
- $ mvn release:update-versions -DautoVersionSubmodules=true -Pcommons-rng-examples
+ $ mvn release:update-versions -DautoVersionSubmodules=true -Prelease
You will only be prompted for the desired version number once.
+ This will miss the dist-archive/pom.xml for all the dependencies.
+ These should be updated manually.
Double-check that the "pom.xml" files *really* have a "-SNAPSHOT" suffix
in the "<version>" property.
Then commit them.
[commons-rng] 01/05: Update the svn site checkout to use regex for
modules.
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-rng.git
commit 47c16f23652dfa903bcb98941aea16d491ba3641
Author: aherbert <ah...@apache.org>
AuthorDate: Wed Nov 13 17:20:48 2019 +0000
Update the svn site checkout to use regex for modules.
---
pom.xml | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4365fca..a9ae526 100644
--- a/pom.xml
+++ b/pom.xml
@@ -490,28 +490,30 @@
<arg line="checkout --depth immediates ${commons.scmPubUrl}/commons-rng-examples ${commons.scmPubCheckoutDirectory}/commons-rng-examples" />
</exec>
- <!-- Do not download the archived javadocs. This will delete the 'javadocs' directory. -->
<pathconvert pathsep=" " property="javadocsDirs">
- <dirset dir="${commons.scmPubCheckoutDirectory}" includes="commons-rng-*/javadocs" />
+ <dirset dir="${commons.scmPubCheckoutDirectory}" includes="commons-${commons.componentid}-*/javadocs" />
+ </pathconvert>
+ <pathconvert pathsep=" " property="nonModuleDirs">
+ <dirset dir="${commons.scmPubCheckoutDirectory}" includes="*" excludes="commons-${commons.componentid}-*" />
</pathconvert>
+
+ <!-- Do not download the archived javadocs. This will delete the 'javadocs' directory. -->
<exec executable="svn">
<arg line="update --set-depth exclude ${javadocsDirs}" />
</exec>
- <!-- Update the modules without the javadocs. -->
- <pathconvert pathsep=" " property="modulesDirs">
- <dirset dir="${commons.scmPubCheckoutDirectory}" includes="commons-rng-client-api/*,commons-rng-core/*,commons-rng-simple/*,commons-rng-sampling/*,commons-rng-examples/*" />
+ <pathconvert pathsep=" " property="modulesDirsNoJavadocs">
+ <dirset dir="${commons.scmPubCheckoutDirectory}" includes="commons-${commons.componentid}-*/*" />
</pathconvert>
+
+ <!-- Update the modules without the javadocs. -->
<exec executable="svn">
- <arg line="update --set-depth infinity ${modulesDirs}" />
+ <arg line="update --set-depth infinity ${modulesDirsNoJavadocs}" />
</exec>
<!-- Update the remaining non-module directories -->
- <pathconvert pathsep=" " property="dirs">
- <dirset dir="${commons.scmPubCheckoutDirectory}" includes="*" excludes="commons-rng-client-api,commons-rng-core,commons-rng-simple,commons-rng-sampling,commons-rng-examples" />
- </pathconvert>
<exec executable="svn">
- <arg line="update --set-depth infinity ${dirs}" />
+ <arg line="update --set-depth infinity ${nonModuleDirs}" />
</exec>
</target>
</configuration>
[commons-rng] 02/05: Update MathJax URL.
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-rng.git
commit c353c66bc81f8e7d55eb59b54cfeda46299069e6
Author: aherbert <ah...@apache.org>
AuthorDate: Thu Nov 14 10:18:40 2019 +0000
Update MathJax URL.
---
pom.xml | 6 +++---
src/site/site.xml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index a9ae526..4292a12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
<rng.pmd.dep.version>6.14.0</rng.pmd.dep.version>
<rng.checkstyle.version>3.0.0</rng.checkstyle.version>
<rng.checkstyle.dep.version>8.20</rng.checkstyle.dep.version>
- <rng.mathjax.version>2.7.2</rng.mathjax.version>
+ <rng.mathjax.url>https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js</rng.mathjax.url>
<rng.antrun.version>1.8</rng.antrun.version>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}</rng.parent.dir>
@@ -253,7 +253,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- Enable MathJax -->
- <additionalOptions>${doclint.javadoc.qualifier} ${allowscript.javadoc.qualifier} -header '<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/${rng.mathjax.version}/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>'</additionalOptions>
+ <additionalOptions>${doclint.javadoc.qualifier} ${allowscript.javadoc.qualifier} -header '<script type="text/javascript" async src="${rng.mathjax.url}"></script>'</additionalOptions>
</configuration>
</plugin>
<plugin>
@@ -354,7 +354,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- Enable MathJax -->
- <additionalOptions>${doclint.javadoc.qualifier} ${allowscript.javadoc.qualifier} -header '<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/${rng.mathjax.version}/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>'</additionalOptions>
+ <additionalOptions>${doclint.javadoc.qualifier} ${allowscript.javadoc.qualifier} -header '<script type="text/javascript" async src="${rng.mathjax.url}"></script>'</additionalOptions>
</configuration>
</plugin>
<plugin>
diff --git a/src/site/site.xml b/src/site/site.xml
index dbc031a..b69aba8 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -28,7 +28,7 @@
<body>
<head>
- <![CDATA[<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+ <![CDATA[<script type="text/javascript" id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js">
</script>]]>
</head>
[commons-rng] 04/05: Updated to create empty site-content
directories for child modules.
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-rng.git
commit d16824b62648b16330d5b9c0ee4c4283e41c96cd
Author: aherbert <ah...@apache.org>
AuthorDate: Thu Nov 14 12:03:25 2019 +0000
Updated to create empty site-content directories for child modules.
A svn checkout of the site is only performed in the parent directory.
---
pom.xml | 42 ++++++++++++++++--------------------------
1 file changed, 16 insertions(+), 26 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4292a12..8d8f8b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,10 @@
<allowscript.javadoc.qualifier />
<!-- Invalid flag for old javadoc versions (default to empty). -->
<doclint.javadoc.qualifier />
+
+ <!-- Workaround to avoid the SVN site checkout in all modules.
+ This flag should be deactivated by child modules. -->
+ <perform.site.checkout>true</perform.site.checkout>
</properties>
<modules>
@@ -401,34 +405,21 @@
</build>
</profile>
<profile>
- <!--
- Sets a property if the SVN site checkout can copy from the parent directory.
-
- Note: The Maven reactor configures all the profiles for the child modules at start-up.
- Thus the parent must have the site-content folder created first for the copy to work:
-
- # Optional: Remove the site-content directories
- mvn clean -Pclean-checkout
-
- # Checkout the parent site-content directory
- mvn -N pre-site
-
- # Copy the site-content for all child modules
- mvn pre-site
- -->
- <id>can-copy-checkout</id>
+ <!-- Override a parent property if the SVN site checkout should not be performed.
+ This should activate for child modules. -->
+ <id>is-child-module</id>
<activation>
<file>
- <exists>${basedir}/../${commons.scmPubCheckoutDirectory}</exists>
+ <missing>${basedir}/CONTRIBUTING.md</missing>
</file>
</activation>
<properties>
- <copy.parent.scmPubCheckoutDirectory>true</copy.parent.scmPubCheckoutDirectory>
+ <perform.site.checkout>false</perform.site.checkout>
</properties>
</profile>
<profile>
<!-- Runs if the SVN site checkout does not exist.
- This is either copied from the parent directory or obtained using svn. -->
+ This is either obtained using svn (for the parent) or an empty directory is created. -->
<id>setup-checkout</id>
<activation>
<file>
@@ -442,18 +433,17 @@
<artifactId>maven-antrun-plugin</artifactId>
<version>${rng.antrun.version}</version>
<executions>
+ <!-- For multi-module builds, only the parent directory requires a site checkout.
+ This task will create an empty directory as the site checkout is missing. -->
<execution>
- <id>copy-parent-checkout</id>
+ <id>empty-checkout</id>
<phase>pre-site</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
- <!-- For multi-module builds, copy the checkout from the parent. -->
- <target name="copy-parent-checkout" if="${copy.parent.scmPubCheckoutDirectory}">
- <copy todir="${commons.scmPubCheckoutDirectory}">
- <fileset dir="../${commons.scmPubCheckoutDirectory}" includes="**" defaultexcludes="no" />
- </copy>
+ <target name="empty-checkout" unless="${perform.site.checkout}">
+ <mkdir dir="${commons.scmPubCheckoutDirectory}"/>
</target>
</configuration>
</execution>
@@ -467,7 +457,7 @@
<goal>run</goal>
</goals>
<configuration>
- <target name="prepare-checkout" unless="${copy.parent.scmPubCheckoutDirectory}">
+ <target name="prepare-checkout" if="${perform.site.checkout}">
<!-- Top level directory -->
<exec executable="svn">
<arg line="checkout --depth immediates ${commons.scmPubUrl} ${commons.scmPubCheckoutDirectory}" />