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 2017/10/06 09:34:12 UTC
[1/3] camel git commit: Revert "camel-bom: fix relative path to
parent pom"
Repository: camel
Updated Branches:
refs/heads/master 5dbd6ffcc -> aa56fd10c
Revert "camel-bom: fix relative path to parent pom"
This reverts commit 497f51e3a400f3e415ddf015a766726e2845ade3.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7c14aa1c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7c14aa1c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7c14aa1c
Branch: refs/heads/master
Commit: 7c14aa1cdce06a5f888508da26fd40fe11bfc490
Parents: 5dbd6ff
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 6 11:27:49 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 6 11:27:49 2017 +0200
----------------------------------------------------------------------
bom/camel-bom/pom.xml | 1 -
bom/target-template-pom.xml | 1 -
2 files changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7c14aa1c/bom/camel-bom/pom.xml
----------------------------------------------------------------------
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 611a3e5..7eb3bb0 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -23,7 +23,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel</artifactId>
<version>2.20.0-SNAPSHOT</version>
- <relativePath>../../apache-camel</relativePath>
</parent>
<artifactId>camel-bom</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/camel/blob/7c14aa1c/bom/target-template-pom.xml
----------------------------------------------------------------------
diff --git a/bom/target-template-pom.xml b/bom/target-template-pom.xml
index 74ab3ab..14cde64 100644
--- a/bom/target-template-pom.xml
+++ b/bom/target-template-pom.xml
@@ -27,7 +27,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel</artifactId>
<version>${project.version}</version>
- <relativePath>../../apache-camel</relativePath>
</parent>
<artifactId>camel-bom</artifactId>
[3/3] camel git commit: Disable non-working bom module. Need to fix
this.
Posted by da...@apache.org.
Disable non-working bom module. Need to fix this.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aa56fd10
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aa56fd10
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aa56fd10
Branch: refs/heads/master
Commit: aa56fd10c71d4ae65c636710249a49f1e72a55e8
Parents: ff197c2
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 6 11:34:05 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 6 11:34:05 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/aa56fd10/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f1ddf31..9d6e4d6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -140,7 +140,9 @@
<modules>
<module>parent</module>
<module>etc</module>
+ <!-- TODO: fix me
<module>bom</module>
+ -->
<module>buildingtools</module>
<module>camel-core</module>
<module>components</module>
[2/3] camel git commit: Fixed camel-master should have been
camel-master-starter in that pom file
Posted by da...@apache.org.
Fixed camel-master should have been camel-master-starter in that pom file
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ff197c22
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ff197c22
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ff197c22
Branch: refs/heads/master
Commit: ff197c224d4d535511f7f2973b1929032f49c755
Parents: 7c14aa1
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 6 11:31:18 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 6 11:31:18 2017 +0200
----------------------------------------------------------------------
apache-camel/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ff197c22/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index dd15392..506906b 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -1845,7 +1845,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-master</artifactId>
+ <artifactId>camel-master-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>