You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2014/09/14 11:53:39 UTC

git commit: expand the Spring version range to include Spring 4.0.x after we set Spring 4 as default

Repository: camel
Updated Branches:
  refs/heads/master c60adc08b -> f6e943227


expand the Spring version range to include Spring 4.0.x after we set Spring 4 as default


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f6e94322
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f6e94322
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f6e94322

Branch: refs/heads/master
Commit: f6e9432274c5ce1a3431211595a15a1250129a66
Parents: c60adc0
Author: cmueller <cm...@apache.org>
Authored: Sun Sep 14 11:53:24 2014 +0200
Committer: cmueller <cm...@apache.org>
Committed: Sun Sep 14 11:53:24 2014 +0200

----------------------------------------------------------------------
 parent/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/f6e94322/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9001ae5..193c3ee 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -404,8 +404,7 @@
     <spring-ldap-version>1.3.1.RELEASE</spring-ldap-version>
     <spring-ldap-bundle-version>1.3.1.RELEASE_2</spring-ldap-bundle-version>
     <spring-retry-version>1.0.3.RELEASE</spring-retry-version>
-    <!-- spring-dm does not support spring 4.x so import-range must be 3.x only until a solution in karaf exists -->
-    <spring-version-range>[3.2,4)</spring-version-range>
+    <spring-version-range>[3.2,4.1)</spring-version-range>
     <spring-version>${spring4-version}</spring-version>
     <spring32-version>3.2.11.RELEASE</spring32-version>
     <spring4-version>4.0.7.RELEASE</spring4-version>

Re: git commit: expand the Spring version range to include Spring 4.0.x after we set Spring 4 as default

Posted by Christian Müller <ch...@gmail.com>.
Without this change, the feature validation fails because the Spring
version range [3.2,4) doesn't include Spring 4.0.7.
RELEASE we are using as default now.

Any idea to solve this in a different way?

Best,
Christian


On Sun, Sep 14, 2014 at 12:27 PM, Claus Ibsen <cl...@gmail.com> wrote:

> Hi
>
> I think this breaks Camel on karaf/smx. Can you double check and
> likely revert back.
> sprin-dm do not support spring 4.x. So when you do like this it
> install spring 4, and spring-dm fails.
>
> We need to keep the range to 3.x. And the karaf/smx guys need to fork
> spring-dm and fix it so it can support spring 4.x also.
>
>
> On Sun, Sep 14, 2014 at 11:53 AM,  <cm...@apache.org> wrote:
> > Repository: camel
> > Updated Branches:
> >   refs/heads/master c60adc08b -> f6e943227
> >
> >
> > expand the Spring version range to include Spring 4.0.x after we set
> Spring 4 as default
> >
> >
> > Project: http://git-wip-us.apache.org/repos/asf/camel/repo
> > Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f6e94322
> > Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f6e94322
> > Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f6e94322
> >
> > Branch: refs/heads/master
> > Commit: f6e9432274c5ce1a3431211595a15a1250129a66
> > Parents: c60adc0
> > Author: cmueller <cm...@apache.org>
> > Authored: Sun Sep 14 11:53:24 2014 +0200
> > Committer: cmueller <cm...@apache.org>
> > Committed: Sun Sep 14 11:53:24 2014 +0200
> >
> > ----------------------------------------------------------------------
> >  parent/pom.xml | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> > ----------------------------------------------------------------------
> >
> >
> >
> http://git-wip-us.apache.org/repos/asf/camel/blob/f6e94322/parent/pom.xml
> > ----------------------------------------------------------------------
> > diff --git a/parent/pom.xml b/parent/pom.xml
> > index 9001ae5..193c3ee 100644
> > --- a/parent/pom.xml
> > +++ b/parent/pom.xml
> > @@ -404,8 +404,7 @@
> >      <spring-ldap-version>1.3.1.RELEASE</spring-ldap-version>
> >
> <spring-ldap-bundle-version>1.3.1.RELEASE_2</spring-ldap-bundle-version>
> >      <spring-retry-version>1.0.3.RELEASE</spring-retry-version>
> > -    <!-- spring-dm does not support spring 4.x so import-range must be
> 3.x only until a solution in karaf exists -->
> > -    <spring-version-range>[3.2,4)</spring-version-range>
> > +    <spring-version-range>[3.2,4.1)</spring-version-range>
> >      <spring-version>${spring4-version}</spring-version>
> >      <spring32-version>3.2.11.RELEASE</spring32-version>
> >      <spring4-version>4.0.7.RELEASE</spring4-version>
> >
>
>
>
> --
> 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/
>

Re: git commit: expand the Spring version range to include Spring 4.0.x after we set Spring 4 as default

Posted by Claus Ibsen <cl...@gmail.com>.
Hi

I think this breaks Camel on karaf/smx. Can you double check and
likely revert back.
sprin-dm do not support spring 4.x. So when you do like this it
install spring 4, and spring-dm fails.

We need to keep the range to 3.x. And the karaf/smx guys need to fork
spring-dm and fix it so it can support spring 4.x also.


On Sun, Sep 14, 2014 at 11:53 AM,  <cm...@apache.org> wrote:
> Repository: camel
> Updated Branches:
>   refs/heads/master c60adc08b -> f6e943227
>
>
> expand the Spring version range to include Spring 4.0.x after we set Spring 4 as default
>
>
> Project: http://git-wip-us.apache.org/repos/asf/camel/repo
> Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f6e94322
> Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f6e94322
> Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f6e94322
>
> Branch: refs/heads/master
> Commit: f6e9432274c5ce1a3431211595a15a1250129a66
> Parents: c60adc0
> Author: cmueller <cm...@apache.org>
> Authored: Sun Sep 14 11:53:24 2014 +0200
> Committer: cmueller <cm...@apache.org>
> Committed: Sun Sep 14 11:53:24 2014 +0200
>
> ----------------------------------------------------------------------
>  parent/pom.xml | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/f6e94322/parent/pom.xml
> ----------------------------------------------------------------------
> diff --git a/parent/pom.xml b/parent/pom.xml
> index 9001ae5..193c3ee 100644
> --- a/parent/pom.xml
> +++ b/parent/pom.xml
> @@ -404,8 +404,7 @@
>      <spring-ldap-version>1.3.1.RELEASE</spring-ldap-version>
>      <spring-ldap-bundle-version>1.3.1.RELEASE_2</spring-ldap-bundle-version>
>      <spring-retry-version>1.0.3.RELEASE</spring-retry-version>
> -    <!-- spring-dm does not support spring 4.x so import-range must be 3.x only until a solution in karaf exists -->
> -    <spring-version-range>[3.2,4)</spring-version-range>
> +    <spring-version-range>[3.2,4.1)</spring-version-range>
>      <spring-version>${spring4-version}</spring-version>
>      <spring32-version>3.2.11.RELEASE</spring32-version>
>      <spring4-version>4.0.7.RELEASE</spring4-version>
>



-- 
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/