You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/09/09 05:43:59 UTC
[camel] branch master updated: Upgrade hbase
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 84544f7 Upgrade hbase
84544f7 is described below
commit 84544f70f4b696ba966bc0a938deab7d4fe841d8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Sep 9 07:43:37 2020 +0200
Upgrade hbase
---
components/camel-hbase/pom.xml | 12 +++++-------
.../org/apache/camel/component/hbase/model/jaxb.index | 3 ---
.../org/apache/camel/component/hbase/model/HBaseCell.java | 5 -----
.../org/apache/camel/component/hbase/model/HBaseData.java | 3 ---
.../org/apache/camel/component/hbase/model/HBaseRow.java | 5 -----
parent/pom.xml | 2 +-
6 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/components/camel-hbase/pom.xml b/components/camel-hbase/pom.xml
index d16f54d..ca6bebc 100644
--- a/components/camel-hbase/pom.xml
+++ b/components/camel-hbase/pom.xml
@@ -30,13 +30,6 @@
<packaging>jar</packaging>
<name>Camel :: Hbase</name>
<description>Camel HBase component</description>
- <properties>
- <camel.osgi.import.before.defaults>
- javax.xml.bind*;version="[2.2,3.0)",
- org.apache.hadoop.conf;version="[2,3)",
- org.apache.hadoop.hbase.*;version="[1,2)"
- </camel.osgi.import.before.defaults>
- </properties>
<dependencies>
<dependency>
@@ -96,6 +89,11 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
+ <!-- has SNAPSHOT in its pom.xml that causes maven problems -->
+ <exclusion>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.el</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/components/camel-hbase/src/generated/resources/org/apache/camel/component/hbase/model/jaxb.index b/components/camel-hbase/src/generated/resources/org/apache/camel/component/hbase/model/jaxb.index
deleted file mode 100644
index f190274..0000000
--- a/components/camel-hbase/src/generated/resources/org/apache/camel/component/hbase/model/jaxb.index
+++ /dev/null
@@ -1,3 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-HBaseData
-HBaseRow
diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseCell.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseCell.java
index ff4a056..0dd3dc3 100644
--- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseCell.java
+++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseCell.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.hbase.model;
-import javax.xml.bind.annotation.XmlAttribute;
-
/**
* A simplified representation of HBase KeyValue objects, which uses the actual Objects instead of byte arrays. It is
* used in order to abstract the conversion strategy from CellMappingStrategy. It is also used as a template to specify
@@ -42,7 +40,6 @@ public class HBaseCell {
return family;
}
- @XmlAttribute(name = "family")
public void setFamily(String family) {
this.family = family;
}
@@ -51,7 +48,6 @@ public class HBaseCell {
return qualifier;
}
- @XmlAttribute(name = "qualifier")
public void setQualifier(String qualifier) {
this.qualifier = qualifier;
}
@@ -68,7 +64,6 @@ public class HBaseCell {
return valueType;
}
- @XmlAttribute(name = "type")
public void setValueType(Class<?> valueType) {
if (valueType == null) {
throw new IllegalArgumentException("Value type can not be null");
diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseData.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseData.java
index c5f5c37..14e0dfb 100644
--- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseData.java
+++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseData.java
@@ -19,9 +19,6 @@ package org.apache.camel.component.hbase.model;
import java.util.LinkedList;
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "data")
public class HBaseData {
private List<HBaseRow> rows = new LinkedList<>();
diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseRow.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseRow.java
index 8b5fe6b..61421c7 100644
--- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseRow.java
+++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseRow.java
@@ -19,10 +19,6 @@ package org.apache.camel.component.hbase.model;
import java.util.LinkedHashSet;
import java.util.Set;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "row")
public class HBaseRow implements Cloneable {
private Object id;
@@ -52,7 +48,6 @@ public class HBaseRow implements Cloneable {
return rowType;
}
- @XmlAttribute(name = "type")
public void setRowType(Class<?> rowType) {
this.rowType = rowType;
}
diff --git a/parent/pom.xml b/parent/pom.xml
index f620138..b53f572 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -246,7 +246,7 @@
<hawtbuf-version>1.11</hawtbuf-version>
<hawtdispatch-version>1.22</hawtdispatch-version>
<hazelcast-version>4.0.2</hazelcast-version>
- <hbase-version>2.2.3</hbase-version>
+ <hbase-version>2.3.1</hbase-version>
<hdrhistrogram-version>2.1.11</hdrhistrogram-version>
<hibernate-validator-version>6.1.5.Final</hibernate-validator-version>
<hibernate-version>5.4.13.Final</hibernate-version>