You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by de...@apache.org on 2022/01/22 00:49:23 UTC
[hive] branch master updated: HIVE-25783: Refine standalone-metastore module pom.xml files (Zhihua Deng, reviewed by Peter Vary)
This is an automated email from the ASF dual-hosted git repository.
dengzh 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 5966558 HIVE-25783: Refine standalone-metastore module pom.xml files (Zhihua Deng, reviewed by Peter Vary)
5966558 is described below
commit 5966558823d7a1c19221dbc817f7e16df5a54470
Author: dengzh <de...@gmail.com>
AuthorDate: Sat Jan 22 08:49:04 2022 +0800
HIVE-25783: Refine standalone-metastore module pom.xml files (Zhihua Deng, reviewed by Peter Vary)
Closes #2852
---
standalone-metastore/metastore-common/pom.xml | 125 ---------------------
.../main/resources/datanucleus-log4j.properties | 17 ---
.../src/main/resources/metastore-log4j2.properties | 71 ------------
.../src/main/resources/metastore-site.xml | 34 ------
standalone-metastore/metastore-server/pom.xml | 50 ---------
standalone-metastore/pom.xml | 64 ++++++-----
storage-api/pom.xml | 12 ++
7 files changed, 49 insertions(+), 324 deletions(-)
diff --git a/standalone-metastore/metastore-common/pom.xml b/standalone-metastore/metastore-common/pom.xml
index 626e9c9..2da20e9 100644
--- a/standalone-metastore/metastore-common/pom.xml
+++ b/standalone-metastore/metastore-common/pom.xml
@@ -404,15 +404,6 @@
</profiles>
<build>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>package.jdo</include>
- </includes>
- </resource>
- </resources>
-
<pluginManagement>
<plugins>
<plugin>
@@ -446,21 +437,6 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>setup-test-dirs</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <delete dir="${test.tmp.dir}" />
- <delete dir="${test.warehouse.dir}" />
- <mkdir dir="${test.tmp.dir}" />
- <mkdir dir="${test.warehouse.dir}" />
- </target>
- </configuration>
- </execution>
- <execution>
<id>generate-version-annotation</id>
<phase>generate-sources</phase>
<configuration>
@@ -477,13 +453,6 @@
<goal>run</goal>
</goals>
</execution>
- <execution>
- <id>setup-metastore-scripts</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
</executions>
</plugin>
<plugin>
@@ -532,84 +501,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <reuseForks>false</reuseForks>
- <argLine>-Xmx2048m</argLine>
- <failIfNoTests>false</failIfNoTests>
- <systemPropertyVariables>
- <log4j.debug>true</log4j.debug>
- <java.io.tmpdir>${test.tmp.dir}</java.io.tmpdir>
- <test.tmp.dir>${test.tmp.dir}</test.tmp.dir>
- <hive.in.test>true</hive.in.test>
- </systemPropertyVariables>
- <additionalClasspathElements>
- <additionalClasspathElement>${log4j.conf.dir}</additionalClasspathElement>
- </additionalClasspathElements>
- <skipITs>${skipITests}</skipITs> <!-- set this to false to run these tests -->
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <reuseForks>false</reuseForks>
- <forkCount>${test.forkcount}</forkCount>
- <argLine>-Xmx2048m</argLine>
- <systemPropertyVariables>
- <build.dir>${project.build.directory}</build.dir>
- <datanucleus.schema.autoCreateAll>true</datanucleus.schema.autoCreateAll>
- <derby.version>${derby.version}</derby.version>
- <derby.stream.error.file>${test.tmp.dir}/derby.log</derby.stream.error.file>
- <log4j.debug>true</log4j.debug>
- <java.io.tmpdir>${test.tmp.dir}</java.io.tmpdir>
- <javax.jdo.option.ConnectionURL>jdbc:derby:memory:${test.tmp.dir}/junit_metastore_db;create=true</javax.jdo.option.ConnectionURL>
- <metastore.schema.verification>false</metastore.schema.verification>
- <test.tmp.dir>${test.tmp.dir}</test.tmp.dir>
- <metastore.warehouse.dir>${test.warehouse.scheme}${test.warehouse.dir}</metastore.warehouse.dir>
- </systemPropertyVariables>
- <additionalClasspathElements>
- <additionalClasspathElement>${log4j.conf.dir}</additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>*.patch</exclude>
- <exclude>binary-package-licenses/**</exclude>
- <exclude>DEV-README</exclude>
- <exclude>**/src/main/sql/**</exclude>
- <exclude>**/README.md</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/*.txt</exclude>
- <exclude>**/*.log</exclude>
- <exclude>**/*.arcconfig</exclude>
- <exclude>**/package-info.java</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.q</exclude>
- <exclude>**/*.q.out</exclude>
- <exclude>**/*.xml</exclude>
- <exclude>**/gen/**</exclude>
- <exclude>**/patchprocess/**</exclude>
- <exclude>**/metastore_db/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
@@ -641,22 +532,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.antlr</groupId>
- <artifactId>antlr3-maven-plugin</artifactId>
- <version>${antlr.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>antlr</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
- <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
- </configuration>
- </plugin>
- <plugin>
<!-- Suppress source assembly -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/standalone-metastore/metastore-common/src/main/resources/datanucleus-log4j.properties b/standalone-metastore/metastore-common/src/main/resources/datanucleus-log4j.properties
deleted file mode 100644
index 80f17e8..0000000
--- a/standalone-metastore/metastore-common/src/main/resources/datanucleus-log4j.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Define the destination and format of our logging
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=target/datanucleus.log
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
-
-# DataNucleus Categories
-log4j.category.DataNucleus.JDO=INFO, A1
-log4j.category.DataNucleus.Cache=INFO, A1
-log4j.category.DataNucleus.MetaData=INFO, A1
-log4j.category.DataNucleus.General=INFO, A1
-log4j.category.DataNucleus.Transaction=INFO, A1
-log4j.category.DataNucleus.Datastore=DEBUG, A1
-log4j.category.DataNucleus.ValueGeneration=DEBUG, A1
-
-log4j.category.DataNucleus.Enhancer=INFO, A1
-log4j.category.DataNucleus.SchemaTool=INFO, A1
diff --git a/standalone-metastore/metastore-common/src/main/resources/metastore-log4j2.properties b/standalone-metastore/metastore-common/src/main/resources/metastore-log4j2.properties
deleted file mode 100644
index ec5039b..0000000
--- a/standalone-metastore/metastore-common/src/main/resources/metastore-log4j2.properties
+++ /dev/null
@@ -1,71 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-status = INFO
-name = MetastoreLog4j2
-packages = org.apache.hadoop.hive.metastore
-
-# list of properties
-property.metastore.log.level = INFO
-property.metastore.root.logger = DRFA
-property.metastore.log.dir = ${sys:java.io.tmpdir}/${sys:user.name}
-property.metastore.log.file = metastore.log
-property.hive.perflogger.log.level = INFO
-
-# list of all appenders
-appenders = console, DRFA
-
-# console appender
-appender.console.type = Console
-appender.console.name = console
-appender.console.target = SYSTEM_ERR
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n
-
-# daily rolling file appender
-appender.DRFA.type = RollingRandomAccessFile
-appender.DRFA.name = DRFA
-appender.DRFA.fileName = ${sys:metastore.log.dir}/${sys:metastore.log.file}
-# Use %pid in the filePattern to append <process-id>@<host-name> to the filename if you want separate log files for different CLI session
-appender.DRFA.filePattern = ${sys:metastore.log.dir}/${sys:metastore.log.file}.%d{yyyy-MM-dd}
-appender.DRFA.layout.type = PatternLayout
-appender.DRFA.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n
-appender.DRFA.policies.type = Policies
-appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy
-appender.DRFA.policies.time.interval = 1
-appender.DRFA.policies.time.modulate = true
-appender.DRFA.strategy.type = DefaultRolloverStrategy
-appender.DRFA.strategy.max = 30
-
-# list of all loggers
-loggers = DataNucleus, Datastore, JPOX, PerfLogger
-
-logger.DataNucleus.name = DataNucleus
-logger.DataNucleus.level = ERROR
-
-logger.Datastore.name = Datastore
-logger.Datastore.level = ERROR
-
-logger.JPOX.name = JPOX
-logger.JPOX.level = ERROR
-
-logger.PerfLogger.name = org.apache.hadoop.hive.ql.log.PerfLogger
-logger.PerfLogger.level = ${sys:hive.perflogger.log.level}
-
-# root logger
-rootLogger.level = ${sys:metastore.log.level}
-rootLogger.appenderRefs = root
-rootLogger.appenderRef.root.ref = ${sys:metastore.root.logger}
diff --git a/standalone-metastore/metastore-common/src/main/resources/metastore-site.xml b/standalone-metastore/metastore-common/src/main/resources/metastore-site.xml
deleted file mode 100644
index 271fc59..0000000
--- a/standalone-metastore/metastore-common/src/main/resources/metastore-site.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?><!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- These are default values meant to allow easy smoke testing of the metastore. You will
-likely need to add a number of new values. -->
-<configuration>
- <property>
- <name>metastore.thrift.uris</name>
- <value>thrift://localhost:9083</value>
- <description>Thrift URI for the remote metastore. Used by metastore client to connect to remote metastore.</description>
- </property>
- <property>
- <name>metastore.task.threads.always</name>
- <value>org.apache.hadoop.hive.metastore.events.EventCleanerTask</value>
- </property>
- <property>
- <name>metastore.expression.proxy</name>
- <value>org.apache.hadoop.hive.metastore.DefaultPartitionExpressionProxy</value>
- </property>
-</configuration>
\ No newline at end of file
diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml
index 02f43e4..b8ac4b5 100644
--- a/standalone-metastore/metastore-server/pom.xml
+++ b/standalone-metastore/metastore-server/pom.xml
@@ -518,26 +518,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>com.github.os72</groupId>
- <artifactId>protoc-jar-maven-plugin</artifactId>
- <version>3.5.1.1</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <protocArtifact>${protobuf.group}:protoc:${protobuf-exc.version}</protocArtifact>
- <addSources>none</addSources>
- <inputDirectories>
- <include>${basedir}/src/main/protobuf/org/apache/hadoop/hive/metastore</include>
- </inputDirectories>
- </configuration>
- </execution>
- </executions>
- </plugin>
<!-- TODO MS-SPLIT javadoc plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -640,33 +620,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>*.patch</exclude>
- <exclude>binary-package-licenses/**</exclude>
- <exclude>DEV-README</exclude>
- <exclude>**/src/main/sql/**</exclude>
- <exclude>**/README.md</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/*.txt</exclude>
- <exclude>**/*.log</exclude>
- <exclude>**/*.arcconfig</exclude>
- <exclude>**/package-info.java</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.q</exclude>
- <exclude>**/*.q.out</exclude>
- <exclude>**/*.xml</exclude>
- <exclude>**/gen/**</exclude>
- <exclude>**/patchprocess/**</exclude>
- <exclude>**/metastore_db/**</exclude>
- <exclude>**/test/resources/**/*.ldif</exclude>
- <exclude>**/test/resources/sql/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
@@ -690,7 +643,6 @@
</goals>
<configuration>
<sources>
- <source>src/gen/thrift/gen-javabean</source>
<source>build/generated-sources</source>
<source>src/gen/version</source>
</sources>
@@ -757,6 +709,4 @@
</plugin>
</plugins>
</build>
-
-
</project>
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index e16d162..e128c57 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -441,33 +441,8 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>*.patch</exclude>
- <exclude>binary-package-licenses/**</exclude>
- <exclude>DEV-README</exclude>
- <exclude>**/src/main/sql/**</exclude>
- <exclude>**/README.md</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/*.txt</exclude>
- <exclude>**/*.log</exclude>
- <exclude>**/*.arcconfig</exclude>
- <exclude>**/package-info.java</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.q</exclude>
- <exclude>**/*.q.out</exclude>
- <exclude>**/*.xml</exclude>
- <exclude>**/gen/**</exclude>
- <exclude>**/patchprocess/**</exclude>
- <exclude>**/metastore_db/**</exclude>
- </excludes>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -516,6 +491,41 @@
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <exclude>*.patch</exclude>
+ <exclude>binary-package-licenses/**</exclude>
+ <exclude>DEV-README</exclude>
+ <exclude>**/src/main/sql/**</exclude>
+ <exclude>**/README.md</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.txt</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.arcconfig</exclude>
+ <exclude>**/package-info.java</exclude>
+ <exclude>**/*.properties</exclude>
+ <exclude>**/*.q</exclude>
+ <exclude>**/*.q.out</exclude>
+ <exclude>**/*.xml</exclude>
+ <exclude>**/gen/**</exclude>
+ <exclude>**/patchprocess/**</exclude>
+ <exclude>**/metastore_db/**</exclude>
+ <exclude>**/test/resources/**/*.ldif</exclude>
+ <exclude>**/test/resources/sql/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/storage-api/pom.xml b/storage-api/pom.xml
index 4e31954..4113ba6 100644
--- a/storage-api/pom.xml
+++ b/storage-api/pom.xml
@@ -193,6 +193,18 @@
</systemPropertyVariables>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>