You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2020/05/25 03:39:22 UTC
[hive] branch master updated: HIVE-23494 : Upgrade Apache parent
POM to version 23 (David Mollitor via Ashutosh Chauhan)
This is an automated email from the ASF dual-hosted git repository.
hashutosh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 270ca80 HIVE-23494 : Upgrade Apache parent POM to version 23 (David Mollitor via Ashutosh Chauhan)
270ca80 is described below
commit 270ca800353458ebce6eb262781bd39b15f5e349
Author: David Mollitor <dm...@apache.org>
AuthorDate: Sun May 24 20:38:48 2020 -0700
HIVE-23494 : Upgrade Apache parent POM to version 23 (David Mollitor via Ashutosh Chauhan)
Signed-off-by: Ashutosh Chauhan <ha...@apache.org>
---
pom.xml | 2 +-
standalone-metastore/metastore-common/pom.xml | 1 -
standalone-metastore/metastore-server/pom.xml | 3 ---
.../metastore-tools/metastore-benchmarks/pom.xml | 2 --
standalone-metastore/metastore-tools/pom.xml | 17 ++---------------
.../metastore-tools/tools-common/pom.xml | 2 --
standalone-metastore/pom.xml | 18 ++++++++----------
storage-api/pom.xml | 21 +++------------------
testutils/pom.xml | 2 --
upgrade-acid/pom.xml | 8 ++------
10 files changed, 16 insertions(+), 60 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7515b4c..60f5f13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
+ <version>23</version>
</parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
diff --git a/standalone-metastore/metastore-common/pom.xml b/standalone-metastore/metastore-common/pom.xml
index e58c748..1938dce 100644
--- a/standalone-metastore/metastore-common/pom.xml
+++ b/standalone-metastore/metastore-common/pom.xml
@@ -415,7 +415,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>${maven.antrun.plugin.version}</version>
<dependencies>
<dependency>
<groupId>ant-contrib</groupId>
diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml
index ea5f905..adc98d4 100644
--- a/standalone-metastore/metastore-server/pom.xml
+++ b/standalone-metastore/metastore-server/pom.xml
@@ -411,7 +411,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>${maven.antrun.plugin.version}</version>
<dependencies>
<dependency>
<groupId>ant-contrib</groupId>
@@ -574,7 +573,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.20.1</version>
<executions>
<execution>
<goals>
@@ -634,7 +632,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version>
<configuration>
<excludes>
<exclude>binary-package-licenses/**</exclude>
diff --git a/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml b/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
index 06a4d8d..612ff6f 100644
--- a/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
+++ b/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
@@ -176,8 +176,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
<compilerId>javac-with-errorprone</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
diff --git a/standalone-metastore/metastore-tools/pom.xml b/standalone-metastore/metastore-tools/pom.xml
index f831a2e..b482c15 100644
--- a/standalone-metastore/metastore-tools/pom.xml
+++ b/standalone-metastore/metastore-tools/pom.xml
@@ -15,16 +15,15 @@
<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>
<artifactId>hive-standalone-metastore</artifactId>
- <groupId>org.apache.hive</groupId>
<version>4.0.0-SNAPSHOT</version>
+ <groupId>org.apache.hive</groupId>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>hive-metastore-tools</artifactId>
<name>Hive Metastore Tools</name>
-
<packaging>pom</packaging>
<modules>
@@ -34,9 +33,6 @@
<properties>
<hive.version>4.0.0-SNAPSHOT</hive.version>
- <maven.surefire.version>2.20.1</maven.surefire.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<javac.errorprone.version>2.8</javac.errorprone.version>
<errorprone.core.version>2.3.1</errorprone.core.version>
<picocli.version>3.1.0</picocli.version>
@@ -149,15 +145,6 @@
</dependencyManagement>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<!-- Suppress source assembly -->
<plugin>
diff --git a/standalone-metastore/metastore-tools/tools-common/pom.xml b/standalone-metastore/metastore-tools/tools-common/pom.xml
index 44f02b7..7403b13 100644
--- a/standalone-metastore/metastore-tools/tools-common/pom.xml
+++ b/standalone-metastore/metastore-tools/tools-common/pom.xml
@@ -74,8 +74,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
<compilerId>javac-with-errorprone</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index ee2701e..577497b 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -16,30 +16,30 @@
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>
- <modules>
- <module>metastore-common</module>
- <module>metastore-server</module>
- <module>metastore-tools</module>
- </modules>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
- <relativePath></relativePath>
+ <version>23</version>
</parent>
-
<groupId>org.apache.hive</groupId>
<artifactId>hive-standalone-metastore</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Hive Standalone Metastore</name>
+ <modules>
+ <module>metastore-common</module>
+ <module>metastore-server</module>
+ <module>metastore-tools</module>
+ </modules>
+
<properties>
<hive.version.shortname>4.0.0</hive.version.shortname>
<standalone.metastore.path.to.root>.</standalone.metastore.path.to.root>
<!-- Build properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.useIncrementalCompilation>false</maven.compiler.useIncrementalCompilation>
@@ -61,7 +61,6 @@
<!-- Plugin versions -->
<ant.contrib.version>1.0b3</ant.contrib.version>
- <maven.antrun.plugin.version>1.7</maven.antrun.plugin.version>
<maven.checkstyle.plugin.version>2.17</maven.checkstyle.plugin.version>
<!-- Dependency versions -->
@@ -374,7 +373,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version>
<configuration>
<excludes>
<exclude>binary-package-licenses/**</exclude>
diff --git a/storage-api/pom.xml b/storage-api/pom.xml
index 147aa4d..6255d3a 100644
--- a/storage-api/pom.xml
+++ b/storage-api/pom.xml
@@ -19,8 +19,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
- <relativePath></relativePath>
+ <version>23</version>
</parent>
<groupId>org.apache.hive</groupId>
@@ -30,6 +29,8 @@
<name>Hive Storage API</name>
<properties>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<commons-logging.version>1.1.3</commons-logging.version>
<guava.version>19.0</guava.version>
<hadoop.version>3.1.0</hadoop.version>
@@ -161,22 +162,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reuseForks>false</reuseForks>
diff --git a/testutils/pom.xml b/testutils/pom.xml
index 0f03b84..07e5426 100644
--- a/testutils/pom.xml
+++ b/testutils/pom.xml
@@ -37,12 +37,10 @@
<dependency>
<groupId>com.google.code.tempus-fugit</groupId>
<artifactId>tempus-fugit</artifactId>
- <version>${tempus-fugit.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
</dependency>
</dependencies>
diff --git a/upgrade-acid/pom.xml b/upgrade-acid/pom.xml
index 94f386e..4bac423 100644
--- a/upgrade-acid/pom.xml
+++ b/upgrade-acid/pom.xml
@@ -15,16 +15,14 @@
<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>
<!--disconnected from hive root pom since this module needs 2.x jars-->
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
- <relativePath></relativePath>
+ <version>23</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<!--this module is added to parent pom so that it builds and releases with the reset of Hive-->
<groupId>org.apache.hive</groupId>
<artifactId>hive-upgrade-acid</artifactId>
@@ -40,8 +38,6 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.useIncrementalCompilation>false</maven.compiler.useIncrementalCompilation>
<maven.repo.local>${settings.localRepository}</maven.repo.local>
- <maven.assembly.plugin.version>2.3</maven.assembly.plugin.version>
- <maven.exec.plugin.version>1.6.0</maven.exec.plugin.version>
<hive.path.to.root>..</hive.path.to.root>
<!-- Plugin versions -->
<ant.contrib.version>1.0b3</ant.contrib.version>