You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2021/10/20 08:48:08 UTC
[hbase] branch branch-1.4 updated (fd55a05 -> 97e433d)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a change to branch branch-1.4
in repository https://gitbox.apache.org/repos/asf/hbase.git.
from fd55a05 HBASE-25858 [branch-1] make hbase-thrift optional in hbase-assembly module (#3237)
new 81f38bb HBASE-25890 [branch-1] add -U for maven build to force a check for updated releases and snapshots on remote repositories (#3265)
new 97e433d HBASE-25890 [Addendum] create profiles for different jdk version (#3295)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dev-support/hbase-personality.sh | 6 +-
hbase-assembly/pom.xml | 22 ++++--
.../{components.xml => components-jdk8.xml} | 0
hbase-assembly/src/main/assembly/components.xml | 6 --
...p-two-compat.xml => hadoop-two-compat-jdk8.xml} | 2 +-
.../src/main/assembly/hadoop-two-compat.xml | 1 -
pom.xml | 81 +++++++++++++++-------
7 files changed, 78 insertions(+), 40 deletions(-)
copy hbase-assembly/src/main/assembly/{components.xml => components-jdk8.xml} (100%)
copy hbase-assembly/src/main/assembly/{hadoop-two-compat.xml => hadoop-two-compat-jdk8.xml} (97%)
[hbase] 01/02: HBASE-25890 [branch-1] add -U for maven build to
force a check for updated releases and snapshots on remote repositories
(#3265)
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-1.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 81f38bb576f89854622ada72415a567dcf232644
Author: Reid Chan <re...@apache.org>
AuthorDate: Fri May 14 17:48:15 2021 +0800
HBASE-25890 [branch-1] add -U for maven build to force a check for updated releases and snapshots on remote repositories (#3265)
---
dev-support/hbase-personality.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 2af8b66..65988e7 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -442,7 +442,7 @@ function shadedjars_rebuild
start_clock
- local -a maven_args=('clean' 'verify' '-fae' '--batch-mode'
+ local -a maven_args=('clean' 'verify' '-fae' '-U' '--batch-mode'
'-pl' 'hbase-shaded/hbase-shaded-check-invariants' '-am'
'-Dtest=NoUnitTests' '-DHBasePatchProcess' '-Prelease'
'-Dmaven.javadoc.skip=true' '-Dcheckstyle.skip=true' '-Dspotbugs.skip=true')
@@ -453,7 +453,7 @@ function shadedjars_rebuild
# disabled because "maven_executor" needs to return both command and args
# shellcheck disable=2046
echo_and_redirect "${logfile}" \
- $(maven_executor) clean verify -fae --batch-mode \
+ $(maven_executor) clean verify -fae -U --batch-mode \
-pl hbase-shaded/hbase-shaded-check-invariants -am \
-Dtest=NoUnitTests -DHBasePatchProcess -Prelease \
-Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true
@@ -617,7 +617,7 @@ function hadoopcheck_rebuild
# disabled because "maven_executor" needs to return both command and args
# shellcheck disable=2046
echo_and_redirect "${logfile}" \
- $(maven_executor) clean install \
+ $(maven_executor) -U clean install \
-DskipTests -DHBasePatchProcess \
-Dhadoop-two.version="${hadoopver}"
count=$(${GREP} -c '\[ERROR\]' "${logfile}")
[hbase] 02/02: HBASE-25890 [Addendum] create profiles for different
jdk version (#3295)
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-1.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 97e433da835e9725f3f9dfab8b8df8086c987441
Author: Reid Chan <re...@apache.org>
AuthorDate: Tue May 25 23:19:32 2021 +0800
HBASE-25890 [Addendum] create profiles for different jdk version (#3295)
---
hbase-assembly/pom.xml | 22 ++++--
.../{components.xml => components-jdk8.xml} | 0
hbase-assembly/src/main/assembly/components.xml | 6 --
...p-two-compat.xml => hadoop-two-compat-jdk8.xml} | 2 +-
.../src/main/assembly/hadoop-two-compat.xml | 1 -
pom.xml | 81 +++++++++++++++-------
6 files changed, 75 insertions(+), 37 deletions(-)
diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
index defece4..7a07551 100644
--- a/hbase-assembly/pom.xml
+++ b/hbase-assembly/pom.xml
@@ -168,11 +168,6 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-rest</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-thrift</artifactId>
- <optional>true</optional>
- </dependency>
<!-- To dump tools in hbase-procedure into cached_classpath.txt. -->
<dependency>
<groupId>org.apache.hbase</groupId>
@@ -234,4 +229,21 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>build-with-jdk8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-thrift</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
+ </profiles>
</project>
diff --git a/hbase-assembly/src/main/assembly/components.xml b/hbase-assembly/src/main/assembly/components-jdk8.xml
similarity index 100%
copy from hbase-assembly/src/main/assembly/components.xml
copy to hbase-assembly/src/main/assembly/components-jdk8.xml
diff --git a/hbase-assembly/src/main/assembly/components.xml b/hbase-assembly/src/main/assembly/components.xml
index 3ec1883..dbf70da 100644
--- a/hbase-assembly/src/main/assembly/components.xml
+++ b/hbase-assembly/src/main/assembly/components.xml
@@ -78,12 +78,6 @@
<directoryMode>0755</directoryMode>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../hbase-thrift/target/hbase-webapps</directory>
- <outputDirectory>hbase-webapps/</outputDirectory>
- <fileMode>0644</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- <fileSet>
<directory>${project.basedir}/../hbase-rest/target/hbase-webapps</directory>
<outputDirectory>hbase-webapps/</outputDirectory>
<fileMode>0644</fileMode>
diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat-jdk8.xml
similarity index 97%
copy from hbase-assembly/src/main/assembly/hadoop-two-compat.xml
copy to hbase-assembly/src/main/assembly/hadoop-two-compat-jdk8.xml
index 9ef624c..4c034f6 100644
--- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
+++ b/hbase-assembly/src/main/assembly/hadoop-two-compat-jdk8.xml
@@ -26,7 +26,7 @@
<format>tar.gz</format>
</formats>
<componentDescriptors>
- <componentDescriptor>src/main/assembly/components.xml</componentDescriptor>
+ <componentDescriptor>src/main/assembly/components-jdk8.xml</componentDescriptor>
</componentDescriptors>
<moduleSets>
<moduleSet>
diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
index 9ef624c..730793a 100644
--- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
+++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
@@ -45,7 +45,6 @@
<include>org.apache.hbase:hbase-rest</include>
<include>org.apache.hbase:hbase-server</include>
<include>org.apache.hbase:hbase-shell</include>
- <include>org.apache.hbase:hbase-thrift</include>
<include>org.apache.hbase:hbase-external-blockcache</include>
</includes>
<!-- Binaries for the dependencies also go in the hbase-jars directory -->
diff --git a/pom.xml b/pom.xml
index 0127cf8..d53649c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,30 +60,6 @@
</license>
</licenses>
- <modules>
- <module>hbase-resource-bundle</module>
- <module>hbase-server</module>
- <module>hbase-rest</module>
- <module>hbase-shell</module>
- <module>hbase-protocol</module>
- <module>hbase-client</module>
- <module>hbase-hadoop-compat</module>
- <module>hbase-common</module>
- <module>hbase-procedure</module>
- <module>hbase-it</module>
- <module>hbase-examples</module>
- <module>hbase-prefix-tree</module>
- <module>hbase-assembly</module>
- <module>hbase-testing-util</module>
- <module>hbase-annotations</module>
- <module>hbase-checkstyle</module>
- <module>hbase-external-blockcache</module>
- <module>hbase-shaded</module>
- <module>hbase-archetypes</module>
- <module>hbase-metrics-api</module>
- <module>hbase-metrics</module>
- <module>hbase-hbtop</module>
- </modules>
<!--Add apache snapshots in case we want to use unreleased versions of plugins:
e.g. surefire 2.18-SNAPSHOT-->
<pluginRepositories>
@@ -2046,8 +2022,33 @@
<activation>
<jdk>1.8</jdk>
</activation>
+ <properties>
+ <assembly.file>src/main/assembly/hadoop-two-compat-jdk8.xml</assembly.file>
+ </properties>
<modules>
+ <module>hbase-resource-bundle</module>
+ <module>hbase-server</module>
+ <module>hbase-rest</module>
<module>hbase-thrift</module>
+ <module>hbase-shell</module>
+ <module>hbase-protocol</module>
+ <module>hbase-client</module>
+ <module>hbase-hadoop-compat</module>
+ <module>hbase-common</module>
+ <module>hbase-procedure</module>
+ <module>hbase-it</module>
+ <module>hbase-examples</module>
+ <module>hbase-prefix-tree</module>
+ <module>hbase-assembly</module>
+ <module>hbase-testing-util</module>
+ <module>hbase-annotations</module>
+ <module>hbase-checkstyle</module>
+ <module>hbase-external-blockcache</module>
+ <module>hbase-shaded</module>
+ <module>hbase-archetypes</module>
+ <module>hbase-metrics-api</module>
+ <module>hbase-metrics</module>
+ <module>hbase-hbtop</module>
</modules>
<build>
<pluginManagement>
@@ -2084,6 +2085,38 @@
</build>
</profile>
+ <profile>
+ <id>build-with-jdk7</id>
+ <activation>
+ <jdk>1.7</jdk>
+ </activation>
+ <modules>
+ <!-- without hbase-thrift module -->
+ <module>hbase-resource-bundle</module>
+ <module>hbase-server</module>
+ <module>hbase-rest</module>
+ <module>hbase-shell</module>
+ <module>hbase-protocol</module>
+ <module>hbase-client</module>
+ <module>hbase-hadoop-compat</module>
+ <module>hbase-common</module>
+ <module>hbase-procedure</module>
+ <module>hbase-it</module>
+ <module>hbase-examples</module>
+ <module>hbase-prefix-tree</module>
+ <module>hbase-assembly</module>
+ <module>hbase-testing-util</module>
+ <module>hbase-annotations</module>
+ <module>hbase-checkstyle</module>
+ <module>hbase-external-blockcache</module>
+ <module>hbase-shaded</module>
+ <module>hbase-archetypes</module>
+ <module>hbase-metrics-api</module>
+ <module>hbase-metrics</module>
+ <module>hbase-hbtop</module>
+ </modules>
+ </profile>
+
<!--In JDK 1.8 and newer the PermGem has been removed. -->
<!--These two profiles are to handle the differences between the before and after 1.8 -->
<profile>