[maven-release-plugin] copy for tag features-4.5.1
git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx4/features/tags/features-4.5.1@1459335 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 46b7761..cc70079 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -40,6 +40,7 @@
* [SMX4-1380] - Exception when using CXF/SAAJ in ServiceMix 4.5.0
* [SMX4-1399] - incorrect readme.txt files in cxf examples
* [SMX4-1401] - cxf-ws-security-blueprint log4j warning + wrong README info
+ * [SMX4-1405] - NMR example is broken
** Task
* [SMX4-1318] - upgrade to cxf 2.6.6
diff --git a/assemblies/apache-servicemix/src/main/filtered-resources/features.xml b/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
index 1116934..872a815 100644
--- a/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
+++ b/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
@@ -56,7 +56,7 @@
-
-->
<feature name="examples-activemq-camel-blueprint" version="${version}" resolver="(obr)">
- <feature version="${version}">activemq-camel</feature>
+ <feature version="${activemq.version}">activemq-camel</feature>
<feature version="${camel.version}">camel-blueprint</feature>
<bundle>mvn:org.apache.servicemix.examples/activemq-camel-blueprint/${version}</bundle>
</feature>
@@ -155,6 +155,7 @@
</feature>
<feature name="examples-nmr" version="${version}">
+ <feature version="${servicemix.nmr.version}">nmr</feature>
<bundle>mvn:org.apache.servicemix.examples/org.apache.servicemix.examples.nmr.endpoint/${pom.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/org.apache.servicemix.examples.nmr.client/${pom.version}</bundle>
</feature>
diff --git a/pom.xml b/pom.xml
index c9257b5..33179b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,6 +224,7 @@
<scriptengines.version>1.1</scriptengines.version>
<spring.version>3.0.7.RELEASE</spring.version>
<spring.osgi.version>1.2.1</spring.osgi.version>
+ <spring.import.range>[3,4)</spring.import.range>
<wss4j.version>1.6.9</wss4j.version>
<neethi.version>3.0.0</neethi.version>
<xfire.version>1.0.1</xfire.version>
