Author: lhein
Date: Fri Mar 25 14:32:25 2011
New Revision: 1085403
URL: http://svn.apache.org/viewvc?rev=1085403&view=rev
Log:
started reworking the smx4 build (see SMX4-778)
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/activemq-features.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
servicemix/smx4/features/trunk/examples/cxf-jaxrs/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=1085403&r1=1085402&r2=1085403&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Fri Mar 25 14:32:25 2011
@@ -50,14 +50,10 @@
<type>tar.gz</type>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <type>xml</type>
+ <groupId>org.apache.karaf.assemblies.features</groupId>
+ <artifactId>standard</artifactId>
<classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.deployer</groupId>
- <artifactId>org.apache.karaf.deployer.war</artifactId>
+ <type>xml</type>
</dependency>
<!-- Felix -->
@@ -483,10 +479,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jetty</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jruby</artifactId>
</dependency>
<dependency>
@@ -711,7 +703,8 @@
</goals>
<configuration>
<descriptors>
-
<descriptor>mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features</descriptor>
+
<descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor>
+
<descriptor>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</descriptor>
<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>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/activemq-features.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/activemq-features.xml?rev=1085403&r1=1085402&r2=1085403&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/activemq-features.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/activemq-features.xml
Fri Mar 25 14:32:25 2011
@@ -36,7 +36,7 @@
<bundle>mvn:org.apache.activemq/activemq-ra/${activemq.version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-pool/${activemq.version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-karaf/${activemq.version}</bundle>
-
<bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.transaction.version}</bundle>
+
<bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.version}</bundle>
</feature>
<feature name="activemq-spring" version="${activemq.version}">
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml?rev=1085403&r1=1085402&r2=1085403&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
Fri Mar 25 14:32:25 2011
@@ -58,7 +58,18 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${fastinfoset.bundle.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty.bundle.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-client/${jetty.version}</bundle>
+
<bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-jmx/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-servlets/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-xml/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-webapp/${jetty.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
<bundle>mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
<bundle>mvn:org.codehaus.jettison/jettison/${jettison.version}</bundle>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=1085403&r1=1085402&r2=1085403&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
Fri Mar 25 14:32:25 2011
@@ -20,7 +20,7 @@
<repository>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</repository>
<repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository>
<feature name="connector" version="${version}">
- <feature version="${aries.transaction.version}">transaction</feature>
+ <feature version="${aries.version}">transaction</feature>
<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo-j2ee-connector.version}</bundle>
<bundle>mvn:org.apache.geronimo.components/geronimo-connector/${geronimo-connector.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
@@ -226,7 +226,18 @@
<bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
<bundle>mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty.bundle.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-client/${jetty.version}</bundle>
+
<bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-jmx/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-servlets/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-xml/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-webapp/${jetty.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-soap/${servicemix-shared.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-http/${servicemix-http.version}</bundle>
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml?rev=1085403&r1=1085402&r2=1085403&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml Fri Mar 25
14:32:25 2011
@@ -160,6 +160,16 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml?rev=1085403&r1=1085402&r2=1085403&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml Fri Mar 25
14:32:25 2011
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jsr311-api-1.0</artifactId>
+ <artifactId>org.apache.servicemix.specs.jsr311-api-1.1</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1085403&r1=1085402&r2=1085403&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Fri Mar 25 14:32:25 2011
@@ -22,11 +22,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
+ <groupId>org.apache.servicemix.nmr</groupId>
+ <artifactId>nmr-parent</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+
+ <!--
+ <parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-pom</artifactId>
<relativePath>../servicemix-pom/pom.xml</relativePath>
<version>5</version>
</parent>
+ -->
<groupId>org.apache.servicemix.features</groupId>
<artifactId>features</artifactId>
@@ -111,28 +119,11 @@
</repositories>
<properties>
- <sonar.skippedModules>examples</sonar.skippedModules>
-
- <!-- OSGi (Karaf, Felix, Aries) -->
- <aries.blueprint.version>0.2-incubating</aries.blueprint.version>
- <aries.jpa.version>0.2-incubating</aries.jpa.version>
- <aries.util.version>0.2-incubating</aries.util.version>
- <aries.transaction.version>0.2-incubating</aries.transaction.version>
- <felix.fileinstall.version>3.0.2</felix.fileinstall.version>
<felix.prefs.version>1.0.4</felix.prefs.version>
- <karaf.version>2.1.3</karaf.version>
- <osgi.compendium.version>4.2.0</osgi.compendium.version>
- <osgi.core.version>4.2.0</osgi.core.version>
-
- <!-- ActiveMQ -->
- <activemq.version>5.4.2</activemq.version>
-
- <!-- Camel -->
- <camel.version>2.6.0</camel.version>
<!-- CXF -->
- <cxf.xjc-utils.version>2.3.2</cxf.xjc-utils.version>
<cxf.version>2.3.2</cxf.version>
+ <cxf.xjc-utils.version>${cxf.version}</cxf.xjc-utils.version>
<!-- Geronimo -->
<geronimo-annotation.version>1.1.1</geronimo-annotation.version>
@@ -141,25 +132,17 @@
<geronimo-j2ee-connector.version>2.0.0</geronimo-j2ee-connector.version>
<geronimo-j2ee-management.version>1.0.1</geronimo-j2ee-management.version>
<geronimo-jaxws.version>1.0</geronimo-jaxws.version>
- <geronimo-jms.version>1.1.1</geronimo-jms.version>
<geronimo-jpa.version>1.1</geronimo-jpa.version>
<geronimo-jsp.version>1.0.1</geronimo-jsp.version>
- <geronimo-jta.version>1.1.1</geronimo-jta.version>
<geronimo-saaj.version>1.0.0</geronimo-saaj.version>
- <geronimo-servlet.version>1.0</geronimo-servlet.version>
<geronimo-ws-metadata.version>1.1.2</geronimo-ws-metadata.version>
- <geronimo-transaction.version>2.1.3</geronimo-transaction.version>
<!-- ServiceMix Bundles -->
<abdera.bundle.version>0.4.0-incubating_4</abdera.bundle.version>
- <ant.bundle.version>1.7.0_4</ant.bundle.version>
<antlr2.bundle.version>2.7.7_3</antlr2.bundle.version>
<antlr.bundle.version>3.0.1_4</antlr.bundle.version>
<antlr-runtime.bundle.version>3.0.1_2</antlr-runtime.bundle.version>
- <aopalliance.bundle.version>1.0_4</aopalliance.bundle.version>
- <asm.bundle.version>2.2.3_4</asm.bundle.version>
<bcel.bundle.version>5.2_3</bcel.bundle.version>
- <cglib.bundle.version>2.1_3_6</cglib.bundle.version>
<castor.bundle.version>1.3.1_1</castor.bundle.version>
<cometd-java-server.bundle.version>1.0.1_2</cometd-java-server.bundle.version>
<commons-beanutils.bundle.version>1.8.2_1</commons-beanutils.bundle.version>
@@ -190,12 +173,9 @@
<jasypt.bundle.version>1.6_1</jasypt.bundle.version>
<jaxb.api.version>2.2</jaxb.api.version>
<jaxb-impl.bundle.version>2.2.1.1_1</jaxb-impl.bundle.version>
- <jaxen.bundle.version>1.1.1_1</jaxen.bundle.version>
<jcr-api.bundle.version>1.0_3</jcr-api.bundle.version>
<jdt-core.bundle.version>3.2.3_4</jdt-core.bundle.version>
<jdom.bundle.version>1.1_3</jdom.bundle.version>
- <jetty.bundle.version>6.1.25_1</jetty.bundle.version>
- <jetty-cometd.bundle.version>6.1.22_1</jetty-cometd.bundle.version>
<jexcelapi.bundle.version>2.4.2_3</jexcelapi.bundle.version>
<jing.bundle.version>20030619_3</jing.bundle.version>
<jruby.bundle.version>1.1.2_3</jruby.bundle.version>
@@ -205,7 +185,6 @@
<jsendnsca-core.bundle.version>1.3.1_2</jsendnsca-core.bundle.version>
<jsmpp.bundle.version>2.1.0_2</jsmpp.bundle.version>
<juel.bundle.version>2.1.0_3</juel.bundle.version>
- <junit.bundle.version>4.7_2</junit.bundle.version>
<lucene.bundle.version>3.0.1_2</lucene.bundle.version>
<mina.bundle.version>1.1.7_4</mina.bundle.version>
<mvel.bundle.version>2.0.8_4</mvel.bundle.version>
@@ -235,7 +214,6 @@
<tagsoup.bundle.version>1.2_4</tagsoup.bundle.version>
<velocity.bundle.version>1.6.2_4</velocity.bundle.version>
<werken-xpath.bundle.version>0.9.4_4</werken-xpath.bundle.version>
- <wsdl4j.bundle.version>1.6.2_3</wsdl4j.bundle.version>
<xalan.bundle.version>2.7.1_3</xalan.bundle.version>
<xerces.bundle.version>2.9.1_4</xerces.bundle.version>
<xmlbeans.bundle.version>2.5.0_1</xmlbeans.bundle.version>
@@ -245,13 +223,8 @@
<xstream.bundle.version>1.3_4</xstream.bundle.version>
<!-- ServiceMix Components and Resources -->
- <smx3.version>3.3.1</smx3.version>
- <servicemix-utils.version>1.4.0</servicemix-utils.version>
- <servicemix.legal.version>1.0</servicemix.legal.version>
- <servicemix.nmr.version>1.4.0</servicemix.nmr.version>
- <servicemix.specs.version>1.7.0</servicemix.specs.version>
+ <servicemix.nmr.version>1.5.0-SNAPSHOT</servicemix.nmr.version>
- <servicemix.components.version>2011.01</servicemix.components.version>
<servicemix-bean.version>${servicemix.components.version}</servicemix-bean.version>
<servicemix-camel.version>${servicemix.components.version}</servicemix-camel.version>
<servicemix-cxf-bc.version>${servicemix.components.version}</servicemix-cxf-bc.version>
@@ -280,13 +253,8 @@
<servicemix-xmpp.version>${servicemix.components.version}</servicemix-xmpp.version>
<!-- PAX -->
- <pax.url.version>1.2.1</pax.url.version>
<pax.web.version>0.7.4</pax.web.version>
- <!-- Spring -->
- <spring.version>3.0.5.RELEASE</spring.version>
- <spring.osgi.version>1.2.0</spring.osgi.version>
-
<!-- ODE -->
<ode.version>1.3.5</ode.version>
@@ -305,11 +273,7 @@
<commons-jexl.version>2.0.1</commons-jexl.version>
<commons-jxpath.version>1.3</commons-jxpath.version>
<commons-logging.version>1.1.1</commons-logging.version>
- <commons-management.version>1.0</commons-management.version>
-
<commons-net.version>${commons-net.bundle.version}</commons-net.version>
- <derby.version>10.5.3.0_1</derby.version>
<drools.version>5.1.1</drools.version>
- <easymock.version>2.4</easymock.version>
<groovy.version>1.7.5</groovy.version>
<hawtbuf.version>1.2</hawtbuf.version>
<hawtdb.version>1.5</hawtdb.version>
@@ -318,106 +282,30 @@
<jackson.version>1.6.0</jackson.version>
<jaxp-ri.version>1.4.4</jaxp-ri.version>
<jaxws-api.version>2.2</jaxws-api.version>
- <jaxrs.api.version>1.1</jaxrs.api.version>
<javassist.version>3.9.0.GA</javassist.version>
- <javax.mail.version>1.4.3</javax.mail.version>
<jetty.version>7.3.1.v20110307</jetty.version>
<jettison.version>1.2</jettison.version>
- <junit.version>4.7</junit.version>
- <log4j.version>1.2.16</log4j.version>
<lingo.version>1.3</lingo.version>
<netty.version>3.2.3.Final_1</netty.version>
- <openjpa.version>2.0.0</openjpa.version>
- <opensaml.version>1.1</opensaml.version>
<restlet.version>1.1.10</restlet.version>
<scriptengines.version>1.1</scriptengines.version>
- <tranql.version>1.6</tranql.version>
- <woodstox.version>4.0.8</woodstox.version>
- <woodstox.stax2-api.version>3.0.2</woodstox.stax2-api.version>
<wss4j.version>1.5.9</wss4j.version>
- <xbean.version>3.7</xbean.version>
<xfire.version>1.0.1</xfire.version>
<xmlschema.version>1.4.7</xmlschema.version>
</properties>
<dependencyManagement>
<dependencies>
-
- <!-- Karaf -->
- <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>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <version>${karaf.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.deployer</groupId>
- <artifactId>org.apache.karaf.deployer.war</artifactId>
- <version>${karaf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.management</artifactId>
- <version>${karaf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
- <version>${karaf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.jaas</groupId>
- <artifactId>org.apache.karaf.jaas.boot</artifactId>
- <version>${karaf.version}</version>
- </dependency>
-
+
<!-- OSGi and Felix -->
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.fileinstall</artifactId>
- <version>${felix.fileinstall.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.prefs</artifactId>
<version>${felix.prefs.version}</version>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${osgi.compendium.version}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${osgi.core.version}</version>
- </dependency>
-
+
<!-- ServiceMix NMR -->
<dependency>
- <groupId>org.apache.servicemix.document</groupId>
- <artifactId>org.apache.servicemix.document</artifactId>
- <version>${servicemix.nmr.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.jbi</groupId>
- <artifactId>org.apache.servicemix.jbi.runtime</artifactId>
- <version>${servicemix.nmr.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.nmr</groupId>
<artifactId>apache-servicemix-nmr</artifactId>
<type>tar.gz</type>
@@ -434,33 +322,7 @@
<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>org.apache.servicemix.nmr.api</artifactId>
- <version>${servicemix.nmr.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>org.apache.servicemix.nmr.core</artifactId>
- <version>${servicemix.nmr.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>org.apache.servicemix.nmr.management</artifactId>
- <version>${servicemix.nmr.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>org.apache.servicemix.nmr.osgi</artifactId>
- <version>${servicemix.nmr.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>org.apache.servicemix.nmr.spring</artifactId>
- <version>${servicemix.nmr.version}</version>
+ <classifier>features</classifier>
</dependency>
<dependency>
<groupId>org.apache.servicemix.platform.testing</groupId>
@@ -471,11 +333,6 @@
<!-- ServiceMix Specs -->
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
-
<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
- <version>${servicemix.specs.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
@@ -484,16 +341,13 @@
<artifactId>org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
- <version>${servicemix.specs.version}</version>
- </dependency>
+ <!-- old?
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.jsr311-api-1.0</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
+ -->
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.jsr311-api-1.1</artifactId>
@@ -509,12 +363,7 @@
<artifactId>org.apache.servicemix.specs.scripting-api-1.0</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
-
<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
- <version>${servicemix.specs.version}</version>
- </dependency>
-
+
<!-- ServiceMix Components -->
<dependency>
<groupId>org.apache.servicemix</groupId>
@@ -642,18 +491,6 @@
<version>${servicemix-wsn2005.version}</version>
</dependency>
- <!-- ServiceMix Core, Utils -->
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-core</artifactId>
- <version>${smx3.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-utils</artifactId>
- <version>${servicemix-utils.version}</version>
- </dependency>
-
<!-- ActiveMQ -->
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -667,11 +504,6 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>${activemq.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
<artifactId>activemq-karaf</artifactId>
<version>${activemq.version}</version>
</dependency>
@@ -684,11 +516,6 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-pool</artifactId>
- <version>${activemq.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
<version>${activemq.version}</version>
</dependency>
@@ -698,28 +525,11 @@
<version>${activemq.version}</version>
</dependency>
- <!-- Aries -->
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <version>${aries.util.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction.manager</artifactId>
- <version>${aries.transaction.version}</version>
- </dependency>
-
<!-- Camel -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
<version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <version>${camel.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
@@ -828,31 +638,16 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${geronimo-jms.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<version>${geronimo-jpa.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>${geronimo-jta.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-saaj_1.3_spec</artifactId>
<version>${geronimo-saaj.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>${geronimo-servlet.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
<version>${geronimo-ws-metadata.version}</version>
</dependency>
@@ -870,51 +665,7 @@
<artifactId>ode-jbi-karaf</artifactId>
<version>${ode.version}</version>
</dependency>
-
- <!-- PAX URL -->
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-war</artifactId>
- <version>${pax.url.version}</version>
- </dependency>
-
- <!-- PAX Web -->
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-api</artifactId>
- <version>${pax.web.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-extender-war</artifactId>
- <version>${pax.web.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-extender-whiteboard</artifactId>
- <version>${pax.web.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-jetty</artifactId>
- <version>${pax.web.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-jsp</artifactId>
- <version>${pax.web.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-runtime</artifactId>
- <version>${pax.web.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-spi</artifactId>
- <version>${pax.web.version}</version>
- </dependency>
-
+
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
@@ -923,67 +674,25 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-jms</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring.version}</version>
</dependency>
-
- <!-- Spring OSGi -->
- <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-extender</artifactId>
- <version>${spring.osgi.version}</version>
- </dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-io</artifactId>
<version>${spring.osgi.version}</version>
</dependency>
-
+
<!-- ServiceMix Bundles -->
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -992,11 +701,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.ant</artifactId>
- <version>${ant.bundle.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.antlr</artifactId>
<version>${antlr.bundle.version}</version>
</dependency>
@@ -1007,26 +711,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
- <version>${aopalliance.bundle.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm</artifactId>
- <version>${asm.bundle.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.bcel</artifactId>
<version>${bcel.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
- <version>${cglib.bundle.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
<version>${commons-beanutils.bundle.version}</version>
</dependency>
@@ -1037,16 +726,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.commons-collections</artifactId>
- <version>${commons-collections.bundle.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
- <version>${commons-lang.bundle.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
<version>${commons-httpclient.bundle.version}</version>
</dependency>
@@ -1082,11 +761,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
- <version>${jasypt.bundle.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
<version>${jaxb-impl.bundle.version}</version>
</dependency>
@@ -1102,11 +776,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jetty</artifactId>
- <version>${jetty.bundle.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.josql</artifactId>
<version>${josql.bundle.version}</version>
</dependency>
@@ -1187,11 +856,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
- <version>${wsdl4j.bundle.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xalan</artifactId>
<version>${xalan.bundle.version}</version>
</dependency>
@@ -1248,26 +912,11 @@
<version>${commons-logging.version}</version>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>${javax.mail.version}</version>
- </dependency>
- <dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<version>${jaxws-api.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jexl</artifactId>
<version>${commons-jexl.version}</version>
@@ -1299,11 +948,6 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-classloader</artifactId>
- <version>${xbean.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean.version}</version>
</dependency>
@@ -1313,31 +957,11 @@
<version>${jettison.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>${woodstox.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>stax2-api</artifactId>
- <version>${woodstox.stax2-api.version}</version>
- </dependency>
- <dependency>
<groupId>org.drools</groupId>
<artifactId>drools-compiler</artifactId>
<version>${drools.version}</version>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>${easymock.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fusesource.commonman</groupId>
- <artifactId>commons-management</artifactId>
- <version>${commons-management.version}</version>
- </dependency>
- <dependency>
<groupId>org.logicblaze.lingo</groupId>
<artifactId>lingo</artifactId>
<version>${lingo.version}</version>
@@ -1347,6 +971,67 @@
<artifactId>opensaml</artifactId>
<version>${xfire.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-xml</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jmx</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
