From 3f12823292f1e1019937208a9d83521021a8b504 Mon Sep 17 00:00:00 2001 From: Peter Somogyi Date: Fri, 22 Feb 2019 12:36:44 +0100 Subject: [PATCH] HBASE-21667 Move to latest ASF Parent POM Signed-off-by: Josh Elser --- hbase-build-configuration/pom.xml | 1 - pom.xml | 84 ++----------------- src/main/asciidoc/book.adoc | 2 + .../custom/project-info-report.properties | 24 ------ src/main/site/site.xml | 20 ++--- 5 files changed, 18 insertions(+), 113 deletions(-) diff --git a/hbase-build-configuration/pom.xml b/hbase-build-configuration/pom.xml index fb76462c5d..3f34efba56 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 58202cee1b..1e56f53ba1 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 @@ -1222,8 +1175,6 @@ org.apache.maven.plugins maven-site-plugin - ${maven.site.version} - false @@ -1432,8 +1383,6 @@ 3.6 3.6.1 3.3.6 - - 4.1 4.5.3 4.4.6 3.2.1 @@ -1448,7 +1397,7 @@ 2.3.2 3.0.1-b08 6.1.14 - 9.1.10.0 + 9.1.13.0 4.12 1.3 4.2.0-incubating @@ -1490,17 +1439,10 @@ 1.0.0 1.8 3.3.0 - 2.17 3.6.1 3.0.1 + 3.0.0 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 @@ -1508,13 +1450,6 @@ 2.12 1.0.1 2.1.0 - - /usr - /etc/hbase - /var/log/hbase - /var/run/hbase - 1 - ${project.artifactId}-${project.version} @@ -1526,7 +1461,6 @@ hbase-rsgroup-${project.version}-tests.jar hbase-mapreduce-${project.version}-tests.jar bash - 2.21.0 surefire-junit47 false @@ -3455,7 +3389,6 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven.compiler.version} javac-with-errorprone true @@ -3508,22 +3441,20 @@ maven-project-info-reports-plugin - 2.9 - cim 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 @@ -3538,7 +3469,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven.javadoc.version} 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/site/custom/project-info-report.properties b/src/main/site/custom/project-info-report.properties index 912339e26e..1d49aea40f 100644 --- a/src/main/site/custom/project-info-report.properties +++ b/src/main/site/custom/project-info-report.properties @@ -15,30 +15,6 @@ # specific language governing permissions and limitations # under the License. -report.cim.access = Access -report.cim.anthill.intro = Apache HBase™ uses {Anthill, http://www.anthillpro.com/html/products/anthillos/}. -report.cim.bamboo.intro = Apache HBase™ uses {Bamboo, http://www.atlassian.com/software/bamboo/}. -report.cim.buildforge.intro = Apache HBase™ uses {Build Forge, http://www-306.ibm.com/software/awdtools/buildforge/enterprise/}. -report.cim.continuum.intro = Apache HBase™ uses {Continuum, http://continuum.apache.org/}. -report.cim.cruisecontrol.intro = Apache HBase™ uses {CruiseControl, http://cruisecontrol.sourceforge.net/}. -report.cim.description = These are the definitions of all continuous integration processes that builds and tests code on a frequent, regular basis. -report.cim.general.intro = Apache HBase™ uses Continuous Integration System. -report.cim.hudson.intro = Apache HBase™ uses {Hudson, http://hudson-ci.org/}. -report.cim.jenkins.intro = Apache HBase™ uses {Jenkins, http://jenkins-ci.org/}. -report.cim.luntbuild.intro = Apache HBase™ uses {Luntbuild, http://luntbuild.javaforge.com/}. -report.cim.travis.intro = Apache HBase™ uses {Travis CI, https://travis-ci.org/}. -report.cim.name = Continuous Integration -report.cim.nocim = No continuous integration management system is defined. Please check back at a later date. -report.cim.notifiers.column.address = Address -report.cim.notifiers.column.configuration = Configuration -report.cim.notifiers.column.type = Type -report.cim.notifiers.intro = Configuration for notifying developers/users when a build is unsuccessful, including user information and notification mode. -report.cim.notifiers.nolist = No notifiers are defined. Please check back at a later date. -report.cim.notifiers.title = Notifiers -report.cim.nourl = No url to the continuous integration system is defined. -report.cim.overview.title = Overview -report.cim.title = Continuous Integration -report.cim.url = This is a link to the continuous integration system used by the project: report.dependencies.column.artifactId = ArtifactId report.dependencies.column.classifier = Classifier report.dependencies.column.description = Description diff --git a/src/main/site/site.xml b/src/main/site/site.xml index 85e073e7ea..8dbd602828 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.7.1-HBase @@ -71,36 +71,34 @@ - + - + ]]> - + - - + + - + - - - + + - -- 2.19.1