You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/06/11 12:58:25 UTC
[camel] branch master updated (838f35d -> fd870f7)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 838f35d camel-main - Include new options in metadata
new 3b2c2aa camel-hdfs: does not work (on Camel Kafka Connector) due to dependencies conflicts
new 5c78d4f Sync Properties
new 2b727c8 Camel-Hdfs: Introduce a property placeholder for guava
new fd870f7 Sync Properties
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-dependencies/pom.xml | 3 +-
components/camel-hdfs/pom.xml | 59 +++++-----------------
.../component/hdfs/HdfsNormalFileHandler.java | 4 +-
.../apache/camel/component/hdfs/HdfsInfoTest.java | 46 -----------------
parent/pom.xml | 3 +-
5 files changed, 19 insertions(+), 96 deletions(-)
delete mode 100644 components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsInfoTest.java
[camel] 03/04: Camel-Hdfs: Introduce a property placeholder for
guava
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2b727c8192fe4802d454d8c7692702d0c0a810c2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jun 11 12:50:39 2020 +0200
Camel-Hdfs: Introduce a property placeholder for guava
---
components/camel-hdfs/pom.xml | 6 +++++-
parent/pom.xml | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/components/camel-hdfs/pom.xml b/components/camel-hdfs/pom.xml
index e508977..d3c18bd 100644
--- a/components/camel-hdfs/pom.xml
+++ b/components/camel-hdfs/pom.xml
@@ -71,12 +71,16 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>27.0-jre</version>
+ <version>${hadoop2-guava-version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 6658e2e..b029bb3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -233,6 +233,7 @@
<guava-eventbus-version>28.2-jre</guava-eventbus-version>
<guice3-version>3.0</guice3-version>
<hadoop2-version>3.2.1</hadoop2-version>
+ <hadoop2-guava-version>27.0-jre</hadoop2-guava-version>
<hadoop2-protobuf-version>2.5.0</hadoop2-protobuf-version>
<hamcrest-version>2.2</hamcrest-version>
<hapi-version>2.3</hapi-version>
[camel] 02/04: Sync Properties
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5c78d4f323715a165d4bb7042fd6408d263e8751
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jun 11 12:10:02 2020 +0200
Sync Properties
---
camel-dependencies/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 0d359ae..cf7db53 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -254,7 +254,7 @@
<guava-eventbus-version>28.2-jre</guava-eventbus-version>
<guice3-version>3.0</guice3-version>
<hadoop2-protobuf-version>2.5.0</hadoop2-protobuf-version>
- <hadoop2-version>2.10.0</hadoop2-version>
+ <hadoop2-version>3.2.1</hadoop2-version>
<hamcrest-version>2.2</hamcrest-version>
<hapi-fhir-version>4.1.0</hapi-fhir-version>
<hapi-version>2.3</hapi-version>
[camel] 01/04: camel-hdfs: does not work (on Camel Kafka Connector)
due to dependencies conflicts
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3b2c2aadb306c9f50a6f9cbafb33f95192708cb2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jun 11 12:09:27 2020 +0200
camel-hdfs: does not work (on Camel Kafka Connector) due to dependencies conflicts
---
components/camel-hdfs/pom.xml | 57 ++++------------------
.../component/hdfs/HdfsNormalFileHandler.java | 4 +-
.../apache/camel/component/hdfs/HdfsInfoTest.java | 46 -----------------
parent/pom.xml | 2 +-
4 files changed, 13 insertions(+), 96 deletions(-)
diff --git a/components/camel-hdfs/pom.xml b/components/camel-hdfs/pom.xml
index 70f792d..e508977 100644
--- a/components/camel-hdfs/pom.xml
+++ b/components/camel-hdfs/pom.xml
@@ -64,12 +64,8 @@
<version>${hadoop2-version}</version>
<exclusions>
<exclusion>
- <groupId>jdk.tools</groupId>
- <artifactId>jdk.tools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -78,53 +74,25 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>27.0-jre</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<version>${hadoop2-version}</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>${commons-configuration-version}</version>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs-client</artifactId>
+ <version>${hadoop2-version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons-lang-version}</version>
</dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>${commons-net-version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>${jackson-version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson-version}</version>
- </dependency>
<!-- testing -->
<dependency>
@@ -152,11 +120,6 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsNormalFileHandler.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsNormalFileHandler.java
index 084e6d6..b372017 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsNormalFileHandler.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsNormalFileHandler.java
@@ -159,12 +159,12 @@ class HdfsNormalFileHandler extends DefaultHdfsFile<OutputStream, InputStream> {
FileSystem fileSystem = hdfsInfo.getFileSystem();
FileUtil.copy(fileSystem, new Path(hdfsPath), outputDest, false, fileSystem.getConf());
try {
- FileUtil.copyMerge(
+ FileUtil.copy(
fileSystem, // src
new Path(hdfsPath),
FileSystem.getLocal(new Configuration()), // dest
new Path(outputDest.toURI()),
- false, fileSystem.getConf(), null);
+ false, fileSystem.getConf());
} catch (IOException e) {
return outputDest;
}
diff --git a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsInfoTest.java b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsInfoTest.java
deleted file mode 100644
index 9bb4960..0000000
--- a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsInfoTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- */
-package org.apache.camel.component.hdfs;
-
-import java.io.IOException;
-
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-
-public class HdfsInfoTest {
-
- private HdfsInfo underTest;
-
- @Test
- public void createHdfsInfo() throws IOException {
- // given
- String hdfsPath = "hdfs://localhost/target/test/multiple-consumers";
- HdfsConfiguration endpointConfig = mock(HdfsConfiguration.class);
-
- // when
- underTest = new HdfsInfoFactory(endpointConfig).newHdfsInfoWithoutAuth(hdfsPath);
-
- // then
- assertThat(underTest, notNullValue());
- assertThat(underTest.getConfiguration(), notNullValue());
- assertThat(underTest.getFileSystem(), notNullValue());
- assertThat(underTest.getPath(), notNullValue());
- }
-}
diff --git a/parent/pom.xml b/parent/pom.xml
index ade56a6..6658e2e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -232,7 +232,7 @@
<gson-version>2.8.5</gson-version>
<guava-eventbus-version>28.2-jre</guava-eventbus-version>
<guice3-version>3.0</guice3-version>
- <hadoop2-version>2.10.0</hadoop2-version>
+ <hadoop2-version>3.2.1</hadoop2-version>
<hadoop2-protobuf-version>2.5.0</hadoop2-protobuf-version>
<hamcrest-version>2.2</hamcrest-version>
<hapi-version>2.3</hapi-version>
[camel] 04/04: Sync Properties
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fd870f77e6407b5b7be6717fece0d69000e4e51d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jun 11 13:01:13 2020 +0200
Sync Properties
---
camel-dependencies/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index cf7db53..5bf4daf 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -253,6 +253,7 @@
<gson-version>2.8.5</gson-version>
<guava-eventbus-version>28.2-jre</guava-eventbus-version>
<guice3-version>3.0</guice3-version>
+ <hadoop2-guava-version>27.0-jre</hadoop2-guava-version>
<hadoop2-protobuf-version>2.5.0</hadoop2-protobuf-version>
<hadoop2-version>3.2.1</hadoop2-version>
<hamcrest-version>2.2</hamcrest-version>