You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/11/02 18:10:28 UTC
[hbase-connectors] branch master updated: HBASE-21429
[hbase-connectors] pom refactoring adding kafka dir intermediary
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase-connectors.git
The following commit(s) were added to refs/heads/master by this push:
new 824edc7 HBASE-21429 [hbase-connectors] pom refactoring adding kafka dir intermediary
824edc7 is described below
commit 824edc7d9e93ef7021304e611094b032b725be4f
Author: Michael Stack <st...@apache.org>
AuthorDate: Fri Nov 2 11:07:30 2018 -0700
HBASE-21429 [hbase-connectors] pom refactoring adding kafka dir intermediary
---
hbase-connectors-assembly/pom.xml | 7 ++--
kafka/hbase-kafka-model/pom.xml | 10 +++---
kafka/hbase-kafka-proxy/pom.xml | 20 ++++-------
kafka/pom.xml | 55 ++++++++++++++++++++++++++++++
pom.xml | 71 ++++++++++++++++++++++-----------------
5 files changed, 109 insertions(+), 54 deletions(-)
diff --git a/hbase-connectors-assembly/pom.xml b/hbase-connectors-assembly/pom.xml
index bd6b2ce..6e581ab 100755
--- a/hbase-connectors-assembly/pom.xml
+++ b/hbase-connectors-assembly/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase-connectors</artifactId>
<groupId>org.apache.hbase.connectors</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>hbase-connectors-assembly</artifactId>
<name>Apache HBase Connectors - Assembly</name>
@@ -37,13 +37,12 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.hbase.connectors</groupId>
+ <groupId>org.apache.hbase.connectors.kafka</groupId>
<artifactId>hbase-kafka-proxy</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
- <groupId>org.apache.hbase.connectors</groupId>
+ <groupId>org.apache.hbase.connectors.kafka</groupId>
<artifactId>hbase-kafka-model</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/kafka/hbase-kafka-model/pom.xml b/kafka/hbase-kafka-model/pom.xml
index 44891c2..6834173 100644
--- a/kafka/hbase-kafka-model/pom.xml
+++ b/kafka/hbase-kafka-model/pom.xml
@@ -23,22 +23,20 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hbase.connectors</groupId>
- <artifactId>hbase-connectors</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../..</relativePath>
+ <artifactId>kafka</artifactId>
+ <version>${revision}</version>
+ <relativePath>../</relativePath>
</parent>
-
+ <groupId>org.apache.hbase.connectors.kafka</groupId>
<artifactId>hbase-kafka-model</artifactId>
<name>Apache HBase - Model Objects for Kafka Proxy</name>
<description>Model objects that represent HBase mutations</description>
-
<dependencies>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
diff --git a/kafka/hbase-kafka-proxy/pom.xml b/kafka/hbase-kafka-proxy/pom.xml
index 8259bc9..642f139 100755
--- a/kafka/hbase-kafka-proxy/pom.xml
+++ b/kafka/hbase-kafka-proxy/pom.xml
@@ -23,11 +23,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hbase.connectors</groupId>
- <artifactId>hbase-connectors</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../..</relativePath>
+ <artifactId>kafka</artifactId>
+ <version>${revision}</version>
+ <relativePath>../</relativePath>
</parent>
-
+ <groupId>org.apache.hbase.connectors.kafka</groupId>
<artifactId>hbase-kafka-proxy</artifactId>
<name>Apache HBase - Kafka Proxy</name>
<description>Proxy that forwards HBase replication events to a Kakfa broker</description>
@@ -38,9 +38,7 @@
<kafka-clients.version>2.0.0</kafka-clients.version>
<commons-io.version>2.5</commons-io.version>
</properties>
-
<build>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -74,35 +72,31 @@
</plugins>
</build>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
- </dependency>
+ </dependency>
<dependency>
- <groupId>org.apache.hbase.connectors</groupId>
+ <groupId>org.apache.hbase.connectors.kafka</groupId>
<artifactId>hbase-kafka-model</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-annotations</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
diff --git a/kafka/pom.xml b/kafka/pom.xml
new file mode 100644
index 0000000..c489122
--- /dev/null
+++ b/kafka/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<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/xsd/maven-4.0.0.xsd">
+ <!--
+ /**
+ * 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.
+ */
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.hbase.connectors</groupId>
+ <artifactId>hbase-connectors</artifactId>
+ <version>${revision}</version>
+ <relativePath>../</relativePath>
+ </parent>
+ <artifactId>kafka</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache HBase - Kafka Proxy</name>
+ <description>Kafka Proxy for Apache HBase</description>
+ <modules>
+ <module>hbase-kafka-model</module>
+ <module>hbase-kafka-proxy</module>
+ </modules>
+ <properties>
+ <avro.version>1.7.7</avro.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>${avro.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase.connectors.kafka</groupId>
+ <artifactId>hbase-kafka-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
diff --git a/pom.xml b/pom.xml
index 69838c0..0a6b39c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,8 @@
</parent>
<groupId>org.apache.hbase.connectors</groupId>
<artifactId>hbase-connectors</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <!-- See https://maven.apache.org/maven-ci-friendly.html -->
+ <version>${revision}</version>
<name>Apache HBase Connectors</name>
<packaging>pom</packaging>
<description>
@@ -45,10 +46,9 @@
</license>
</licenses>
<modules>
- <module>kafka/hbase-kafka-model</module>
- <module>kafka/hbase-kafka-proxy</module>
+ <module>kafka</module>
<module>hbase-connectors-assembly</module>
- </modules>
+ </modules>
<scm>
<connection>scm:git:git://gitbox.apache.org/repos/asf/hbase-connectors.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/hbase-connectors.git</developerConnection>
@@ -60,9 +60,14 @@
<url>http://issues.apache.org/jira/browse/HBASE</url>
</issueManagement>
<ciManagement>
+ <!--TODO: Fix this. Hook up this module to travisci or some such-->
<system>hudson</system>
<url>http://hudson.zones.apache.org/hudson/view/HBase/job/HBase-TRUNK/</url>
</ciManagement>
+ <!--Currently mail sent by this gitbox project goes to issues@hbase.
+ git comments are reflected in referenced JIRA issue.
+ https://issues.apache.org/jira/browse/INFRA-16887
+ -->
<mailingLists>
<mailingList>
<name>User List</name>
@@ -106,18 +111,15 @@
</mailingList>
</mailingLists>
<developers/>
- <!--TODO-->
<properties>
+ <!-- See https://maven.apache.org/maven-ci-friendly.html -->
+ <revision>1.0.0-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>
- <maven.min.version>3.3.3</maven.min.version>
- <rename.offset>org.apache.hadoop.hbase.shaded</rename.offset>
- <avro.version>1.7.7</avro.version>
+ <maven.min.version>3.5.0</maven.min.version>
<hbase.version>2.1.0</hbase.version>
<maven.compiler.version>3.6.1</maven.compiler.version>
<exec.maven.version>1.6.0</exec.maven.version>
@@ -125,12 +127,6 @@
</properties>
<dependencyManagement>
<dependencies>
- <!-- Avro dependencies we mostly get transitively, manual version coallescing -->
- <dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
- <version>${avro.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-annotations</artifactId>
@@ -145,30 +141,42 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
<version>${hbase.version}</version>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.hbase.connectors</groupId>
- <artifactId>hbase-kafka-proxy</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hbase.connectors</groupId>
- <artifactId>hbase-kafka-model</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
<build>
<pluginManagement>
<plugins>
+ <!-- See https://maven.apache.org/maven-ci-friendly.html-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>1.0.1</version>
+ <configuration>
+ <updatePomFile>true</updatePomFile>
+ </configuration>
+ <executions>
+ <execution>
+ <id>flatten</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>flatten.clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
@@ -252,11 +260,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M2</version>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
- <version>1.0-beta-6</version>
+ <version>1.0-beta-9</version>
</dependency>
</dependencies>
<!-- version set by parent -->