This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase-thirdparty.git
The following commit(s) were added to refs/heads/master by this push:
new 155b018 HBASE-29085 Addendum downgrade spotless to 2.30.0 for java8
compatibility
155b018 is described below
commit 155b0182d2a35ec4585bd9ad565f37714a58047c
Author: Duo Zhang <[email protected]>
AuthorDate: Sat Jan 18 21:05:24 2025 +0800
HBASE-29085 Addendum downgrade spotless to 2.30.0 for java8 compatibility
---
hbase-noop-htrace/pom.xml | 16 +--
hbase-shaded-gson/pom.xml | 23 ++-
hbase-shaded-jackson-jaxrs-json-provider/pom.xml | 155 ++++++++++-----------
hbase-shaded-jersey/pom.xml | 133 +++++++++---------
hbase-shaded-jetty/pom.xml | 141 +++++++++----------
hbase-shaded-miscellaneous/pom.xml | 145 ++++++++++---------
hbase-shaded-netty-tcnative/pom.xml | 22 +--
hbase-shaded-netty/pom.xml | 46 +++---
hbase-shaded-protobuf/pom.xml | 28 ++--
hbase-unsafe/pom.xml | 14 +-
.../hbase/unsafe/HBasePlatformDependent.java | 8 +-
.../hadoop/hbase/unsafe/HBaseUnsafeInternal.java | 4 +-
pom.xml | 89 ++++++------
13 files changed, 397 insertions(+), 427 deletions(-)
diff --git a/hbase-noop-htrace/pom.xml b/hbase-noop-htrace/pom.xml
index 544b8bf..ae98fca 100644
--- a/hbase-noop-htrace/pom.xml
+++ b/hbase-noop-htrace/pom.xml
@@ -29,10 +29,8 @@
</parent>
<artifactId>hbase-noop-htrace</artifactId>
<name>Apache HBase Drop-in noop HTrace replacement</name>
- <description>
- Implements the HTrace APIs with noops and nonsense aimed at a) removing
CVE flagged transitive
- dependencies and b) favoring the JIT optimizing it away.
- </description>
+ <description>Implements the HTrace APIs with noops and nonsense aimed at a)
removing CVE flagged transitive
+ dependencies and b) favoring the JIT optimizing it away.</description>
<properties>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- This library is meant to work with whatever HBase and Hadoop combos
we still list
@@ -87,6 +85,11 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven.checkstyle.version}</version>
+ <configuration>
+ <configLocation>hbase/checkstyle.xml</configLocation>
+
<suppressionsLocation>hbase/checkstyle-suppressions.xml</suppressionsLocation>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ </configuration>
<dependencies>
<dependency>
<groupId>org.apache.hbase</groupId>
@@ -99,11 +102,6 @@
<version>${checkstyle.version}</version>
</dependency>
</dependencies>
- <configuration>
- <configLocation>hbase/checkstyle.xml</configLocation>
-
<suppressionsLocation>hbase/checkstyle-suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/hbase-shaded-gson/pom.xml b/hbase-shaded-gson/pom.xml
index 3b3a40c..2645379 100644
--- a/hbase-shaded-gson/pom.xml
+++ b/hbase-shaded-gson/pom.xml
@@ -37,9 +37,14 @@
</parent>
<artifactId>hbase-shaded-gson</artifactId>
<name>Apache HBase Relocated (Shaded) GSON Libs</name>
- <description>
- Pulls down GSON, relocates it and makes a far jar.
- </description>
+ <description>Pulls down GSON, relocates it and makes a far jar.</description>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson.version}</version>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -60,10 +65,10 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
+ <phase>package</phase>
<configuration>
<shadeSourcesContent>true</shadeSourcesContent>
<createSourcesJar>true</createSourcesJar>
@@ -94,8 +99,7 @@
</excludes>
</artifactSet>
<transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer">
- </transformer>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
<addHeader>false</addHeader>
</transformer>
@@ -106,11 +110,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>${gson.version}</version>
- </dependency>
- </dependencies>
</project>
diff --git a/hbase-shaded-jackson-jaxrs-json-provider/pom.xml
b/hbase-shaded-jackson-jaxrs-json-provider/pom.xml
index 6fd0477..8e3c11f 100644
--- a/hbase-shaded-jackson-jaxrs-json-provider/pom.xml
+++ b/hbase-shaded-jackson-jaxrs-json-provider/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd";>
- <!--
+ <!--
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -28,86 +28,83 @@
https://issues.apache.org/jira/browse/HBASE-6795.
-->
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.hbase.thirdparty</groupId>
- <artifactId>hbase-thirdparty</artifactId>
- <version>${revision}</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>hbase-shaded-jackson-jaxrs-json-provider</artifactId>
- <name>Apache HBase Relocated (Shaded) jackson-jaxrs-json-provider</name>
- <description>
- Pulls down jackson-jaxrs-json-provider, relocates it, and rewrites its
usage of javax.ws.rs
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.hbase.thirdparty</groupId>
+ <artifactId>hbase-thirdparty</artifactId>
+ <version>${revision}</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>hbase-shaded-jackson-jaxrs-json-provider</artifactId>
+ <name>Apache HBase Relocated (Shaded) jackson-jaxrs-json-provider</name>
+ <description>Pulls down jackson-jaxrs-json-provider, relocates it, and
rewrites its usage of javax.ws.rs
classes to make the relocated versions provided by
hbase-shaded-jersey. Does NOT
include/relocate its entire dependency graph, just performs this
isolated transform.
This is a separate module because jackson-jaxrs-json-provider is not
used universally. At
- this time, the dependency is required only by hbase-rest.
- </description>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}</directory>
- <includes>
- <include>dependency-reduced-pom.xml</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <shadeSourcesContent>true</shadeSourcesContent>
- <createSourcesJar>true</createSourcesJar>
-
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <relocations>
- <relocation>
- <pattern>javax.ws.rs</pattern>
-
<shadedPattern>${rename.offset}.javax.ws.rs</shadedPattern>
- </relocation>
- <relocation>
-
<pattern>com.fasterxml.jackson.jaxrs</pattern>
-
<shadedPattern>${rename.offset}.com.fasterxml.jackson.jaxrs</shadedPattern>
- </relocation>
- </relocations>
- <artifactSet>
- <includes>
-
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base</include>
-
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider</include>
- </includes>
- </artifactSet>
- <transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer">
- </transformer>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
- <addHeader>false</addHeader>
- </transformer>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>${jackson-jaxrs-json-provider.version}</version>
- </dependency>
- </dependencies>
+ this time, the dependency is required only by hbase-rest.</description>
+ <dependencies>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${jackson-jaxrs-json-provider.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>dependency-reduced-pom.xml</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <shadeSourcesContent>true</shadeSourcesContent>
+ <createSourcesJar>true</createSourcesJar>
+
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <relocations>
+ <relocation>
+ <pattern>javax.ws.rs</pattern>
+ <shadedPattern>${rename.offset}.javax.ws.rs</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.fasterxml.jackson.jaxrs</pattern>
+
<shadedPattern>${rename.offset}.com.fasterxml.jackson.jaxrs</shadedPattern>
+ </relocation>
+ </relocations>
+ <artifactSet>
+ <includes>
+
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base</include>
+
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider</include>
+ </includes>
+ </artifactSet>
+ <transformers>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+ <addHeader>false</addHeader>
+ </transformer>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/hbase-shaded-jersey/pom.xml b/hbase-shaded-jersey/pom.xml
index 0c6f21b..2fe13eb 100644
--- a/hbase-shaded-jersey/pom.xml
+++ b/hbase-shaded-jersey/pom.xml
@@ -37,9 +37,59 @@
</parent>
<artifactId>hbase-shaded-jersey</artifactId>
<name>Apache HBase Relocated (Shaded) Jersey Libs</name>
- <description>
- Pulls down Jersey, relocates it and makes a far jar.
- </description>
+ <description>Pulls down Jersey, relocates it and makes a far
jar.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.glassfish.jersey.containers</groupId>
+ <artifactId>jersey-container-servlet-core</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-jaxb</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.inject</groupId>
+ <artifactId>jersey-hk2</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ <version>${jakarta.ws.rs-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta.annotation-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ <version>${jakarta.validation-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.hk2.external</groupId>
+ <artifactId>jakarta.inject</artifactId>
+ <version>${jakarta.inject.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -60,10 +110,10 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
+ <phase>package</phase>
<configuration>
<shadeSourcesContent>true</shadeSourcesContent>
<createSourcesJar>true</createSourcesJar>
@@ -112,8 +162,7 @@
</excludes>
</artifactSet>
<transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer">
- </transformer>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
<addHeader>false</addHeader>
</transformer>
@@ -133,78 +182,26 @@
-->
<execution>
<id>relocate-jersey-jdk11-support</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
<phase>package</phase>
<configuration>
<target>
- <echo message="unjar" />
- <unzip
src="${project.build.directory}/${project.artifactId}-${project.version}.jar"
dest="${project.build.directory}/unpacked/" />
- <echo message="Rename jersey versions in META-INF" />
- <mkdir
dir="${project.build.directory}/unpacked/META-INF/versions/11/${rename.offset.dir}"
/>
+ <echo message="unjar"/>
+ <unzip dest="${project.build.directory}/unpacked/"
src="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
+ <echo message="Rename jersey versions in META-INF"/>
+ <mkdir
dir="${project.build.directory}/unpacked/META-INF/versions/11/${rename.offset.dir}"/>
<move
todir="${project.build.directory}/unpacked/META-INF/versions/11/${rename.offset.dir}">
- <fileset
dir="${project.build.directory}/unpacked/META-INF/versions/11" />
+ <fileset
dir="${project.build.directory}/unpacked/META-INF/versions/11"/>
</move>
- <echo message="Redo jar" />
- <jar
destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar"
basedir="${project.build.directory}/unpacked" />
+ <echo message="Redo jar"/>
+ <jar basedir="${project.build.directory}/unpacked"
destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
</target>
</configuration>
- <goals>
- <goal>run</goal>
- </goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-servlet-core</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-client</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-server</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-jaxb</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.inject</groupId>
- <artifactId>jersey-hk2</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>jakarta.ws.rs</groupId>
- <artifactId>jakarta.ws.rs-api</artifactId>
- <version>${jakarta.ws.rs-api.version}</version>
- </dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>${jakarta.annotation-api.version}</version>
- </dependency>
- <dependency>
- <groupId>jakarta.validation</groupId>
- <artifactId>jakarta.validation-api</artifactId>
- <version>${jakarta.validation-api.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>jakarta.inject</artifactId>
- <version>${jakarta.inject.version}</version>
- </dependency>
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${javassist.version}</version>
- </dependency>
- </dependencies>
</project>
diff --git a/hbase-shaded-jetty/pom.xml b/hbase-shaded-jetty/pom.xml
index 5656f05..859dbff 100644
--- a/hbase-shaded-jetty/pom.xml
+++ b/hbase-shaded-jetty/pom.xml
@@ -37,9 +37,65 @@
</parent>
<artifactId>hbase-shaded-jetty</artifactId>
<name>Apache HBase Relocated (Shaded) Jetty Libs</name>
- <description>
- Pulls down Jetty, relocates it and makes a far jar.
- </description>
+ <description>Pulls down Jetty, relocates it and makes a far
jar.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jmx</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util-ajax</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${servlet-api.version}</version>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -60,10 +116,10 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
+ <phase>package</phase>
<configuration>
<shadeSourcesContent>true</shadeSourcesContent>
<createSourcesJar>true</createSourcesJar>
@@ -98,8 +154,7 @@
</excludes>
</artifactSet>
<transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer">
- </transformer>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
<addHeader>false</addHeader>
</transformer>
@@ -118,84 +173,26 @@
-->
<execution>
<id>relocate-web-xml</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
<phase>package</phase>
<configuration>
<target>
- <echo message="unjar" />
- <unzip
src="${project.build.directory}/${project.artifactId}-${project.version}.jar"
dest="${project.build.directory}/unpacked/" />
- <echo message="Replace content in webdefault.xml" />
+ <echo message="unjar"/>
+ <unzip dest="${project.build.directory}/unpacked/"
src="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
+ <echo message="Replace content in webdefault.xml"/>
<replace
file="${project.build.directory}/unpacked/${rename.offset.dir}/org/eclipse/jetty/webapp/webdefault.xml">
<replacetoken>org.eclipse.jetty</replacetoken>
<replacevalue>${rename.offset}.org.eclipse.jetty</replacevalue>
</replace>
- <echo message="Redo jar" />
- <jar
destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar"
basedir="${project.build.directory}/unpacked" />
+ <echo message="Redo jar"/>
+ <jar basedir="${project.build.directory}/unpacked"
destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
</target>
</configuration>
- <goals>
- <goal>run</goal>
- </goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>${jetty.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-http</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jmx</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet-api.version}</version>
- </dependency>
- </dependencies>
</project>
diff --git a/hbase-shaded-miscellaneous/pom.xml
b/hbase-shaded-miscellaneous/pom.xml
index 4fc3f00..812801b 100644
--- a/hbase-shaded-miscellaneous/pom.xml
+++ b/hbase-shaded-miscellaneous/pom.xml
@@ -37,10 +37,75 @@
</parent>
<artifactId>hbase-shaded-miscellaneous</artifactId>
<name>Apache HBase Relocated (Shaded) Third-party Miscellaneous Libs</name>
- <description>
- Pulls down a set of libs, relocates them and then makes a fat new jar with
them all in it.
- See below for what this miscellaney includes.
- </description>
+ <description>Pulls down a set of libs, relocates them and then makes a fat
new jar with them all in it.
+ See below for what this miscellaney includes.</description>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.j2objc</groupId>
+ <artifactId>j2objc-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-annotations</artifactId>
+ </exclusion>
+ <!-- Just an empty jar-->
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>listenablefuture</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
+ <!--Version should be same as protobuf in adjacent module
+ except sometimes they publish new protobuf version w/o
+ updating util.-->
+ <version>${protobuf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>${commons-cli.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>${commons-collections.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>${error_prone_annotations.version}</version>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -61,10 +126,10 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
+ <phase>package</phase>
<configuration>
<shadeSourcesContent>true</shadeSourcesContent>
<createSourcesJar>true</createSourcesJar>
@@ -108,8 +173,7 @@
</excludes>
</artifactSet>
<transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer">
- </transformer>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
<addHeader>false</addHeader>
</transformer>
@@ -120,71 +184,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.j2objc</groupId>
- <artifactId>j2objc-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-annotations</artifactId>
- </exclusion>
- <!-- Just an empty jar-->
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>listenablefuture</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.checkerframework</groupId>
- <artifactId>checker-qual</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java-util</artifactId>
- <!--Version should be same as protobuf in adjacent module
- except sometimes they publish new protobuf version w/o
- updating util.-->
- <version>${protobuf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>${commons-cli.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>${commons-collections.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_annotations</artifactId>
- <version>${error_prone_annotations.version}</version>
- </dependency>
- </dependencies>
</project>
diff --git a/hbase-shaded-netty-tcnative/pom.xml
b/hbase-shaded-netty-tcnative/pom.xml
index 566002a..01634d9 100644
--- a/hbase-shaded-netty-tcnative/pom.xml
+++ b/hbase-shaded-netty-tcnative/pom.xml
@@ -64,10 +64,10 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
+ <phase>package</phase>
<configuration>
<shadeSourcesContent>true</shadeSourcesContent>
<createSourcesJar>true</createSourcesJar>
@@ -115,29 +115,29 @@
<executions>
<execution>
<id>unpack</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
<phase>package</phase>
<configuration>
<target>
- <echo message="unjar" />
- <unzip
src="${project.build.directory}/${project.artifactId}-${project.version}.jar"
dest="${project.build.directory}/unpacked/">
+ <echo message="unjar"/>
+ <unzip dest="${project.build.directory}/unpacked/"
src="${project.build.directory}/${project.artifactId}-${project.version}.jar">
<patternset>
<exclude name="META-INF/LICENSE.txt"/>
</patternset>
- <mapper type="regexp"
from="META-INF/license/(LICENSE.*.txt)$$" to="META-INF/\1"/>
+ <mapper from="META-INF/license/(LICENSE.*.txt)$$"
to="META-INF/\1" type="regexp"/>
</unzip>
<echo message="Rename netty .so in META-INF"/>
<move
file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_linux_x86_64.so"
tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_hbase_thirdparty_netty_tcnative_linux_x86_64.so"/>
<move
file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_linux_aarch_64.so"
tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_hbase_thirdparty_netty_tcnative_linux_aarch_64.so"/>
- <echo message="Rename netty .jnilib in META-INF" />
- <move
file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_osx_x86_64.jnilib"
tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_hbase_thirdparty_netty_tcnative_osx_x86_64.jnilib"
/>
- <move
file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_osx_aarch_64.jnilib"
tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_hbase_thirdparty_netty_tcnative_osx_aarch_64.jnilib"
/>
- <echo message="Redo jar" />
+ <echo message="Rename netty .jnilib in META-INF"/>
+ <move
file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_osx_x86_64.jnilib"
tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_hbase_thirdparty_netty_tcnative_osx_x86_64.jnilib"/>
+ <move
file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_osx_aarch_64.jnilib"
tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_hbase_thirdparty_netty_tcnative_osx_aarch_64.jnilib"/>
+ <echo message="Redo jar"/>
<jar basedir="${project.build.directory}/unpacked"
destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
</target>
</configuration>
- <goals>
- <goal>run</goal>
- </goals>
</execution>
</executions>
</plugin>
diff --git a/hbase-shaded-netty/pom.xml b/hbase-shaded-netty/pom.xml
index e5687c7..687071a 100644
--- a/hbase-shaded-netty/pom.xml
+++ b/hbase-shaded-netty/pom.xml
@@ -37,9 +37,14 @@
</parent>
<artifactId>hbase-shaded-netty</artifactId>
<name>Apache HBase Relocated (Shaded) Netty Libs</name>
- <description>
- Pulls down netty.io, relocates nd then makes a fat new jar with them all
in it.
- </description>
+ <description>Pulls down netty.io, relocates nd then makes a fat new jar with
them all in it.</description>
+ <dependencies>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -60,10 +65,10 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
+ <phase>package</phase>
<configuration>
<shadeSourcesContent>true</shadeSourcesContent>
<createSourcesJar>true</createSourcesJar>
@@ -114,34 +119,27 @@
<executions>
<execution>
<id>unpack</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
<phase>package</phase>
<configuration>
<target>
- <echo message="unjar" />
- <unzip
src="${project.build.directory}/${project.artifactId}-${project.version}.jar"
dest="${project.build.directory}/unpacked/" />
- <echo message="Rename netty .so in META-INF" />
- <move
file="${project.build.directory}/unpacked/META-INF/native/libnetty_transport_native_epoll_x86_64.so"
tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_hbase_thirdparty_netty_transport_native_epoll_x86_64.so"
/>
- <move
file="${project.build.directory}/unpacked/META-INF/native/libnetty_transport_native_epoll_aarch_64.so"
tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_hbase_thirdparty_netty_transport_native_epoll_aarch_64.so"
/>
- <echo message="Rename netty .jnilib in META-INF" />
- <move
file="${project.build.directory}/unpacked/META-INF/native/libnetty_transport_native_kqueue_x86_64.jnilib"
tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_hbase_thirdparty_netty_transport_native_kqueue_x86_64.jnilib"
/>
- <move
file="${project.build.directory}/unpacked/META-INF/native/libnetty_resolver_dns_native_macos_x86_64.jnilib"
tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_hbase_thirdparty_netty_resolver_dns_native_macos_x86_64.jnilib"
/>
- <echo message="Redo jar" />
- <jar
destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar"
basedir="${project.build.directory}/unpacked" />
+ <echo message="unjar"/>
+ <unzip dest="${project.build.directory}/unpacked/"
src="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
+ <echo message="Rename netty .so in META-INF"/>
+ <move
file="${project.build.directory}/unpacked/META-INF/native/libnetty_transport_native_epoll_x86_64.so"
tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_hbase_thirdparty_netty_transport_native_epoll_x86_64.so"/>
+ <move
file="${project.build.directory}/unpacked/META-INF/native/libnetty_transport_native_epoll_aarch_64.so"
tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_hbase_thirdparty_netty_transport_native_epoll_aarch_64.so"/>
+ <echo message="Rename netty .jnilib in META-INF"/>
+ <move
file="${project.build.directory}/unpacked/META-INF/native/libnetty_transport_native_kqueue_x86_64.jnilib"
tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_hbase_thirdparty_netty_transport_native_kqueue_x86_64.jnilib"/>
+ <move
file="${project.build.directory}/unpacked/META-INF/native/libnetty_resolver_dns_native_macos_x86_64.jnilib"
tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_hbase_thirdparty_netty_resolver_dns_native_macos_x86_64.jnilib"/>
+ <echo message="Redo jar"/>
+ <jar basedir="${project.build.directory}/unpacked"
destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
</target>
</configuration>
- <goals>
- <goal>run</goal>
- </goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- <version>${netty.version}</version>
- </dependency>
- </dependencies>
</project>
diff --git a/hbase-shaded-protobuf/pom.xml b/hbase-shaded-protobuf/pom.xml
index 8748a39..6ecbc35 100644
--- a/hbase-shaded-protobuf/pom.xml
+++ b/hbase-shaded-protobuf/pom.xml
@@ -28,9 +28,7 @@
</parent>
<artifactId>hbase-shaded-protobuf</artifactId>
<name>Apache HBase Patched and Relocated (Shaded) Protobuf</name>
- <description>
- Pulls down protobuf, patches it, compiles, and then relocates/shades.
- </description>
+ <description>Pulls down protobuf, patches it, compiles, and then
relocates/shades.</description>
<build>
<plugins>
<plugin>
@@ -41,15 +39,6 @@
under 'target' because the jar plugin is dumb, hard to
make it source from other then src/main/java.-->
<artifactId>maven-clean-plugin</artifactId>
- <executions>
- <execution>
- <id>pre-generate-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<filesets>
<fileset>
@@ -68,6 +57,15 @@
</fileset>
</filesets>
</configuration>
+ <executions>
+ <execution>
+ <id>pre-generate-sources</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ </execution>
+ </executions>
</plugin>
<plugin>
<!--Download our dependency src, i.e. protobuf, and
@@ -79,10 +77,10 @@
<executions>
<execution>
<id>unpack</id>
- <phase>generate-sources</phase>
<goals>
<goal>unpack</goal>
</goals>
+ <phase>generate-sources</phase>
<configuration>
<!--
The protobuf-java has no compile or runtime dependency so we
@@ -131,10 +129,10 @@
<executions>
<execution>
<id>patch</id>
- <phase>process-sources</phase>
<goals>
<goal>apply</goal>
</goals>
+ <phase>process-sources</phase>
<configuration>
<strip>1</strip>
<patchDirectory>${basedir}/src/main/patches</patchDirectory>
@@ -162,10 +160,10 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
+ <phase>package</phase>
<configuration>
<shadeSourcesContent>true</shadeSourcesContent>
<createSourcesJar>true</createSourcesJar>
diff --git a/hbase-unsafe/pom.xml b/hbase-unsafe/pom.xml
index 3535b4d..4781911 100644
--- a/hbase-unsafe/pom.xml
+++ b/hbase-unsafe/pom.xml
@@ -29,9 +29,7 @@
</parent>
<artifactId>hbase-unsafe</artifactId>
<name>Apache HBase Unsafe Wrapper</name>
- <description>
- Wrap sun.misc.Unsafe to avoid referencing it in the main code base
- </description>
+ <description>Wrap sun.misc.Unsafe to avoid referencing it in the main code
base</description>
<properties>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- This library is meant to work with whatever HBase and Hadoop combos
we still list
@@ -69,6 +67,11 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven.checkstyle.version}</version>
+ <configuration>
+ <configLocation>hbase/checkstyle.xml</configLocation>
+
<suppressionsLocation>hbase/checkstyle-suppressions.xml</suppressionsLocation>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ </configuration>
<dependencies>
<dependency>
<groupId>org.apache.hbase</groupId>
@@ -81,11 +84,6 @@
<version>${checkstyle.version}</version>
</dependency>
</dependencies>
- <configuration>
- <configLocation>hbase/checkstyle.xml</configLocation>
-
<suppressionsLocation>hbase/checkstyle-suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git
a/hbase-unsafe/src/main/java/org/apache/hadoop/hbase/unsafe/HBasePlatformDependent.java
b/hbase-unsafe/src/main/java/org/apache/hadoop/hbase/unsafe/HBasePlatformDependent.java
index f7d05bb..6b9e429 100644
---
a/hbase-unsafe/src/main/java/org/apache/hadoop/hbase/unsafe/HBasePlatformDependent.java
+++
b/hbase-unsafe/src/main/java/org/apache/hadoop/hbase/unsafe/HBasePlatformDependent.java
@@ -176,8 +176,8 @@ public final class HBasePlatformDependent {
m.setAccessible(true);
return (Boolean) m.invoke(null);
} catch (Exception e) {
- LOG.warn("java.nio.Bits#unaligned() check failed." +
- "Unsafe based read/write of primitive types won't be used", e);
+ LOG.warn("java.nio.Bits#unaligned() check failed."
+ + "Unsafe based read/write of primitive types won't be used", e);
}
return false;
}
@@ -562,9 +562,9 @@ public final class HBasePlatformDependent {
/**
* Delegate {@code sun.misc.Signal}.
- * @param signal the name of the signal, such as 'HUP'.
+ * @param signal the name of the signal, such as 'HUP'.
* @param handler the handler of the signal, the first parameter is the
number of the signal,
- * while the second one is the name of the sinal.
+ * while the second one is the name of the sinal.
*/
public static void handle(String signal, BiConsumer<Integer, String>
handler) {
HBaseSignalInternal.handle(signal, handler);
diff --git
a/hbase-unsafe/src/main/java/org/apache/hadoop/hbase/unsafe/HBaseUnsafeInternal.java
b/hbase-unsafe/src/main/java/org/apache/hadoop/hbase/unsafe/HBaseUnsafeInternal.java
index 5e2461f..12c827b 100644
---
a/hbase-unsafe/src/main/java/org/apache/hadoop/hbase/unsafe/HBaseUnsafeInternal.java
+++
b/hbase-unsafe/src/main/java/org/apache/hadoop/hbase/unsafe/HBaseUnsafeInternal.java
@@ -206,7 +206,7 @@ final class HBaseUnsafeInternal {
}
public static void copyMemory(Object srcBase, long srcOffset, Object
destBase, long destOffset,
- long bytes) {
+ long bytes) {
UNSAFE.copyMemory(srcBase, srcOffset, destBase, destOffset, bytes);
}
@@ -255,7 +255,7 @@ final class HBaseUnsafeInternal {
}
public static Class<?> defineClass(String name, byte[] b, int off, int len,
ClassLoader loader,
- ProtectionDomain protectionDomain) {
+ ProtectionDomain protectionDomain) {
return UNSAFE.defineClass(name, b, off, len, loader, protectionDomain);
}
diff --git a/pom.xml b/pom.xml
index c680663..a13de6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,17 +32,15 @@
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>30</version>
- <relativePath />
+ <relativePath/>
<!-- no parent resolution -->
</parent>
<groupId>org.apache.hbase.thirdparty</groupId>
<artifactId>hbase-thirdparty</artifactId>
<version>${revision}</version>
- <name>Apache HBase Third-Party Libs</name>
<packaging>pom</packaging>
- <description>
- Packaging of relocated (renamed, shaded) third-party libraries used by
hbase.
- </description>
+ <name>Apache HBase Third-Party Libs</name>
+ <description>Packaging of relocated (renamed, shaded) third-party libraries
used by hbase.</description>
<url>https://hbase.apache.org</url>
<inceptionYear>2017</inceptionYear>
<licenses>
@@ -52,32 +50,7 @@
<distribution>repo</distribution>
</license>
</licenses>
- <modules>
- <module>hbase-shaded-protobuf</module>
- <module>hbase-shaded-netty</module>
- <module>hbase-shaded-netty-tcnative</module>
- <module>hbase-shaded-gson</module>
- <module>hbase-shaded-miscellaneous</module>
- <module>hbase-shaded-jetty</module>
- <module>hbase-shaded-jersey</module>
- <module>hbase-shaded-jackson-jaxrs-json-provider</module>
- <module>hbase-noop-htrace</module>
- <module>hbase-unsafe</module>
- </modules>
- <scm>
- <connection>scm:git:git://git.apache.org/hbase-thirdparty.git</connection>
-
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/hbase-thirdparty.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=hbase-thirdparty.git</url>
- </scm>
- <issueManagement>
- <!--File issues for this project against Apache HBase JIRA-->
- <system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/HBASE</url>
- </issueManagement>
- <ciManagement>
- <system>hudson</system>
-
<url>http://hudson.zones.apache.org/hudson/view/HBase/job/HBase-TRUNK/</url>
- </ciManagement>
+ <developers/>
<mailingLists>
<mailingList>
<name>User List</name>
@@ -120,14 +93,37 @@
<archive>http://mail-archives.apache.org/mod_mbox/hbase-builds/</archive>
</mailingList>
</mailingLists>
- <developers />
+ <modules>
+ <module>hbase-shaded-protobuf</module>
+ <module>hbase-shaded-netty</module>
+ <module>hbase-shaded-netty-tcnative</module>
+ <module>hbase-shaded-gson</module>
+ <module>hbase-shaded-miscellaneous</module>
+ <module>hbase-shaded-jetty</module>
+ <module>hbase-shaded-jersey</module>
+ <module>hbase-shaded-jackson-jaxrs-json-provider</module>
+ <module>hbase-noop-htrace</module>
+ <module>hbase-unsafe</module>
+ </modules>
+ <scm>
+ <connection>scm:git:git://git.apache.org/hbase-thirdparty.git</connection>
+
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/hbase-thirdparty.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=hbase-thirdparty.git</url>
+ </scm>
+ <issueManagement>
+ <!--File issues for this project against Apache HBase JIRA-->
+ <system>JIRA</system>
+ <url>http://issues.apache.org/jira/browse/HBASE</url>
+ </issueManagement>
+ <ciManagement>
+ <system>hudson</system>
+
<url>http://hudson.zones.apache.org/hudson/view/HBase/job/HBase-TRUNK/</url>
+ </ciManagement>
<!--TODO-->
<properties>
<revision>4.1.10-SNAPSHOT</revision>
<maven.javadoc.skip>true</maven.javadoc.skip>
- <maven.build.timestamp.format>
- yyyy-MM-dd'T'HH:mm
- </maven.build.timestamp.format>
+
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm</maven.build.timestamp.format>
<buildDate>${maven.build.timestamp}</buildDate>
<compileSource>1.8</compileSource>
<java.min.version>${compileSource}</java.min.version>
@@ -151,7 +147,7 @@
<jakarta.validation-api.version>2.0.2</jakarta.validation-api.version>
<javassist.version>3.30.2-GA</javassist.version>
<jackson-jaxrs-json-provider.version>2.17.3</jackson-jaxrs-json-provider.version>
- <spotless.version>2.44.2</spotless.version>
+ <spotless.version>2.30.0</spotless.version>
</properties>
<build>
<pluginManagement>
@@ -228,18 +224,18 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>3.1.0</version>
+ <configuration>
+ <timestampFormat>yyyy</timestampFormat>
+ <timestampPropertyName>build.year</timestampPropertyName>
+ </configuration>
<executions>
<execution>
- <phase>validate</phase>
<goals>
<goal>create-timestamp</goal>
</goals>
+ <phase>validate</phase>
</execution>
</executions>
- <configuration>
- <timestampFormat>yyyy</timestampFormat>
- <timestampPropertyName>build.year</timestampPropertyName>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -346,16 +342,14 @@
HBase requires at least version ${maven.min.version} of Maven to properly
build from source.
You appear to be using an older version. You can use either "mvn -version" or
"mvn enforcer:display-info" to verify what version is active.
- See the reference guide on building for more information:
http://hbase.apache.org/book.html#build
- </message>
+ See the reference guide on building for more information:
http://hbase.apache.org/book.html#build</message>
</requireMavenVersion>
<!-- The earliest JVM version we verify builds for via ASF
Jenkins -->
<requireJavaVersion>
<version>[${java.min.version},)</version>
<message>Java is out of date.
HBase requires at least version ${java.min.version} of the JDK to properly
build from source.
- See the reference guide on building for more information:
http://hbase.apache.org/book.html#build
- </message>
+ See the reference guide on building for more information:
http://hbase.apache.org/book.html#build</message>
</requireJavaVersion>
<bannedDependencies>
<excludes>
@@ -515,10 +509,10 @@
<artifactId>apache-rat-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
</plugin>
@@ -543,8 +537,7 @@
of the JDK to properly build from source. You appear to be using a newer
dependency. You can use
either "mvn -version" or "mvn enforcer:display-info" to verify what version
is active.
Non-release builds can temporarily build with a newer JDK version by setting
the
- 'compileSource' property (eg. mvn -DcompileSource=1.8 clean package).
- </message>
+ 'compileSource' property (eg. mvn -DcompileSource=1.8 clean
package).</message>
</enforceBytecodeVersion>
</rules>
</configuration>
