[SMX4-757] Upgrade to Apache ODE 1.3.5.

git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx4/features/trunk@1069703 13f79535-47bb-0310-9956-ffa450edef68
apache · Feb 11, 2011 · 26328f6 · 26328f6
1 parent 365056e
commit 26328f6
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 75 deletions.
diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -626,6 +626,16 @@
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>woodstox-core-asl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.ode</groupId>
+            <artifactId>ode-jbi-karaf</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ode</groupId>
+            <artifactId>ode-jbi-karaf</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -692,7 +702,7 @@
                                 <descriptor>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
                                 <descriptor>file:${basedir}/target/classes/activemq-features.xml</descriptor>
                                 <descriptor>file:${basedir}/target/classes/camel-features.xml</descriptor>
-                                <descriptor>file:${basedir}/target/classes/ode-features.xml</descriptor>
+                                <descriptor>mvn:org.apache.ode/ode-jbi-karaf/${ode.version}/xml/features</descriptor>
                                 <descriptor>file:${basedir}/target/classes/features.xml</descriptor>
                             </descriptors>
                             <features>
@@ -761,7 +771,7 @@
                                     <version>${project.version}</version>
                                     <outputDirectory>target/dependencies</outputDirectory>
                                     <destFileName>servicemix-version.jar</destFileName>
-                                </artifactItem>                               
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>

diff --git a/assembly/src/main/descriptors/unix-bin.xml b/assembly/src/main/descriptors/unix-bin.xml
@@ -190,13 +190,6 @@
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
-        <file>
-            <source>${basedir}/target/classes/ode-features.xml</source>
-            <outputDirectory>system/org/apache/servicemix/ode-jbi-karaf/${ode.version}</outputDirectory>
-            <destName>ode-jbi-karaf-${ode.version}-features.xml</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
 
         <file>
             <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
@@ -375,6 +368,10 @@
                 <include>org.apache.camel.karaf:apache-camel:xml:features</include>
             </includes>
         </dependencySet-->
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <outputFileNameMapping>org/apache/ode/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+        </dependencySet>
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>

diff --git a/assembly/src/main/descriptors/windows-bin.xml b/assembly/src/main/descriptors/windows-bin.xml
@@ -170,13 +170,6 @@
             <fileMode>0644</fileMode>
             <lineEnding>dos</lineEnding>
         </file>
-        <file>
-            <source>${basedir}/target/classes/ode-features.xml</source>
-            <outputDirectory>system/org/apache/servicemix/ode-jbi-karaf/${ode.version}</outputDirectory>
-            <destName>ode-jbi-karaf-${ode.version}-features.xml</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
 
         <file>
             <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
@@ -348,6 +341,15 @@
                 <include>org.apache.servicemix.nmr:apache-servicemix-nmr:xml:features</include>
             </includes>
         </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <outputFileNameMapping>org/apache/ode/${artifact.artifactId}/${artifact.baseVersion}/${artifacti.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <includes>
+                <include>org.apache.ode:ode-jbi-karaf:xml:features</include>
+            </includes>
+        </dependencySet>
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
             <outputFileNameMapping>org/apache/camel/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>

diff --git a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
@@ -20,7 +20,7 @@
 #
 # Comma separated list of features repositories to register by default
 #
-featuresRepositories=mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:org.apache.servicemix/ode-jbi-karaf/${ode.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features
+featuresRepositories=mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:org.apache.ode/ode-jbi-karaf/${ode.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features
 
 #
 # Comma separated list of features to install at startup

diff --git a/assembly/src/main/filtered-resources/ode-features.xml b/assembly/src/main/filtered-resources/ode-features.xml
diff --git a/pom.xml b/pom.xml
@@ -288,7 +288,7 @@
         <spring.osgi.version>1.2.0</spring.osgi.version>
 
         <!-- ODE -->
-        <ode.version>1.3.4</ode.version>
+        <ode.version>1.3.5</ode.version>
 
         <!-- Maven Plugins -->
         <depends-maven-plugin.version>1.2</depends-maven-plugin.version>
@@ -856,6 +856,20 @@
                <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
                <version>${geronimo-ws-metadata.version}</version>
            </dependency>
+
+           <!-- ODE -->
+           <dependency>
+               <groupId>org.apache.ode</groupId>
+               <artifactId>ode-jbi-karaf</artifactId>
+               <version>${ode.version}</version>
+               <type>xml</type>
+               <classifier>features</classifier>
+           </dependency>
+           <dependency>
+               <groupId>org.apache.ode</groupId>
+               <artifactId>ode-jbi-karaf</artifactId>
+               <version>${ode.version}</version>
+           </dependency>
 
            <!-- PAX URL -->
            <dependency>