You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2016/01/25 21:44:54 UTC
[16/26] servicemix git commit: SM-2803: Refactor the assembly creation
SM-2803: Refactor the assembly creation
- correct the spring version range
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/a5080efc
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/a5080efc
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/a5080efc
Branch: refs/heads/master
Commit: a5080efcdc49c2d1b28018adbb27e77ae3eb11d6
Parents: 51e6475
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Fri Jan 22 22:28:39 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Fri Jan 22 22:28:39 2016 +0100
----------------------------------------------------------------------
.../features/servicemix-features/src/main/feature/feature.xml | 2 +-
assemblies/features/servicemix-kie/src/main/feature/feature.xml | 4 ++--
parent/pom.xml | 3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/a5080efc/assemblies/features/servicemix-features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-features/src/main/feature/feature.xml b/assemblies/features/servicemix-features/src/main/feature/feature.xml
index b24b54b..088311b 100644
--- a/assemblies/features/servicemix-features/src/main/feature/feature.xml
+++ b/assemblies/features/servicemix-features/src/main/feature/feature.xml
@@ -40,7 +40,7 @@
<feature version="${cxf.version}">cxf-specs</feature>
<feature version="${aries.transaction.version}">transaction</feature>
<feature version="${camel.version}">camel</feature>
- <feature version="[3.2,3.3)">spring-orm</feature>
+ <feature version="${spring-version-range-karaf}">spring-orm</feature>
<feature version="${drools.version}">drools</feature>
<bundle dependency="true">mvn:joda-time/joda-time/${jodatime2.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/a5080efc/assemblies/features/servicemix-kie/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-kie/src/main/feature/feature.xml b/assemblies/features/servicemix-kie/src/main/feature/feature.xml
index 89bd79d..21fcf56 100644
--- a/assemblies/features/servicemix-kie/src/main/feature/feature.xml
+++ b/assemblies/features/servicemix-kie/src/main/feature/feature.xml
@@ -72,8 +72,8 @@
<feature name="kie-spring" version="${drools6.version}"
description="KIE Spring support" start-level="50">
<feature version="${drools6.version}">jbpm</feature>
- <feature version="[3.1,4.0)">spring</feature>
- <feature version="[3.1,4.0)">spring-orm</feature>
+ <feature version="${spring-version-range-karaf}">spring</feature>
+ <feature version="${spring-version-range-karaf}">spring-orm</feature>
<bundle>mvn:org.kie/kie-spring/${drools6.version}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/a5080efc/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 50af50c..b3d79f1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -90,6 +90,9 @@
<servicemix.specs.version>2.5.0</servicemix.specs.version>
<slf4j.version>1.7.12</slf4j.version>
<spring.version>3.2.14.RELEASE_1</spring.version>
+ <!-- spring-dm does not support spring 4.x so import-range must be 3.x for the -->
+ <!-- Karaf features file. -->
+ <spring-version-range-karaf>[3.2,4)</spring-version-range-karaf>
<swagger.bundle.version>1.3.12_1</swagger.bundle.version>
<swagger.core.bundle.version>1.3.12_2</swagger.core.bundle.version>
<swagger.version>1.3.12</swagger.version>