You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by kr...@apache.org on 2018/04/28 21:04:43 UTC
calcite-avatica git commit: [CALCITE-2272] Apache Parent POM 19,
JDK 10 Surefire, and JDK 10 javadoc
Repository: calcite-avatica
Updated Branches:
refs/heads/master 55b5a4763 -> 2501d351f
[CALCITE-2272] Apache Parent POM 19, JDK 10 Surefire, and JDK 10 javadoc
Close apache/calcite-avatica#42
Signed-off-by: Kevin Risden <kr...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/calcite-avatica/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite-avatica/commit/2501d351
Tree: http://git-wip-us.apache.org/repos/asf/calcite-avatica/tree/2501d351
Diff: http://git-wip-us.apache.org/repos/asf/calcite-avatica/diff/2501d351
Branch: refs/heads/master
Commit: 2501d351f1a6e6802f3832539657719f0df4f965
Parents: 55b5a47
Author: Kevin Risden <kr...@apache.org>
Authored: Fri Apr 20 22:03:49 2018 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Sat Apr 28 16:04:20 2018 -0500
----------------------------------------------------------------------
pom.xml | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/2501d351/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index daff942..2132ad5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>18</version>
+ <version>19</version>
</parent>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-parent</artifactId>
@@ -80,10 +80,12 @@ limitations under the License.
<maven-checkstyle-plugin.version>2.12.1</maven-checkstyle-plugin.version>
<maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
- <!-- Apache 18 has 2.10.3, need 2.10.4 for [MJAVADOC-442]. -->
- <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
+ <!-- Apache 19 has 2.10.4, but need 3.0.0 for [LANG-1365]. -->
+ <maven-javadoc-plugin.version>3.0.0</maven-javadoc-plugin.version>
<maven-scm-provider.version>1.9.4</maven-scm-provider.version>
<maven-shade-plugin.version>2.1</maven-shade-plugin.version>
+ <!-- Apache 19 has 2.20.1, but need 2.21.0+ for [MPOM-184] -->
+ <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
<mockito.version>2.5.5</mockito.version>
<protobuf.version>3.3.0</protobuf.version>
<scott-data-hsqldb.version>0.1</scott-data-hsqldb.version>
@@ -456,6 +458,7 @@ limitations under the License.
under "reporting", and is more lenient. -->
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
+ <additionalOptions>-html5</additionalOptions>
<links>
<link>https://docs.oracle.com/javase/8/docs/api/</link>
</links>
@@ -564,6 +567,7 @@ limitations under the License.
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
<argLine>-Xmx1536m -XX:MaxPermSize=256m -Duser.timezone=${user.timezone}</argLine>
</configuration>
@@ -633,6 +637,7 @@ limitations under the License.
<reporting>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<links>