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/04 09:32:27 UTC
[1/2] camel git commit: Downgrade the spring retry version
Repository: camel
Updated Branches:
refs/heads/master bb38c204e -> 15174ce7b
Downgrade the spring retry version
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/15174ce7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/15174ce7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/15174ce7
Branch: refs/heads/master
Commit: 15174ce7bf92d2b589f899f859897263f7d13ac3
Parents: 7189b56
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Mar 4 16:31:57 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Mar 4 16:32:16 2015 +0800
----------------------------------------------------------------------
parent/pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/15174ce7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 958c7eb..c50aaf6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -432,7 +432,8 @@
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
<spring-ldap-version>2.0.2.RELEASE</spring-ldap-version>
<spring-ldap-bundle-version>2.0.2.RELEASE_1</spring-ldap-bundle-version>
- <spring-retry-version>1.1.0.RELEASE</spring-retry-version>
+ <!-- spring 1.1.0 is not OSGi bundle any more -->
+ <spring-retry-version>1.0.3.RELEASE</spring-retry-version>
<!-- Spring 4 can be used in OSGi, but not with spring-dm. Allow Spring 4 for the bundle imports. -->
<spring-version-range>[3.2,5)</spring-version-range>
<!-- However, spring-dm does not support spring 4.x so import-range must be 3.x for the -->
Re: [1/2] camel git commit: Downgrade the spring retry version
Posted by Willem Jiang <wi...@gmail.com>.
Current Apache Camel Karaf feature doesn’t specify the spring version, the spring bundle is provided by Karaf, so we don’t have the hard dependency of Spring version.
But for some other spring projects beside of spring core, we may need to provide OSGi bundle in ServiceMix.
--
Willem Jiang
Red Hat, Inc.
Web: http://www.redhat.com
Blog: http://willemjiang.blogspot.com (English)
http://jnn.iteye.com (Chinese)
Twitter: willemjiang
Weibo: 姜宁willem
On March 4, 2015 at 5:03:57 PM, Jean-Baptiste Onofré (jb@nanthrax.net) wrote:
> Hi
>
> Spring 4.1.5.RELEASE bundles are already done and they will be included
> in next bundles release (plan tonight or tomorrow morning).
>
> Regards
> JB
>
> On 03/04/2015 09:46 AM, Claus Ibsen wrote:
> > You should ask the SMX team to cut osgi bundles of the spring libraries.
> >
> > Non OSGi users should not hold back because of lack of osgi bundles.
> >
> >
> > On Wed, Mar 4, 2015 at 9:32 AM, wrote:
> >> Repository: camel
> >> Updated Branches:
> >> refs/heads/master bb38c204e -> 15174ce7b
> >>
> >>
> >> Downgrade the spring retry version
> >>
> >>
> >> Project: http://git-wip-us.apache.org/repos/asf/camel/repo
> >> Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/15174ce7
> >> Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/15174ce7
> >> Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/15174ce7
> >>
> >> Branch: refs/heads/master
> >> Commit: 15174ce7bf92d2b589f899f859897263f7d13ac3
> >> Parents: 7189b56
> >> Author: Willem Jiang
> >> Authored: Wed Mar 4 16:31:57 2015 +0800
> >> Committer: Willem Jiang
> >> Committed: Wed Mar 4 16:32:16 2015 +0800
> >>
> >> ----------------------------------------------------------------------
> >> parent/pom.xml | 3 ++-
> >> 1 file changed, 2 insertions(+), 1 deletion(-)
> >> ----------------------------------------------------------------------
> >>
> >>
> >> http://git-wip-us.apache.org/repos/asf/camel/blob/15174ce7/parent/pom.xml
> >> ----------------------------------------------------------------------
> >> diff --git a/parent/pom.xml b/parent/pom.xml
> >> index 958c7eb..c50aaf6 100644
> >> --- a/parent/pom.xml
> >> +++ b/parent/pom.xml
> >> @@ -432,7 +432,8 @@
> >> 1.0.0-20090215
> >> 2.0.2.RELEASE
> >> 2.0.2.RELEASE_1
> >> - 1.1.0.RELEASE
> >> +
> >> + 1.0.3.RELEASE
> >>
> >> [3.2,5)
> >>
> >>
> >
> >
> >
>
> --
> Jean-Baptiste Onofré
> jbonofre@apache.org
> http://blog.nanthrax.net
> Talend - http://www.talend.com
>
Re: [1/2] camel git commit: Downgrade the spring retry version
Posted by Jean-Baptiste Onofré <jb...@nanthrax.net>.
Hi
Spring 4.1.5.RELEASE bundles are already done and they will be included
in next bundles release (plan tonight or tomorrow morning).
Regards
JB
On 03/04/2015 09:46 AM, Claus Ibsen wrote:
> You should ask the SMX team to cut osgi bundles of the spring libraries.
>
> Non OSGi users should not hold back because of lack of osgi bundles.
>
>
> On Wed, Mar 4, 2015 at 9:32 AM, <ni...@apache.org> wrote:
>> Repository: camel
>> Updated Branches:
>> refs/heads/master bb38c204e -> 15174ce7b
>>
>>
>> Downgrade the spring retry version
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/camel/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/15174ce7
>> Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/15174ce7
>> Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/15174ce7
>>
>> Branch: refs/heads/master
>> Commit: 15174ce7bf92d2b589f899f859897263f7d13ac3
>> Parents: 7189b56
>> Author: Willem Jiang <wi...@gmail.com>
>> Authored: Wed Mar 4 16:31:57 2015 +0800
>> Committer: Willem Jiang <wi...@gmail.com>
>> Committed: Wed Mar 4 16:32:16 2015 +0800
>>
>> ----------------------------------------------------------------------
>> parent/pom.xml | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/camel/blob/15174ce7/parent/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/parent/pom.xml b/parent/pom.xml
>> index 958c7eb..c50aaf6 100644
>> --- a/parent/pom.xml
>> +++ b/parent/pom.xml
>> @@ -432,7 +432,8 @@
>> <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
>> <spring-ldap-version>2.0.2.RELEASE</spring-ldap-version>
>> <spring-ldap-bundle-version>2.0.2.RELEASE_1</spring-ldap-bundle-version>
>> - <spring-retry-version>1.1.0.RELEASE</spring-retry-version>
>> + <!-- spring 1.1.0 is not OSGi bundle any more -->
>> + <spring-retry-version>1.0.3.RELEASE</spring-retry-version>
>> <!-- Spring 4 can be used in OSGi, but not with spring-dm. Allow Spring 4 for the bundle imports. -->
>> <spring-version-range>[3.2,5)</spring-version-range>
>> <!-- However, spring-dm does not support spring 4.x so import-range must be 3.x for the -->
>>
>
>
>
--
Jean-Baptiste Onofré
jbonofre@apache.org
http://blog.nanthrax.net
Talend - http://www.talend.com
Re: [1/2] camel git commit: Downgrade the spring retry version
Posted by Claus Ibsen <cl...@gmail.com>.
You should ask the SMX team to cut osgi bundles of the spring libraries.
Non OSGi users should not hold back because of lack of osgi bundles.
On Wed, Mar 4, 2015 at 9:32 AM, <ni...@apache.org> wrote:
> Repository: camel
> Updated Branches:
> refs/heads/master bb38c204e -> 15174ce7b
>
>
> Downgrade the spring retry version
>
>
> Project: http://git-wip-us.apache.org/repos/asf/camel/repo
> Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/15174ce7
> Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/15174ce7
> Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/15174ce7
>
> Branch: refs/heads/master
> Commit: 15174ce7bf92d2b589f899f859897263f7d13ac3
> Parents: 7189b56
> Author: Willem Jiang <wi...@gmail.com>
> Authored: Wed Mar 4 16:31:57 2015 +0800
> Committer: Willem Jiang <wi...@gmail.com>
> Committed: Wed Mar 4 16:32:16 2015 +0800
>
> ----------------------------------------------------------------------
> parent/pom.xml | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/15174ce7/parent/pom.xml
> ----------------------------------------------------------------------
> diff --git a/parent/pom.xml b/parent/pom.xml
> index 958c7eb..c50aaf6 100644
> --- a/parent/pom.xml
> +++ b/parent/pom.xml
> @@ -432,7 +432,8 @@
> <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
> <spring-ldap-version>2.0.2.RELEASE</spring-ldap-version>
> <spring-ldap-bundle-version>2.0.2.RELEASE_1</spring-ldap-bundle-version>
> - <spring-retry-version>1.1.0.RELEASE</spring-retry-version>
> + <!-- spring 1.1.0 is not OSGi bundle any more -->
> + <spring-retry-version>1.0.3.RELEASE</spring-retry-version>
> <!-- Spring 4 can be used in OSGi, but not with spring-dm. Allow Spring 4 for the bundle imports. -->
> <spring-version-range>[3.2,5)</spring-version-range>
> <!-- However, spring-dm does not support spring 4.x so import-range must be 3.x for the -->
>
--
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/
[2/2] camel git commit: Fixed the karaf feature validate error
Posted by ni...@apache.org.
Fixed the karaf feature validate error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7189b56d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7189b56d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7189b56d
Branch: refs/heads/master
Commit: 7189b56d99517253d3c4dd1af15a79a4a9d3cc58
Parents: bb38c20
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Mar 4 16:31:10 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Mar 4 16:32:16 2015 +0800
----------------------------------------------------------------------
platforms/karaf/features/pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7189b56d/platforms/karaf/features/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml
index 77f1d9c..6fb3e7c 100644
--- a/platforms/karaf/features/pom.xml
+++ b/platforms/karaf/features/pom.xml
@@ -163,6 +163,13 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <version>2.6</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>