You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/03/05 13:19:15 UTC
[1/2] camel git commit: [CAMEL-8441] Add required 3rd party
dependencies to the BOM
Repository: camel
Updated Branches:
refs/heads/master 8fe1c6aba -> f13ed8e9b
[CAMEL-8441] Add required 3rd party dependencies to the BOM
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d21dff2c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d21dff2c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d21dff2c
Branch: refs/heads/master
Commit: d21dff2c5ba0b2e59c3f1524f9ace5bf0833ea7f
Parents: 8fe1c6a
Author: Thomas Diesler <th...@jboss.com>
Authored: Thu Mar 5 10:00:56 2015 +0100
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Mar 5 19:43:54 2015 +0800
----------------------------------------------------------------------
parent/pom.xml | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 104 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d21dff2c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b8b697e..4b07bfe 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1786,6 +1786,55 @@
<version>${project.version}</version>
</dependency>
+ <!-- abdera dependencies-->
+ <dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-core</artifactId>
+ <version>${abdera-version}</version>
+ </dependency>
+
+ <!-- cxf dependencies -->
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-management</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-local</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-jms</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-mex</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-rm</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.services.sts</groupId>
+ <artifactId>cxf-services-sts-core</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.services.ws-discovery</groupId>
+ <artifactId>cxf-services-ws-discovery-api</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+
<!-- API -->
<dependency>
<groupId>com.googlecode.concurrentlinkedhashmap</groupId>
@@ -1826,6 +1875,13 @@
<version>1.4.5</version>
</dependency>
+ <!-- beanshell -->
+ <dependency>
+ <groupId>org.beanshell</groupId>
+ <artifactId>bsh</artifactId>
+ <version>${bsh-version}</version>
+ </dependency>
+
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -1893,6 +1949,23 @@
<version>${activemq-version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-rar</artifactId>
+ <version>${activemq-version}</version>
+ <type>rar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-camel</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-all</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean-spring-version}</version>
@@ -2031,6 +2104,18 @@
<version>${castor-bundle-version}</version>
</dependency>
+ <!-- optional hapi dependencies -->
+ <dependency>
+ <groupId>ca.uhn.hapi</groupId>
+ <artifactId>hapi-structures-v24</artifactId>
+ <version>${hapi-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ca.uhn.hapi</groupId>
+ <artifactId>hapi-structures-v25</artifactId>
+ <version>${hapi-version}</version>
+ </dependency>
+
<!-- optional disruptor dependencies -->
<dependency>
<groupId>com.lmax</groupId>
@@ -2052,12 +2137,30 @@
<version>${dropbox-version}</version>
</dependency>
+ <!-- optional lucene dependencies -->
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ <version>${lucene-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${lucene-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <version>${lucene-version}</version>
+ </dependency>
+
<!-- optional mina dependencies -->
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${mina-version}</version>
+ <version>${mina2-version}</version>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
[2/2] camel git commit: CAMEL-8441 Fixed the build error of camel-mina
Posted by ni...@apache.org.
CAMEL-8441 Fixed the build error of camel-mina
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f13ed8e9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f13ed8e9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f13ed8e9
Branch: refs/heads/master
Commit: f13ed8e9b9f94794eaeaabc55ee54e5bc4030b7a
Parents: d21dff2
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Mar 5 20:18:48 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Mar 5 20:18:48 2015 +0800
----------------------------------------------------------------------
parent/pom.xml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f13ed8e9/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4b07bfe..c2224ac 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1792,7 +1792,7 @@
<artifactId>abdera-core</artifactId>
<version>${abdera-version}</version>
</dependency>
-
+
<!-- cxf dependencies -->
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -1834,7 +1834,7 @@
<artifactId>cxf-services-ws-discovery-api</artifactId>
<version>${cxf-version}</version>
</dependency>
-
+
<!-- API -->
<dependency>
<groupId>com.googlecode.concurrentlinkedhashmap</groupId>
@@ -1881,7 +1881,7 @@
<artifactId>bsh</artifactId>
<version>${bsh-version}</version>
</dependency>
-
+
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -1964,7 +1964,7 @@
<artifactId>activemq-all</artifactId>
<version>${activemq-version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
@@ -2115,7 +2115,7 @@
<artifactId>hapi-structures-v25</artifactId>
<version>${hapi-version}</version>
</dependency>
-
+
<!-- optional disruptor dependencies -->
<dependency>
<groupId>com.lmax</groupId>
@@ -2153,14 +2153,14 @@
<artifactId>lucene-queryparser</artifactId>
<version>${lucene-version}</version>
</dependency>
-
+
<!-- optional mina dependencies -->
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${mina2-version}</version>
+ <version>${mina-version}</version>
</dependency>
-
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
Re: [1/2] camel git commit: [CAMEL-8441] Add required 3rd party
dependencies to the BOM
Posted by Claus Ibsen <cl...@gmail.com>.
We got Maven WARN now due duplicates
[WARNING] Some problems were encountered while building the effective
model for org.apache.camel:camel-parent:pom:2.15-SNAPSHOT
[WARNING] 'dependencyManagement.dependencies.dependency.(groupId:artifactId:type:classifier)'
must be unique: org.apache.activemq:activemq-camel:jar -> duplicate
declaration of version ${activemq-version} @
org.apache.camel:camel-parent:[unknown-version],
/Users/davsclaus/workspace/camel/parent/pom.xml, line 1957, column 19
On Thu, Mar 5, 2015 at 1:19 PM, <ni...@apache.org> wrote:
> Repository: camel
> Updated Branches:
> refs/heads/master 8fe1c6aba -> f13ed8e9b
>
>
> [CAMEL-8441] Add required 3rd party dependencies to the BOM
>
>
> Project: http://git-wip-us.apache.org/repos/asf/camel/repo
> Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d21dff2c
> Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d21dff2c
> Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d21dff2c
>
> Branch: refs/heads/master
> Commit: d21dff2c5ba0b2e59c3f1524f9ace5bf0833ea7f
> Parents: 8fe1c6a
> Author: Thomas Diesler <th...@jboss.com>
> Authored: Thu Mar 5 10:00:56 2015 +0100
> Committer: Willem Jiang <wi...@gmail.com>
> Committed: Thu Mar 5 19:43:54 2015 +0800
>
> ----------------------------------------------------------------------
> parent/pom.xml | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 104 insertions(+), 1 deletion(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/d21dff2c/parent/pom.xml
> ----------------------------------------------------------------------
> diff --git a/parent/pom.xml b/parent/pom.xml
> index b8b697e..4b07bfe 100644
> --- a/parent/pom.xml
> +++ b/parent/pom.xml
> @@ -1786,6 +1786,55 @@
> <version>${project.version}</version>
> </dependency>
>
> + <!-- abdera dependencies-->
> + <dependency>
> + <groupId>org.apache.abdera</groupId>
> + <artifactId>abdera-core</artifactId>
> + <version>${abdera-version}</version>
> + </dependency>
> +
> + <!-- cxf dependencies -->
> + <dependency>
> + <groupId>org.apache.cxf</groupId>
> + <artifactId>cxf-rt-management</artifactId>
> + <version>${cxf-version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.cxf</groupId>
> + <artifactId>cxf-rt-transports-local</artifactId>
> + <version>${cxf-version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.cxf</groupId>
> + <artifactId>cxf-rt-transports-jms</artifactId>
> + <version>${cxf-version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.cxf</groupId>
> + <artifactId>cxf-rt-ws-mex</artifactId>
> + <version>${cxf-version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.cxf</groupId>
> + <artifactId>cxf-rt-ws-rm</artifactId>
> + <version>${cxf-version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.cxf</groupId>
> + <artifactId>cxf-rt-ws-security</artifactId>
> + <version>${cxf-version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.cxf.services.sts</groupId>
> + <artifactId>cxf-services-sts-core</artifactId>
> + <version>${cxf-version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.cxf.services.ws-discovery</groupId>
> + <artifactId>cxf-services-ws-discovery-api</artifactId>
> + <version>${cxf-version}</version>
> + </dependency>
> +
> <!-- API -->
> <dependency>
> <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
> @@ -1826,6 +1875,13 @@
> <version>1.4.5</version>
> </dependency>
>
> + <!-- beanshell -->
> + <dependency>
> + <groupId>org.beanshell</groupId>
> + <artifactId>bsh</artifactId>
> + <version>${bsh-version}</version>
> + </dependency>
> +
> <!-- logging -->
> <dependency>
> <groupId>org.slf4j</groupId>
> @@ -1893,6 +1949,23 @@
> <version>${activemq-version}</version>
> </dependency>
> <dependency>
> + <groupId>org.apache.activemq</groupId>
> + <artifactId>activemq-rar</artifactId>
> + <version>${activemq-version}</version>
> + <type>rar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.activemq</groupId>
> + <artifactId>activemq-camel</artifactId>
> + <version>${activemq-version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.activemq</groupId>
> + <artifactId>activemq-all</artifactId>
> + <version>${activemq-version}</version>
> + </dependency>
> +
> + <dependency>
> <groupId>org.apache.xbean</groupId>
> <artifactId>xbean-spring</artifactId>
> <version>${xbean-spring-version}</version>
> @@ -2031,6 +2104,18 @@
> <version>${castor-bundle-version}</version>
> </dependency>
>
> + <!-- optional hapi dependencies -->
> + <dependency>
> + <groupId>ca.uhn.hapi</groupId>
> + <artifactId>hapi-structures-v24</artifactId>
> + <version>${hapi-version}</version>
> + </dependency>
> + <dependency>
> + <groupId>ca.uhn.hapi</groupId>
> + <artifactId>hapi-structures-v25</artifactId>
> + <version>${hapi-version}</version>
> + </dependency>
> +
> <!-- optional disruptor dependencies -->
> <dependency>
> <groupId>com.lmax</groupId>
> @@ -2052,12 +2137,30 @@
> <version>${dropbox-version}</version>
> </dependency>
>
> + <!-- optional lucene dependencies -->
> + <dependency>
> + <groupId>org.apache.lucene</groupId>
> + <artifactId>lucene-analyzers-common</artifactId>
> + <version>${lucene-version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.lucene</groupId>
> + <artifactId>lucene-core</artifactId>
> + <version>${lucene-version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.lucene</groupId>
> + <artifactId>lucene-queryparser</artifactId>
> + <version>${lucene-version}</version>
> + </dependency>
> +
> <!-- optional mina dependencies -->
> <dependency>
> <groupId>org.apache.mina</groupId>
> <artifactId>mina-core</artifactId>
> - <version>${mina-version}</version>
> + <version>${mina2-version}</version>
> </dependency>
> +
> <dependency>
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-simple</artifactId>
>
--
Claus Ibsen
-----------------
Red Hat, Inc.
Email: cibsen@redhat.com
Twitter: davsclaus
Blog: http://davsclaus.com
Author of Camel in Action: http://www.manning.com/ibsen
hawtio: http://hawt.io/
fabric8: http://fabric8.io/