Author: jbonofre
Date: Fri Feb 25 16:09:39 2011
New Revision: 1074609
URL: http://svn.apache.org/viewvc?rev=1074609&view=rev
Log:
[SMX4-766] Upgrade to Felix Framework 3.0.9.
[SMX4-764] Better override of Felix Framework using etc/custom.properties file.
Removed:
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/config.properties
Modified:
servicemix/smx4/features/trunk/RELEASE-NOTES
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties
servicemix/smx4/features/trunk/examples/camel-nmr/README.txt
Modified: servicemix/smx4/features/trunk/RELEASE-NOTES
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/RELEASE-NOTES?rev=1074609&r1=1074608&r2=1074609&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/RELEASE-NOTES (original)
+++ servicemix/smx4/features/trunk/RELEASE-NOTES Fri Feb 25 16:09:39 2011
@@ -93,6 +93,7 @@ Release Notes - ServiceMix 4 - Version 4
* [SMX4-763] - Remove examples/web from the distribution
* [SMX4-764] - Override Apache Felix Framework version to 3.0.8 in the
distribution
* [SMX4-765] - ServiceMix doesn't start with Java 1.5.0
+* [SMX4-766] - Upgrade to Felix Framework 3.0.9
** Improvement
* [SMX4-512] - Upgrade to ActiveMQ 5.3.1
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=1074609&r1=1074608&r2=1074609&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Fri Feb 25 16:09:39 2011
@@ -32,6 +32,10 @@
<packaging>pom</packaging>
<name>Apache ServiceMix :: Features :: Assembly</name>
+ <properties>
+ <felix.framework.version>3.0.9</felix.framework.version>
+ </properties>
+
<dependencies>
<!-- Karaf -->
@@ -58,10 +62,11 @@
<!-- Felix -->
<!-- SMX4-764 - Override the Felix Framework version to use 3.0.8 -->
+ <!-- SMX4-766 - Upgrade to Felix Framework 3.0.9 -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>3.0.8</version>
+ <version>${felix.framework.version}</version>
</dependency>
<!-- ServiceMix Components -->
Modified:
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1074609&r1=1074608&r2=1074609&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
(original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
Fri Feb 25 16:09:39 2011
@@ -37,7 +37,6 @@
<exclude>etc/jre.properties</exclude>
<!-- SMX4-764 - Override Felix Framework version -->
<!-- begin snippet -->
- <exclude>etc/config.properties</exclude>
<exclude>system/org/apache/felix/org.apache.felix.framework/**</exclude>
<!-- end snippet -->
<exclude>LICENSE</exclude>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=1074609&r1=1074608&r2=1074609&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
Fri Feb 25 16:09:39 2011
@@ -36,7 +36,6 @@
<exclude>etc/jre.properties</exclude>
<!-- SMX4-764 - Override the Felix Framework version -->
<!-- begin snippet -->
- <exclude>etc/config.properties</exclude>
<exclude>system/org/apache/felix/org.apache.felix.framework/**</exclude>
<!-- end snippet -->
<exclude>LICENSE</exclude>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties?rev=1074609&r1=1074608&r2=1074609&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties
Fri Feb 25 16:09:39 2011
@@ -22,6 +22,8 @@
# All the values specified here will override the default value.
#
+karaf.framework.felix=${karaf.default.repository}/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar
+
karaf.systemBundlesStartLevel=50
obr.repository.url=http://svn.apache.org/repos/asf/servicemix/smx4/obr-repo/repository.xml
Modified: servicemix/smx4/features/trunk/examples/camel-nmr/README.txt
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-nmr/README.txt?rev=1074609&r1=1074608&r2=1074609&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-nmr/README.txt (original)
+++ servicemix/smx4/features/trunk/examples/camel-nmr/README.txt Fri Feb 25
16:09:39 2011
@@ -54,7 +54,7 @@ Prerequisites for Building and Running t
- JDK 1.5 or higher
- - Maven 2.0.9 or higher (for building)
+ - Maven 2.2.1 or higher (for building)
For more information, see the README in the top-level examples
directory.
