You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ps...@apache.org on 2019/02/22 11:20:12 UTC
[hbase] branch master updated: HBASE-21667 Move to latest ASF
Parent POM
This is an automated email from the ASF dual-hosted git repository.
psomogyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 9af8d58 HBASE-21667 Move to latest ASF Parent POM
9af8d58 is described below
commit 9af8d58d4abe145cef35c3d4abb75b2cb2510451
Author: Peter Somogyi <ps...@apache.org>
AuthorDate: Fri Feb 22 12:19:44 2019 +0100
HBASE-21667 Move to latest ASF Parent POM
Signed-off-by: Josh Elser <el...@apache.org>
---
pom.xml | 91 ++------------------------
src/main/asciidoc/book.adoc | 2 +
src/site/custom/project-info-report.properties | 24 -------
src/site/site.xml | 20 +++---
4 files changed, 16 insertions(+), 121 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6600145..63f82c0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>18</version>
+ <version>21</version>
<relativePath/>
<!-- no parent resolution -->
</parent>
@@ -92,14 +92,6 @@
<module>hbase-backup</module>
<module>hbase-zookeeper</module>
</modules>
- <!--Add apache snapshots in case we want to use unreleased versions of plugins:
- e.g. surefire 2.18-SNAPSHOT-->
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <url>http://repository.apache.org/snapshots/</url>
- </pluginRepository>
- </pluginRepositories>
<scm>
<connection>scm:git:git://gitbox.apache.org/repos/asf/hbase.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/hbase.git</developerConnection>
@@ -109,10 +101,6 @@
<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>
<mailingLists>
<mailingList>
<name>User List</name>
@@ -645,25 +633,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>${maven.dependency.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven.javadoc.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>${maven.shade.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<!--You need this profile. It'll sign your artifacts.
@@ -757,19 +730,6 @@
<version>${surefire.version}</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <!--dfs tests have build dir hardcoded. Clean it as part of
- clean target-->
- <directory>build</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>${buildnumber.maven.version}</version>
@@ -839,10 +799,6 @@
<exclude>log4j.properties</exclude>
<exclude>mapred-queues.xml</exclude>
<exclude>mapred-site.xml</exclude>
- <!--I was seeing this w/o the below addition:
- [ERROR] Failed to execute goal org.apache.maven.plugins:maven-jar-plugin:2.4:jar (default-jar) on project hbase-protocol-shaded: Error assembling JAR: A zip file cannot include itself -> [Help 1]
- -->
- <exclude>*.jar</exclude>
</excludes>
</configuration>
</plugin>
@@ -939,8 +895,6 @@
<exclude>**/.*</exclude>
<exclude>**/*.tgz</exclude>
<exclude>**/*.orig</exclude>
- <exclude>**/8e8ab58dcf39412da19833fcd8f687ac</exclude>
- <exclude>**/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c</exclude>
<exclude>**/0000000000000016310</exclude>
<exclude>**/.idea/**</exclude>
<exclude>**/*.iml</exclude>
@@ -1334,8 +1288,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>${maven.site.version}</version>
- <inherited>false</inherited>
<dependencies>
<dependency>
<!-- add support for ssh/scp -->
@@ -1502,15 +1454,6 @@
<inherited>true</inherited>
<extensions>true</extensions>
</plugin>
- <plugin>
- <!--TODO: Remove after figure how the scala:doc
- target is being passed up on jenkins precommit.
- Otherrwise, w/o this, we fail scaladoc.
- -->
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <version>2.15.2</version>
- </plugin>
</plugins>
</build>
<properties>
@@ -1561,8 +1504,6 @@
<commons-lang3.version>3.6</commons-lang3.version>
<commons-math.version>3.6.1</commons-math.version>
<disruptor.version>3.3.6</disruptor.version>
- <!-- Do not use versions earlier than 3.2.2 due to a security vulnerability -->
- <collections.version>4.1</collections.version>
<httpclient.version>4.5.3</httpclient.version>
<httpcore.version>4.4.6</httpcore.version>
<metrics-core.version>3.2.1</metrics-core.version>
@@ -1575,7 +1516,6 @@
<jersey.version>2.25.1</jersey.version>
<glassfish.jsp.version>2.3.2</glassfish.jsp.version>
<glassfish.el.version>3.0.1-b08</glassfish.el.version>
- <jetty.jspapi.version>6.1.14</jetty.jspapi.version>
<jruby.version>9.1.13.0</jruby.version>
<junit.version>4.12</junit.version>
<hamcrest.version>1.3</hamcrest.version>
@@ -1619,15 +1559,7 @@
<maven.bundle.version>3.3.0</maven.bundle.version>
<maven.checkstyle.version>3.0.0</maven.checkstyle.version>
<maven.compiler.version>3.8.0</maven.compiler.version>
- <maven.dependency.version>3.0.1</maven.dependency.version>
<maven.eclipse.version>2.10</maven.eclipse.version>
- <maven.install.version>2.5.2</maven.install.version>
- <maven.jar.version>3.0.2</maven.jar.version>
- <maven.javadoc.version>3.0.0</maven.javadoc.version>
- <maven.patch.version>1.2</maven.patch.version>
- <maven.shade.version>3.0.0</maven.shade.version>
- <maven.site.version>3.4</maven.site.version>
- <maven.source.version>3.0.1</maven.source.version>
<maven.warbucks.version>1.1.0</maven.warbucks.version>
<os.maven.version>1.5.0.Final</os.maven.version>
<plexus.errorprone.javac.version>2.8.2</plexus.errorprone.javac.version>
@@ -1635,13 +1567,6 @@
<wagon.ssh.version>2.12</wagon.ssh.version>
<xml.maven.version>1.0.1</xml.maven.version>
<hbase-thirdparty.version>2.1.0</hbase-thirdparty.version>
- <!-- General Packaging -->
- <package.prefix>/usr</package.prefix>
- <package.conf.dir>/etc/hbase</package.conf.dir>
- <package.log.dir>/var/log/hbase</package.log.dir>
- <package.pid.dir>/var/run/hbase</package.pid.dir>
- <package.release>1</package.release>
- <final.name>${project.artifactId}-${project.version}</final.name>
<!-- Intraproject jar naming properties -->
<!-- TODO this is pretty ugly, but works for the moment.
Modules are pretty heavy-weight things, so doing this work isn't too bad. -->
@@ -1654,7 +1579,6 @@
<mapreduce.test.jar>hbase-mapreduce-${project.version}-tests.jar</mapreduce.test.jar>
<zookeeper.test.jar>hbase-zookeeper-${project.version}-tests.jar</zookeeper.test.jar>
<shell-executable>bash</shell-executable>
- <surefire.version>2.21.0</surefire.version>
<surefire.provider>surefire-junit47</surefire.provider>
<!-- default: run small & medium, medium with 2 threads -->
<surefire.skipFirstPart>false</surefire.skipFirstPart>
@@ -3665,22 +3589,20 @@
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.9</version>
<reportSets>
<reportSet>
<reports>
- <report>cim</report>
<report>dependencies</report>
<report>dependency-convergence</report>
<report>dependency-info</report>
<report>dependency-management</report>
<report>index</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>mailing-list</report>
+ <report>issue-management</report>
+ <report>licenses</report>
+ <report>mailing-lists</report>
<report>plugin-management</report>
<report>plugins</report>
- <report>project-team</report>
+ <report>team</report>
<report>scm</report>
<report>summary</report>
</reports>
@@ -3695,7 +3617,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven.javadoc.version}</version>
<reportSets>
<!-- Dev API -->
<reportSet>
@@ -3710,7 +3631,6 @@
<sourceFileExcludes>
<exclude>**/generated/*</exclude>
<exclude>**/protobuf/*</exclude>
- <exclude>**/*.scala</exclude>
</sourceFileExcludes>
<excludePackageNames>org.apache.hadoop.hbase.tmpl.common:com.google.protobuf:org.apache.hadoop.hbase.generated*</excludePackageNames>
<show>private</show> <!-- (shows all classes and members) -->
@@ -3753,7 +3673,6 @@
<sourceFileExcludes>
<exclude>**/generated/*</exclude>
<exclude>**/protobuf/*</exclude>
- <exclude>**/*.scala</exclude>
</sourceFileExcludes>
<excludePackageNames>org.apache.hadoop.hbase.tmpl.common:com.google.protobuf:org.apache.hadoop.hbase.generated*</excludePackageNames>
<show>private</show> <!-- (shows all classes and members) -->
diff --git a/src/main/asciidoc/book.adoc b/src/main/asciidoc/book.adoc
index bd2692c..edfbcce 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[]
++++
<div>
<a href="https://hbase.apache.org"><img src="images/hbase_logo_with_orca.png" alt="Apache HBase Logo" /></a>
</div>
++++
+endif::[]
// The directory is called _chapters because asciidoctor skips direct
// processing of files found in directories starting with an _. This
diff --git a/src/site/custom/project-info-report.properties b/src/site/custom/project-info-report.properties
index 912339e..1d49aea 100644
--- a/src/site/custom/project-info-report.properties
+++ b/src/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/site/site.xml b/src/site/site.xml
index ebb7d8d..a468416 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -35,7 +35,7 @@
See HBASE-14785 and HBASE-21005 for more info. -->
<groupId>com.github.joshelser</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.4-HBase</version>
+ <version>1.7.1-HBase</version>
</skin>
<custom>
<fluidoSkin>
@@ -71,36 +71,34 @@
<version position="none"/>
<body>
<head>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"></meta>
+ <![CDATA[<meta name="viewport" content="width=device-width, initial-scale=1.0"></meta>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.2/css/bootstrap-responsive.min.css"/>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/styles/github.min.css"/>
<link rel="stylesheet" href="css/site.css"/>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/highlight.min.js"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/highlight.min.js"></script>]]>
</head>
<menu name="Apache HBase Project">
<item name="Overview" href="index.html"/>
- <item name="License" href="license.html"/>
+ <item name="License" href="licenses.html"/>
<item name="Downloads" href="downloads.html"/>
<item name="Release Notes" href="https://issues.apache.org/jira/browse/HBASE?report=com.atlassian.jira.plugin.system.project:changelog-panel#selectedTab=com.atlassian.jira.plugin.system.project%3Achangelog-panel" />
<item name="Code Of Conduct" href="coc.html"/>
<item name="Blog" href="http://blogs.apache.org/hbase/"/>
- <item name="Mailing Lists" href="mail-lists.html"/>
- <item name="Team" href="team-list.html"/>
+ <item name="Mailing Lists" href="mailing-lists.html"/>
+ <item name="Team" href="team.html"/>
<item name="ReviewBoard" href="https://reviews.apache.org/"/>
<item name="Thanks" href="sponsors.html"/>
<item name="Powered by HBase" href="poweredbyhbase.html"/>
<item name="Other resources" href="resources.html"/>
</menu>
<menu name="Project Information">
- <item name="Project Summary" href="project-summary.html"/>
+ <item name="Project Summary" href="summary.html"/>
<item name="Dependency Information" href="dependency-info.html"/>
- <item name="Team" href="team-list.html"/>
- <item name="Source Repository" href="source-repository.html"/>
- <item name="Issue Tracking" href="issue-tracking.html"/>
+ <item name="Source Repository" href="scm.html"/>
+ <item name="Issue Tracking" href="issue-management.html"/>
<item name="Dependency Management" href="dependency-management.html"/>
<item name="Dependencies" href="dependencies.html"/>
<item name="Dependency Convergence" href="dependency-convergence.html"/>
- <item name="Continuous Integration" href="integration.html"/>
<item name="Plugin Management" href="plugin-management.html"/>
<item name="Plugins" href="plugins.html"/>
</menu>