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/03/15 11:30:45 UTC
[1/5] camel git commit: Sorted
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x 8ac065074 -> 3ab1c2089
refs/heads/camel-2.15.x 78bcbf135 -> 52dfc90e5
refs/heads/master c0e3bdf1d -> 5804f4880
Sorted
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8fb2d4b3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8fb2d4b3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8fb2d4b3
Branch: refs/heads/master
Commit: 8fb2d4b30bc87d3a0663e0682e7e5431a7c8770a
Parents: c0e3bdf
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 15 11:25:02 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 15 11:25:02 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8fb2d4b3/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 394684f..db3ad5f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -631,27 +631,27 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-base64</artifactId>
+ <artifactId>camel-barcode</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-beanio</artifactId>
+ <artifactId>camel-base64</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-beanstalk</artifactId>
+ <artifactId>camel-bean-validator</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-bean-validator</artifactId>
+ <artifactId>camel-beanio</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-barcode</artifactId>
+ <artifactId>camel-beanstalk</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -661,17 +661,17 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-boon</artifactId>
+ <artifactId>camel-blueprint</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-box</artifactId>
+ <artifactId>camel-boon</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-blueprint</artifactId>
+ <artifactId>camel-box</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
[3/5] camel git commit: Upgrade year to 2015
Posted by da...@apache.org.
Upgrade year to 2015
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5804f488
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5804f488
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5804f488
Branch: refs/heads/master
Commit: 5804f48809d51953e47be23db58b75377dc0f8f8
Parents: 109dfea
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 15 11:31:57 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 15 11:31:57 2015 +0100
----------------------------------------------------------------------
apache-camel/src/main/release/NOTICE.txt | 2 +-
apache-camel/src/main/resources/META-INF/NOTICE.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5804f488/apache-camel/src/main/release/NOTICE.txt
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/release/NOTICE.txt b/apache-camel/src/main/release/NOTICE.txt
index c089123..c81e726 100644
--- a/apache-camel/src/main/release/NOTICE.txt
+++ b/apache-camel/src/main/release/NOTICE.txt
@@ -5,7 +5,7 @@
=========================================================================
Apache Camel
-Copyright 2007-2014 The Apache Software Foundation
+Copyright 2007-2015 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/camel/blob/5804f488/apache-camel/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/resources/META-INF/NOTICE.txt b/apache-camel/src/main/resources/META-INF/NOTICE.txt
index 6da31b0..09e982c 100644
--- a/apache-camel/src/main/resources/META-INF/NOTICE.txt
+++ b/apache-camel/src/main/resources/META-INF/NOTICE.txt
@@ -5,7 +5,7 @@
=========================================================================
Apache Camel
-Copyright 2007-2014 The Apache Software Foundation
+Copyright 2007-2015 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
[2/5] camel git commit: Add boom to kit
Posted by da...@apache.org.
Add boom to kit
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/109dfea7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/109dfea7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/109dfea7
Branch: refs/heads/master
Commit: 109dfea7aade9dc2f5046168d523e1cfb50c8c03
Parents: 8fb2d4b
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 15 11:26:29 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 15 11:26:29 2015 +0100
----------------------------------------------------------------------
apache-camel/pom.xml | 4 ++++
apache-camel/src/main/descriptors/common-bin.xml | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/109dfea7/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index f39f2d7..07c7517 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -125,6 +125,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-boon</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-cache</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/109dfea7/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index f044822..69ae8ab 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -36,13 +36,13 @@
<include>org.apache.camel:camel-bam</include>
<include>org.apache.camel:camel-barcode</include>
<include>org.apache.camel:camel-base64</include>
+ <include>org.apache.camel:camel-bean-validator</include>
<include>org.apache.camel:camel-beanio</include>
<include>org.apache.camel:camel-beanstalk</include>
- <include>org.apache.camel:camel-bean-validator</include>
<include>org.apache.camel:camel-bindy</include>
+ <include>org.apache.camel:camel-blueprint</include>
<include>org.apache.camel:camel-boon</include>
<include>org.apache.camel:camel-box</include>
- <include>org.apache.camel:camel-blueprint</include>
<include>org.apache.camel:camel-cache</include>
<include>org.apache.camel:camel-cassandraql</include>
<include>org.apache.camel:camel-castor</include>
[5/5] camel git commit: Upgrade year to 2015
Posted by da...@apache.org.
Upgrade year to 2015
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3ab1c208
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3ab1c208
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3ab1c208
Branch: refs/heads/camel-2.14.x
Commit: 3ab1c208974aa89e546b7c9f9d773599c4bfef0f
Parents: 8ac0650
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 15 11:31:57 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 15 11:32:25 2015 +0100
----------------------------------------------------------------------
apache-camel/src/main/release/NOTICE.txt | 2 +-
apache-camel/src/main/resources/META-INF/NOTICE.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3ab1c208/apache-camel/src/main/release/NOTICE.txt
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/release/NOTICE.txt b/apache-camel/src/main/release/NOTICE.txt
index c089123..c81e726 100644
--- a/apache-camel/src/main/release/NOTICE.txt
+++ b/apache-camel/src/main/release/NOTICE.txt
@@ -5,7 +5,7 @@
=========================================================================
Apache Camel
-Copyright 2007-2014 The Apache Software Foundation
+Copyright 2007-2015 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/camel/blob/3ab1c208/apache-camel/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/resources/META-INF/NOTICE.txt b/apache-camel/src/main/resources/META-INF/NOTICE.txt
index 6da31b0..09e982c 100644
--- a/apache-camel/src/main/resources/META-INF/NOTICE.txt
+++ b/apache-camel/src/main/resources/META-INF/NOTICE.txt
@@ -5,7 +5,7 @@
=========================================================================
Apache Camel
-Copyright 2007-2014 The Apache Software Foundation
+Copyright 2007-2015 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
[4/5] camel git commit: Upgrade year to 2015
Posted by da...@apache.org.
Upgrade year to 2015
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/52dfc90e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/52dfc90e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/52dfc90e
Branch: refs/heads/camel-2.15.x
Commit: 52dfc90e509a8913202490d778aa8a03d168bc1f
Parents: 78bcbf1
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 15 11:31:57 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 15 11:32:15 2015 +0100
----------------------------------------------------------------------
apache-camel/src/main/release/NOTICE.txt | 2 +-
apache-camel/src/main/resources/META-INF/NOTICE.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/52dfc90e/apache-camel/src/main/release/NOTICE.txt
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/release/NOTICE.txt b/apache-camel/src/main/release/NOTICE.txt
index c089123..c81e726 100644
--- a/apache-camel/src/main/release/NOTICE.txt
+++ b/apache-camel/src/main/release/NOTICE.txt
@@ -5,7 +5,7 @@
=========================================================================
Apache Camel
-Copyright 2007-2014 The Apache Software Foundation
+Copyright 2007-2015 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/camel/blob/52dfc90e/apache-camel/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/resources/META-INF/NOTICE.txt b/apache-camel/src/main/resources/META-INF/NOTICE.txt
index 6da31b0..09e982c 100644
--- a/apache-camel/src/main/resources/META-INF/NOTICE.txt
+++ b/apache-camel/src/main/resources/META-INF/NOTICE.txt
@@ -5,7 +5,7 @@
=========================================================================
Apache Camel
-Copyright 2007-2014 The Apache Software Foundation
+Copyright 2007-2015 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).