Author: gertv
Date: Wed Oct 12 12:09:05 2011
New Revision: 1182326
URL: http://svn.apache.org/viewvc?rev=1182326&view=rev
Log:
SMX4-939: Make features build more independent of nmr build
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/branding/pom.xml
servicemix/smx4/features/trunk/camel/pom.xml
servicemix/smx4/features/trunk/cxf/pom.xml
servicemix/smx4/features/trunk/examples/pom.xml
servicemix/smx4/features/trunk/parent/pom.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=1182326&r1=1182325&r2=1182326&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Wed Oct 12 12:09:05 2011
@@ -22,12 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.features</groupId>
- <artifactId>features</artifactId>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>parent</artifactId>
<version>4.4.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
- <groupId>org.apache.servicemix</groupId>
<artifactId>apache-servicemix</artifactId>
<packaging>pom</packaging>
<name>Apache ServiceMix :: Features :: Assembly</name>
Modified: servicemix/smx4/features/trunk/branding/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/branding/pom.xml?rev=1182326&r1=1182325&r2=1182326&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/branding/pom.xml (original)
+++ servicemix/smx4/features/trunk/branding/pom.xml Wed Oct 12 12:09:05 2011
@@ -22,9 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.features</groupId>
- <artifactId>features</artifactId>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>parent</artifactId>
<version>4.4.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.servicemix.features.branding</artifactId>
Modified: servicemix/smx4/features/trunk/camel/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/pom.xml?rev=1182326&r1=1182325&r2=1182326&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/pom.xml Wed Oct 12 12:09:05 2011
@@ -22,9 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.features</groupId>
- <artifactId>features</artifactId>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>parent</artifactId>
<version>4.4.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.camel</groupId>
Modified: servicemix/smx4/features/trunk/cxf/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/pom.xml?rev=1182326&r1=1182325&r2=1182326&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/pom.xml Wed Oct 12 12:09:05 2011
@@ -22,9 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.features</groupId>
- <artifactId>features</artifactId>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>parent</artifactId>
<version>4.4.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.cxf</groupId>
Modified: servicemix/smx4/features/trunk/examples/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/pom.xml?rev=1182326&r1=1182325&r2=1182326&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/pom.xml Wed Oct 12 12:09:05 2011
@@ -22,9 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.features</groupId>
- <artifactId>features</artifactId>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>parent</artifactId>
<version>4.4.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.examples</groupId>
Modified: servicemix/smx4/features/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/parent/pom.xml?rev=1182326&r1=1182325&r2=1182326&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/parent/pom.xml (original)
+++ servicemix/smx4/features/trunk/parent/pom.xml Wed Oct 12 12:09:05 2011
@@ -16,19 +16,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
- <modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>parent</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- <relativePath>../../nmr/pom.xml</relativePath>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>features</artifactId>
+ <version>4.4.0-SNAPSHOT</version>
</parent>
-
+
+ <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.servicemix</groupId>
<artifactId>parent</artifactId>
- <version>4.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache ServiceMix :: Parent</name>
@@ -40,13 +37,77 @@
<!-- Properties -->
<properties>
+ <activemq.version>5.5.0</activemq.version>
+ <camel.version>2.8.1</camel.version>
<cxf.version>2.4.2</cxf.version>
+ <karaf.version>2.2.2</karaf.version>
+
+
<servicemix.components.version>2011.02-SNAPSHOT</servicemix.components.version>
<servicemix.nmr.version>1.5.0-SNAPSHOT</servicemix.nmr.version>
+ <servicemix.specs.version>1.8.0</servicemix.specs.version>
+ <servicemix.utils.version>1.5.0-SNAPSHOT</servicemix.utils.version>
</properties>
<!-- Managed dependencies -->
<dependencyManagement>
<dependencies>
+ <!-- managed dependencies for all the Camel components -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>${camel.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- ServiceMix NMR -->
+ <dependency>
+ <groupId>org.apache.servicemix.nmr</groupId>
+ <artifactId>apache-servicemix-nmr</artifactId>
+ <type>tar.gz</type>
+ <version>${servicemix.nmr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.nmr</groupId>
+ <artifactId>apache-servicemix-nmr</artifactId>
+ <type>zip</type>
+ <version>${servicemix.nmr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.nmr</groupId>
+ <artifactId>apache-servicemix-nmr</artifactId>
+ <version>${servicemix.nmr.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.nmr</groupId>
+ <artifactId>nmr-parent</artifactId>
+ <version>${servicemix.nmr.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- Apache Karaf -->
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>${karaf.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <version>${karaf.version}</version>
+ <type>tar.gz</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <version>${karaf.version}</version>
+ <type>zip</type>
+ </dependency>
<!-- Apache CXF -->
<dependency>
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1182326&r1=1182325&r2=1182326&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Oct 12 12:09:05 2011
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.servicemix</groupId>
- <artifactId>parent</artifactId>
- <version>4.4.0-SNAPSHOT</version>
- <relativePath>parent/pom.xml</relativePath>
+ <artifactId>servicemix-pom</artifactId>
+ <version>5</version>
+ <relativePath>../servicemix-pom/pom.xml</relativePath>
</parent>
- <groupId>org.apache.servicemix.features</groupId>
+ <groupId>org.apache.servicemix</groupId>
<artifactId>features</artifactId>
<packaging>pom</packaging>
<version>4.4.0-SNAPSHOT</version>
@@ -220,34 +220,6 @@
<version>${felix.prefs.version}</version>
</dependency>
- <!-- ServiceMix NMR -->
- <dependency>
- <groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>apache-servicemix-nmr</artifactId>
- <type>tar.gz</type>
- <version>${servicemix.nmr.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>apache-servicemix-nmr</artifactId>
- <type>zip</type>
- <version>${servicemix.nmr.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>apache-servicemix-nmr</artifactId>
- <version>${servicemix.nmr.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>nmr-parent</artifactId>
- <version>${servicemix.nmr.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
<!-- Camel -->
<dependency>
<groupId>org.apache.camel.karaf</groupId>
@@ -340,6 +312,11 @@
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-io</artifactId>
<version>${spring.osgi.version}</version>
</dependency>
