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 2015/11/29 10:02:12 UTC
[1/2] camel git commit: Jackson osgi import should be 2.6 or better.
Repository: camel
Updated Branches:
refs/heads/master ccdd8b5de -> 98d4f6af3
Jackson osgi import should be 2.6 or better.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8dfbed1b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8dfbed1b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8dfbed1b
Branch: refs/heads/master
Commit: 8dfbed1bd59365dbc78989283cbed4cd35e4b0b8
Parents: ccdd8b5
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Nov 29 09:28:07 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Nov 29 09:28:07 2015 +0100
----------------------------------------------------------------------
components/camel-jackson/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8dfbed1b/components/camel-jackson/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jackson/pom.xml b/components/camel-jackson/pom.xml
index aa0620b..0cca940 100644
--- a/components/camel-jackson/pom.xml
+++ b/components/camel-jackson/pom.xml
@@ -31,7 +31,7 @@
<properties>
<camel.osgi.import.before.defaults>
- com.fasterxml.jackson.*;version="[2.3,3)"
+ com.fasterxml.jackson.*;version="[2.6,3)"
</camel.osgi.import.before.defaults>
<camel.osgi.export.pkg>org.apache.camel.component.jackson.*</camel.osgi.export.pkg>
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=json-jackson</camel.osgi.export.service>
[2/2] camel git commit: CAMEL-9375: camel-tarfile - TarSplitter
includes one extra empty entry at the end
Posted by da...@apache.org.
CAMEL-9375: camel-tarfile - TarSplitter includes one extra empty entry at the end
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/98d4f6af
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/98d4f6af
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/98d4f6af
Branch: refs/heads/master
Commit: 98d4f6af37bffed6d0af72d3a89cff11d2e9ea1b
Parents: 8dfbed1
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Nov 29 10:01:59 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Nov 29 10:01:59 2015 +0100
----------------------------------------------------------------------
.../camel/dataformat/tarfile/TarSplitterRouteIssueTest.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/98d4f6af/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteIssueTest.java
----------------------------------------------------------------------
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteIssueTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteIssueTest.java
index 2e785ad..7bbf813 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteIssueTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteIssueTest.java
@@ -36,6 +36,10 @@ public class TarSplitterRouteIssueTest extends CamelTestSupport {
template.sendBody("seda:decompressFiles", new File("src/test/resources/data/tarfile3.tar"));
+ // TODO: a bug which causes the TarSplitter to include an extra empty entry
+ // the bug is in the TarIterator hasNext / next
+ Thread.sleep(2000);
+
assertMockEndpointsSatisfied();
}
@@ -59,9 +63,8 @@ public class TarSplitterRouteIssueTest extends CamelTestSupport {
from("seda:decompressFiles")
.split(new TarSplitter()).streaming().shareUnitOfWork()
- .log("we are splitting")
+ .to("log:entry")
.to("mock:entry");
- //.to("file:target/tar/?fileName=decompressed.txt&fileExist=Append");
}
};
}