Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -466,4 +466,3 @@
| JIRA | Summary | Priority | Component |
|:---- |:---- | :--- |:---- |
| [HBASE-23052](https://issues.apache.org/jira/browse/HBASE-23052) | hbase-thirdparty version of GSON that works for branch-1 | Blocker | dependencies |

3 changes: 0 additions & 3 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,3 @@ These release notes cover new developer and user-facing incompatibilities, impor
HBase's internal use of GSON is now done in a stand alone module named `hbase-shaded-gson` rather than as a part of the `hbase-shaded-miscellaneous` module. The relocated fully qualified class names are still the same.

This internal artifact is also set to maintain JDK bytecode compatibility as appropriate for use with branches-1 based releases in addition to the existing use in later release lines.



19 changes: 19 additions & 0 deletions dev-support/eclipse.importorder
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# 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.
#Organize Import Order
3=org.apache.hadoop.hbase.shaded
2=org.apache.hbase.thirdparty
1=
0=\#
418 changes: 418 additions & 0 deletions dev-support/hbase_eclipse_formatter.xml

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions dev-support/license-header
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* 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.
*/
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/**
*
/*
* 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
Expand Down
4 changes: 2 additions & 2 deletions hbase-shaded-netty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@
property so netty finds the renamed .so and associates it w/ the relocated netty files.

Add this define when running unit tests:

mvn test -Dorg.apache.hbase.thirdparty.io.netty.packagePrefix=org.apache.hbase.thirdparty. -Dtest=TestNettyIPC

See toward the end of this issue for how to pass config:

https://github.com/netty/netty/issues/6665

TODO: Ensure native works.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* 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
Expand Down
99 changes: 99 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,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>
</properties>
<build>
<pluginManagement>
Expand Down Expand Up @@ -394,6 +395,104 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>${spotless.version}</version>
<configuration>
<!-- define a language-specific format -->
<java>
<includes>
<include>**/org/apache/hbase/htrace_noop/**</include>
<include>**/org/apache/hadoop/hbase/unsafe/**</include>
</includes>
<!--
e.g., remove the following lines:
"* @param paramName"
"* @throws ExceptionType"
"* @return returnType"'
Multiline to allow anchors on newlines
See https://errorprone.info/bugpattern/EmptyBlockTag
-->
<replaceRegex>
<name>Remove unhelpful javadoc stubs</name>
<searchRegex>(?m)^ *\* *@(?:param|throws|return) *\w* *\n</searchRegex>
<replacement/>
</replaceRegex>
<!--
e.g., rewrite
/** @return blabla */
or
/**
* @return blabla
*/
to
/** Returns blabla */
See https://errorprone.info/bugpattern/MissingSummary
https://google.github.io/styleguide/javaguide.html#s7.2-summary-fragment
-->
<replaceRegex>
<name>Purge single returns tag multi line</name>
<searchRegex>(?m)^ */\*\*\n *\* *@return *(.*) *\n *\*/$</searchRegex>
<replacement>/** Returns $1 */</replacement>
</replaceRegex>
<replaceRegex>
<name>Purge single returns tag single line</name>
<searchRegex>^ */\*\* *@return *(.*) *\*/$</searchRegex>
<replacement>/** Returns $1 */</replacement>
</replaceRegex>
<!-- apply a specific flavor -->
<eclipse>
<file>${session.executionRootDirectory}/dev-support/hbase_eclipse_formatter.xml</file>
</eclipse>
<importOrder>
<file>${session.executionRootDirectory}/dev-support/eclipse.importorder</file>
</importOrder>
<trimTrailingWhitespace/>
<endWithNewline/>
<removeUnusedImports/>
</java>
<pom>
<sortPom>
<expandEmptyElements>false</expandEmptyElements>
</sortPom>
</pom>
<formats>
<!-- you can define as many formats as you want, each is independent -->
<format>
<!-- define the files to apply to -->
<includes>
<include>**/*.xml</include>
<include>**/*.sh</include>
<include>**/*.py</include>
<include>**/Jenkinsfile*</include>
<include>**/*.md</include>
<include>*.md</include>
<include>**/*.txt</include>
<include>*.txt</include>
</includes>
<excludes>
<exclude>**/target/**</exclude>
<exclude>**/dependency-reduced-pom.xml</exclude>
<exclude>**/.idea/**</exclude>
</excludes>
<!-- define the steps to apply to those files -->
<trimTrailingWhitespace/>
<endWithNewline/>
</format>
<format>
<includes>
<include>**/org/apache/hbase/htrace_noop/**</include>
<include>**/org/apache/hadoop/hbase/unsafe/**</include>
</includes>
<licenseHeader>
<file>${session.executionRootDirectory}/dev-support/license-header</file>
<delimiter>package</delimiter>
</licenseHeader>
</format>
</formats>
</configuration>
</plugin>
</plugins>
<extensions>
<extension>
Expand Down