From ee99fe09b9f709e0656d1ddf78813d8a63a2d48d Mon Sep 17 00:00:00 2001 From: Peter Somogyi Date: Wed, 23 Jan 2019 14:02:30 +0100 Subject: [PATCH] HBASE-21667 Move to latest ASF Parent POM --- hbase-build-configuration/pom.xml | 1 - pom.xml | 82 ++----------------- .../appendix_hbase_incompatibilities.adoc | 6 +- src/main/asciidoc/book.adoc | 2 + src/main/asciidoc/images | 2 +- src/main/site/site.xml | 7 +- 6 files changed, 15 insertions(+), 85 deletions(-) diff --git a/hbase-build-configuration/pom.xml b/hbase-build-configuration/pom.xml index 1b57f9be28..b8bea48c99 100644 --- a/hbase-build-configuration/pom.xml +++ b/hbase-build-configuration/pom.xml @@ -75,7 +75,6 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven.compiler.version} javac-with-errorprone true diff --git a/pom.xml b/pom.xml index 87ea031b15..e98931b440 100755 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ org.apache apache - 18 + 21 @@ -91,14 +91,6 @@ hbase-metrics hbase-zookeeper - - - - apache.snapshots - http://repository.apache.org/snapshots/ - - scm:git:git://gitbox.apache.org/repos/asf/hbase.git scm:git:https://gitbox.apache.org/repos/asf/hbase.git @@ -108,10 +100,6 @@ JIRA http://issues.apache.org/jira/browse/HBASE - - hudson - http://hudson.zones.apache.org/hudson/view/HBase/job/HBase-TRUNK/ - User List @@ -529,25 +517,10 @@ --> - - org.apache.maven.plugins - maven-dependency-plugin - ${maven.dependency.version} - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven.javadoc.version} - org.apache.maven.plugins maven-remote-resources-plugin - - org.apache.maven.plugins - maven-shade-plugin - ${maven.shade.version} - org.apache.maven.plugins maven-release-plugin @@ -568,7 +541,6 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven.compiler.version} ${compileSource} ${compileSource} @@ -642,19 +614,6 @@ maven-surefire-report-plugin ${surefire.version} - - org.apache.maven.plugins - maven-clean-plugin - - - - - build - - - - org.codehaus.mojo buildnumber-maven-plugin @@ -725,10 +684,6 @@ log4j.properties mapred-queues.xml mapred-site.xml - - *.jar @@ -825,8 +780,6 @@ **/.* **/*.tgz **/*.orig - **/8e8ab58dcf39412da19833fcd8f687ac - **/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c **/0000000000000016310 **/.idea/** **/*.iml @@ -1202,7 +1155,6 @@ org.apache.maven.plugins maven-site-plugin - ${maven.site.version} false @@ -1416,8 +1368,6 @@ 3.6 3.6.1 3.3.6 - - 4.1 4.5.3 4.4.6 3.2.1 @@ -1431,7 +1381,6 @@ 2.25.1 2.3.2 3.0.1-b08 - 6.1.14 9.1.10.0 4.12 1.3 @@ -1475,16 +1424,7 @@ 1.8 3.3.0 2.17 - 3.6.1 - 3.0.1 2.10 - 2.5.2 - 3.0.2 - 3.0.0 - 1.2 - 3.0.0 - 3.4 - 3.0.1 1.1.0 1.5.0.Final 2.8.2 @@ -1492,13 +1432,6 @@ 2.12 1.0.1 2.1.0 - - /usr - /etc/hbase - /var/log/hbase - /var/run/hbase - 1 - ${project.artifactId}-${project.version} @@ -1510,7 +1443,6 @@ hbase-rsgroup-${project.version}-tests.jar hbase-mapreduce-${project.version}-tests.jar bash - 2.21.0 surefire-junit47 false @@ -3492,22 +3424,21 @@ maven-project-info-reports-plugin - 2.9 - cim + ci-management dependencies dependency-convergence dependency-info dependency-management index - issue-tracking - license - mailing-list + issue-management + licenses + mailing-lists plugin-management plugins - project-team + team scm summary @@ -3522,7 +3453,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven.javadoc.version} diff --git a/src/main/asciidoc/_chapters/appendix_hbase_incompatibilities.adoc b/src/main/asciidoc/_chapters/appendix_hbase_incompatibilities.adoc index d450f04ea6..c8ba938f35 100644 --- a/src/main/asciidoc/_chapters/appendix_hbase_incompatibilities.adoc +++ b/src/main/asciidoc/_chapters/appendix_hbase_incompatibilities.adoc @@ -125,7 +125,7 @@ HBase 2.0 introduces following changes to the RegionObserver interface. ==== WALObserver HBase 2.0 introduces following changes to the WALObserver interface. -====== [−] interface WALObserver +===== [−] interface WALObserver [cols="1,1", frame="all"] |=== | Change | Result @@ -176,7 +176,7 @@ org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.preStoreFileReaderOpe ==== IPC ==== Scheduler changes: -1. Following methods became abstract: +*Following methods became abstract:* package org.apache.hadoop.hbase.ipc @@ -197,7 +197,7 @@ org/apache/hadoop/hbase/ipc/RpcScheduler.dispatch:(Lorg/apache/hadoop/hbase/ipc/ | Return value type has been changed from void to boolean.| This method has been removed because the return type is part of the method signature. A client program may be interrupted by NoSuchMethodError exception. |=== -2. Following abstract methods have been removed: +*Following abstract methods have been removed:* ===== [−]interface PriorityFunction (2) [cols="1,1", frame="all"] diff --git a/src/main/asciidoc/book.adoc b/src/main/asciidoc/book.adoc index 667e5c6ab8..a2c4bc19ae 100644 --- a/src/main/asciidoc/book.adoc +++ b/src/main/asciidoc/book.adoc @@ -40,11 +40,13 @@ :leveloffset: 0 // Logo for HTML -- doesn't render in PDF +ifdef::backend-html5[] ++++
Apache HBase Logo
++++ +endif::[] // The directory is called _chapters because asciidoctor skips direct // processing of files found in directories starting with an _. This diff --git a/src/main/asciidoc/images b/src/main/asciidoc/images index 02e8e9402d..06d04d0edb 120000 --- a/src/main/asciidoc/images +++ b/src/main/asciidoc/images @@ -1 +1 @@ -../../site/resources/images/ \ No newline at end of file +../site/resources/images \ No newline at end of file diff --git a/src/main/site/site.xml b/src/main/site/site.xml index 85e073e7ea..5af0cabf8e 100644 --- a/src/main/site/site.xml +++ b/src/main/site/site.xml @@ -35,7 +35,7 @@ See HBASE-14785 and HBASE-21005 for more info. --> com.github.joshelser maven-fluido-skin - 1.4-HBase + 1.4.1-HBase @@ -71,11 +71,10 @@ - - + - + ]]> -- 2.20.1