This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-parent.git
The following commit(s) were added to refs/heads/master by this push:
new 32947fa Align javadoc version with java override profile
32947fa is described below
commit 32947fa8749916ccd6d4b04e36b84653c0f298b3
Author: Sebb <[email protected]>
AuthorDate: Sat Jul 18 11:45:30 2020 +0100
Align javadoc version with java override profile
---
pom.xml | 15 +++++++++++++++
src/changes/changes.xml | 1 +
2 files changed, 16 insertions(+)
diff --git a/pom.xml b/pom.xml
index c6ce5ce..53152f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,6 +111,7 @@
<commons.compiler.fork>false</commons.compiler.fork>
<commons.compiler.compilerVersion />
<commons.compiler.javac />
+ <commons.compiler.javadoc />
<!-- plugin versions (allows same value in reporting and build sections;
also allows easy override) -->
<commons.animal-sniffer.version>1.18</commons.animal-sniffer.version>
@@ -487,6 +488,7 @@
<!-- keep only errors and warnings -->
<quiet>true</quiet>
<source>${maven.compiler.source}</source>
+ <javadocExecutable>${commons.compiler.javadoc}</javadocExecutable>
<encoding>${commons.encoding}</encoding>
<docencoding>${commons.docEncoding}</docencoding>
<notimestamp>true</notimestamp>
@@ -1018,6 +1020,7 @@
<!-- keep only errors and warnings -->
<quiet>true</quiet>
<source>${maven.compiler.source}</source>
+ <javadocExecutable>${commons.compiler.javadoc}</javadocExecutable>
<encoding>${commons.encoding}</encoding>
<docencoding>${commons.docEncoding}</docencoding>
<notimestamp>true</notimestamp>
@@ -1467,6 +1470,7 @@
</executions>
<configuration>
<source>${maven.compiler.source}</source>
+
<javadocExecutable>${commons.compiler.javadoc}</javadocExecutable>
</configuration>
</plugin>
<plugin>
@@ -1585,6 +1589,7 @@
<commons.compiler.fork>true</commons.compiler.fork>
<commons.compiler.compilerVersion>1.3</commons.compiler.compilerVersion>
<commons.compiler.javac>${JAVA_1_3_HOME}/bin/javac</commons.compiler.javac>
+
<commons.compiler.javadoc>${JAVA_1_3_HOME}/bin/javadoc</commons.compiler.javadoc>
<commons.surefire.java>${JAVA_1_3_HOME}/bin/java</commons.surefire.java>
</properties>
</profile>
@@ -1599,6 +1604,7 @@
<commons.compiler.fork>true</commons.compiler.fork>
<commons.compiler.compilerVersion>1.4</commons.compiler.compilerVersion>
<commons.compiler.javac>${JAVA_1_4_HOME}/bin/javac</commons.compiler.javac>
+
<commons.compiler.javadoc>${JAVA_1_4_HOME}/bin/javadoc</commons.compiler.javadoc>
<commons.surefire.java>${JAVA_1_4_HOME}/bin/java</commons.surefire.java>
<!-- later versions of surefire don't support Java 1.4 -->
<commons.surefire.version>2.11</commons.surefire.version>
@@ -1615,6 +1621,7 @@
<commons.compiler.fork>true</commons.compiler.fork>
<commons.compiler.compilerVersion>1.5</commons.compiler.compilerVersion>
<commons.compiler.javac>${JAVA_1_5_HOME}/bin/javac</commons.compiler.javac>
+
<commons.compiler.javadoc>${JAVA_1_5_HOME}/bin/javadoc</commons.compiler.javadoc>
<commons.surefire.java>${JAVA_1_5_HOME}/bin/java</commons.surefire.java>
</properties>
</profile>
@@ -1629,6 +1636,7 @@
<commons.compiler.fork>true</commons.compiler.fork>
<commons.compiler.compilerVersion>1.6</commons.compiler.compilerVersion>
<commons.compiler.javac>${JAVA_1_6_HOME}/bin/javac</commons.compiler.javac>
+
<commons.compiler.javadoc>${JAVA_1_6_HOME}/bin/javadoc</commons.compiler.javadoc>
<commons.surefire.java>${JAVA_1_6_HOME}/bin/java</commons.surefire.java>
</properties>
</profile>
@@ -1643,6 +1651,7 @@
<commons.compiler.fork>true</commons.compiler.fork>
<commons.compiler.compilerVersion>1.7</commons.compiler.compilerVersion>
<commons.compiler.javac>${JAVA_1_7_HOME}/bin/javac</commons.compiler.javac>
+
<commons.compiler.javadoc>${JAVA_1_7_HOME}/bin/javadoc</commons.compiler.javadoc>
<commons.surefire.java>${JAVA_1_7_HOME}/bin/java</commons.surefire.java>
</properties>
</profile>
@@ -1657,6 +1666,7 @@
<commons.compiler.fork>true</commons.compiler.fork>
<commons.compiler.compilerVersion>1.8</commons.compiler.compilerVersion>
<commons.compiler.javac>${JAVA_1_8_HOME}/bin/javac</commons.compiler.javac>
+
<commons.compiler.javadoc>${JAVA_1_8_HOME}/bin/javadoc</commons.compiler.javadoc>
<commons.surefire.java>${JAVA_1_8_HOME}/bin/java</commons.surefire.java>
</properties>
</profile>
@@ -1671,6 +1681,7 @@
<commons.compiler.fork>true</commons.compiler.fork>
<commons.compiler.compilerVersion>1.9</commons.compiler.compilerVersion>
<commons.compiler.javac>${JAVA_1_9_HOME}/bin/javac</commons.compiler.javac>
+
<commons.compiler.javadoc>${JAVA_1_9_HOME}/bin/javadoc</commons.compiler.javadoc>
<commons.surefire.java>${JAVA_1_9_HOME}/bin/java</commons.surefire.java>
</properties>
</profile>
@@ -1685,6 +1696,7 @@
<commons.compiler.fork>true</commons.compiler.fork>
<commons.compiler.compilerVersion>1.10</commons.compiler.compilerVersion>
<commons.compiler.javac>${JAVA_1_10_HOME}/bin/javac</commons.compiler.javac>
+
<commons.compiler.javadoc>${JAVA_1_10_HOME}/bin/javadoc</commons.compiler.javadoc>
<commons.surefire.java>${JAVA_1_10_HOME}/bin/java</commons.surefire.java>
</properties>
</profile>
@@ -1699,6 +1711,7 @@
<commons.compiler.fork>true</commons.compiler.fork>
<commons.compiler.compilerVersion>1.11</commons.compiler.compilerVersion>
<commons.compiler.javac>${JAVA_1_11_HOME}/bin/javac</commons.compiler.javac>
+
<commons.compiler.javadoc>${JAVA_1_11_HOME}/bin/javadoc</commons.compiler.javadoc>
<commons.surefire.java>${JAVA_1_11_HOME}/bin/java</commons.surefire.java>
</properties>
</profile>
@@ -1713,6 +1726,7 @@
<commons.compiler.fork>true</commons.compiler.fork>
<commons.compiler.compilerVersion>1.12</commons.compiler.compilerVersion>
<commons.compiler.javac>${JAVA_1_12_HOME}/bin/javac</commons.compiler.javac>
+
<commons.compiler.javadoc>${JAVA_1_12_HOME}/bin/javadoc</commons.compiler.javadoc>
<commons.surefire.java>${JAVA_1_12_HOME}/bin/java</commons.surefire.java>
</properties>
</profile>
@@ -1727,6 +1741,7 @@
<commons.compiler.fork>true</commons.compiler.fork>
<commons.compiler.compilerVersion>1.13</commons.compiler.compilerVersion>
<commons.compiler.javac>${JAVA_1_13_HOME}/bin/javac</commons.compiler.javac>
+
<commons.compiler.javadoc>${JAVA_1_13_HOME}/bin/javadoc</commons.compiler.javadoc>
<commons.surefire.java>${JAVA_1_13_HOME}/bin/java</commons.surefire.java>
</properties>
</profile>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a8c29fb..4fafe70 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -63,6 +63,7 @@ The <action> type attribute can be add,update,fix,remove.
<release version="52" date="YYYY-MM-DD" description="TBA">
<action type="update" dev="ggregory">biz.aQute.bndlib.version 5.1.0
-> 5.1.1.</action>
+ <action type="add" dev="sebb">Align javadoc version with java
override profile</action>
</release>
<release version="51" date="2020-06-23" description="Fix
incompatibilty issues with Java 7
