You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by vi...@apache.org on 2018/12/18 11:21:12 UTC
[drill] branch master updated: DRILL-6900: maven-release-plugin
failure on the release:perform stage
This is an automated email from the ASF dual-hosted git repository.
vitalii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new b23ae6e DRILL-6900: maven-release-plugin failure on the release:perform stage
b23ae6e is described below
commit b23ae6e02495f51a4dcd6fbbf1eb259b6207430b
Author: Vitalii Diravka <vi...@gmail.com>
AuthorDate: Thu Dec 13 16:17:55 2018 +0200
DRILL-6900: maven-release-plugin failure on the release:perform stage
- downgrade maven-javadoc-plugin version
- update some Drill maven plugins versions and move them to pluginManagement block
- bump up lowest maven version supported by Drill in correspondence to org.apache.maven dependencies
closes #1574
---
contrib/storage-jdbc/pom.xml | 1 -
contrib/storage-kudu/pom.xml | 1 -
docs/dev/Docker.md | 2 +-
docs/dev/Environment.md | 4 ++--
pom.xml | 37 +++++++++++++++++++++++++++----------
protocol/pom.xml | 1 -
tools/fmpp/pom.xml | 4 ++--
7 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/contrib/storage-jdbc/pom.xml b/contrib/storage-jdbc/pom.xml
index 9895b1a..495f1c8 100755
--- a/contrib/storage-jdbc/pom.xml
+++ b/contrib/storage-jdbc/pom.xml
@@ -156,7 +156,6 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.1.1</version>
<executions>
<execution>
<goals>
diff --git a/contrib/storage-kudu/pom.xml b/contrib/storage-kudu/pom.xml
index e1120c8..90be878 100644
--- a/contrib/storage-kudu/pom.xml
+++ b/contrib/storage-kudu/pom.xml
@@ -112,7 +112,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
<executions>
<!-- Extract ValueVectorTypes.tdd from drill-vector.jar and put
it under ${project.build.directory}/codegen/data where all freemarker data
diff --git a/docs/dev/Docker.md b/docs/dev/Docker.md
index acfea48..9168f1f 100644
--- a/docs/dev/Docker.md
+++ b/docs/dev/Docker.md
@@ -4,7 +4,7 @@
To build an Apache Drill docker image, you need to have the following software installed on your system to successfully complete a build.
* [Java 8](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html)
- * [Maven 3.3.1 or greater](https://maven.apache.org/download.cgi)
+ * [Maven 3.3.3 or greater](https://maven.apache.org/download.cgi)
* [Docker CE](https://store.docker.com/search?type=edition&offering=community)
If you are using an older Mac or PC, additionally configure [docker-machine](https://docs.docker.com/machine/overview/#what-is-docker-machine) on your system
diff --git a/docs/dev/Environment.md b/docs/dev/Environment.md
index 21334e6..4567a08 100644
--- a/docs/dev/Environment.md
+++ b/docs/dev/Environment.md
@@ -4,7 +4,7 @@
Currently, the Apache Drill build process is known to work on Linux, Windows and OSX. To build, you need to have the following software installed on your system to successfully complete a build.
* Java 8
- * Maven 3.3.1 or greater
+ * Maven 3.3.3 or greater
## Confirm settings
# java -version
@@ -13,7 +13,7 @@ Currently, the Apache Drill build process is known to work on Linux, Windows and
Java HotSpot(TM) 64-Bit Server VM (build 25.161-b12, mixed mode)
# mvn --version
- Apache Maven 3.3.1 (cab6659f9874fa96462afef40fcf6bc033d58c1c; 2015-03-13T13:10:27-07:00)
+ Apache Maven 3.3.3
## Checkout
diff --git a/pom.xml b/pom.xml
index 35b12b6..01ca3e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,11 +89,11 @@
<excludedGroups />
<memoryMb>4096</memoryMb>
<directMemoryMb>4096</directMemoryMb>
- <doclint>none</doclint>
<rat.skip>true</rat.skip>
<license.skip>true</license.skip>
<docker.repository>drill/apache-drill</docker.repository>
<antlr.version>4.7.1</antlr.version>
+ <lowestMavenVersion>3.3.3</lowestMavenVersion>
</properties>
<scm>
@@ -399,7 +399,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.12.1</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
@@ -493,7 +492,7 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>[3.3.1,4)</version>
+ <version>[{$lowestMavenVersion},4)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[1.8,12)</version>
@@ -703,11 +702,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
</plugin>
@@ -738,6 +732,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M2</version>
<executions>
<execution>
<id>default-test</id>
@@ -749,7 +744,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId>
- <version>2.21.0</version>
+ <version>3.0.0-M2</version>
</dependency>
</dependencies>
<configuration>
@@ -881,6 +876,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
+ <version>3.2.1</version>
<executions>
<execution>
<phase>package</phase>
@@ -890,6 +886,28 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.12.1</version> <!--it necessary to solve Checkstyle7.8.2 errors to update it to latest version-->
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.4</version> <!--the 3.0.1 version causes failures on the release:prepare stage-->
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ </plugin>
+
+ <!--Note: apache-21.pom has the latest versions of apache-rat-plugin, maven-dependency-plugin and
+ maven-clean-plugin. Once the newer versions are needed and present in maven repo, the plugins versions can be
+ overridden here-->
</plugins>
</pluginManagement>
</build>
@@ -1708,7 +1726,6 @@
<!-- override the parent assembly execution to customize the assembly final name -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.0</version>
<executions>
<execution>
<id>source-release-assembly</id>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 3a0e232..e2a655a 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -62,7 +62,6 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
<configuration>
<filesets>
<fileset>
diff --git a/tools/fmpp/pom.xml b/tools/fmpp/pom.xml
index 5849101..ea7e947 100644
--- a/tools/fmpp/pom.xml
+++ b/tools/fmpp/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>3.3.3</version>
+ <version>${lowestMavenVersion}</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.3.3</version>
+ <version>${lowestMavenVersion}</version>
</dependency>
<dependency>
<groupId>com.googlecode.fmpp-maven-plugin</groupId>