You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/09/12 09:12:17 UTC
svn commit: r694624 - in /servicemix/smx4/features/trunk: assembly/pom.xml
assembly/src/main/filtered-resources/features.xml pom.xml
Author: gnodet
Date: Fri Sep 12 00:12:16 2008
New Revision: 694624
URL: http://svn.apache.org/viewvc?rev=694624&view=rev
Log:
SMX4-94: add a jetty bundle to avoid several problems, disable snaphots for releases only repositories, use released bundles when available
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.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=694624&r1=694623&r2=694624&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Fri Sep 12 00:12:16 2008
@@ -117,6 +117,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jetty-bundle</artifactId>
+ <version>${jetty.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
@@ -736,11 +741,6 @@
<version>${servicemix-utils.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-services</artifactId>
- <version>${servicemix3.version}</version>
- </dependency>
- <dependency>
<groupId>com.google.code.scriptengines</groupId>
<artifactId>scriptengines-groovy</artifactId>
<version>${scriptengines.version}</version>
@@ -751,6 +751,12 @@
<id>scriptengines</id>
<name>ScriptEngines Repository</name>
<url>http://scriptengines.googlecode.com/svn/m2-repo</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
</repositories>
<build>
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=694624&r1=694623&r2=694624&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 Sep 12 00:12:16 2008
@@ -33,8 +33,7 @@
</feature>
<feature name="web-core">
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
- <bundle>mvn:org.mortbay.jetty/jetty-util/${jetty.version}</bundle>
- <bundle>mvn:org.mortbay.jetty/jetty/${jetty.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-bundle/${pax.web.version}</bundle>
</feature>
<feature name="web">
@@ -146,8 +145,7 @@
</feature>
<feature name="servicemix-cxf-bc">
<feature>servicemix-shared</feature>
- <bundle>mvn:org.mortbay.jetty/jetty-util/${jetty.version}</bundle>
- <bundle>mvn:org.mortbay.jetty/jetty/${jetty.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo.activation.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo.annotation.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-javamail_1.4_spec/${geronimo.javamail.version}</bundle>
@@ -187,12 +185,9 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wss4j/${wss4j.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.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.mortbay.jetty/jetty-util/${jetty.version}</bundle>
- <bundle>mvn:org.mortbay.jetty/jetty/${jetty.version}</bundle>
- <bundle>mvn:org.mortbay.jetty/jetty-management/${jetty.version}</bundle>
- <bundle>mvn:org.mortbay.jetty/jetty-client/${jetty.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-http/${servicemix-http-version}</bundle>
</feature>
<feature name="servicemix-jms">
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=694624&r1=694623&r2=694624&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Fri Sep 12 00:12:16 2008
@@ -66,24 +66,24 @@
<activemq.version>5.2-SNAPSHOT</activemq.version>
<acegi.version>1.0.0</acegi.version>
<ant.version>1.7.0_1</ant.version>
- <antlr.version>3.0.1_1-SNAPSHOT</antlr.version>
- <antlr-runtime.version>3.0.1_1-SNAPSHOT</antlr-runtime.version>
+ <antlr.version>3.0.1_1</antlr.version>
+ <antlr-runtime.version>3.0.1_1</antlr-runtime.version>
<aopalliance.version>1.0_1</aopalliance.version>
<asm.version>2.2.3_1</asm.version>
<bnd.version>0.0.227</bnd.version>
<cglib.version>2.1_3_1</cglib.version>
<camel.version>1.4.0</camel.version>
- <commons.httpclient.version>3.1_1-SNAPSHOT</commons.httpclient.version>
- <commons-io.version>1.3.2_1-SNAPSHOT</commons-io.version>
+ <commons.httpclient.version>3.1_1</commons.httpclient.version>
+ <commons-io.version>1.3.2_1</commons-io.version>
<commons-jxpath.version>1.2_1-SNAPSHOT</commons-jxpath.version>
<commons.logging.version>1.1</commons.logging.version>
- <commons.net.version>1.4.1_1-SNAPSHOT</commons.net.version>
+ <commons.net.version>1.4.1_1</commons.net.version>
<commons.pool.version>1.4</commons.pool.version>
<components.version>4.0-SNAPSHOT</components.version>
<cxf.version>2.1.2</cxf.version>
- <drools.version>4.0.7_1-SNAPSHOT</drools.version>
- <depends.maven.plugin.version>1.0-SNAPSHOT</depends.maven.plugin.version>
- <fastinfoset.version>1.2.2_1-SNAPSHOT</fastinfoset.version>
+ <drools.version>4.0.7_1</drools.version>
+ <depends.maven.plugin.version>1.0</depends.maven.plugin.version>
+ <fastinfoset.version>1.2.2_1</fastinfoset.version>
<features.maven.plugin.version>1.0-SNAPSHOT</features.maven.plugin.version>
<felix.bundlerepository.version>1.0.2</felix.bundlerepository.version>
<felix.compendium.version>1.0.1</felix.compendium.version>
@@ -110,41 +110,42 @@
<geronimo.wsmetadata.version>1.1.2</geronimo.wsmetadata.version>
<geronimo.transaction.version>2.2-r634076</geronimo.transaction.version>
<geronimo.connector.version>2.2-r634076</geronimo.connector.version>
- <groovy.version>1.5.6_1-SNAPSHOT</groovy.version>
- <howl.version>1.0.1-1_1-SNAPSHOT</howl.version>
+ <groovy.version>1.5.6_1</groovy.version>
+ <howl.version>1.0.1-1_1</howl.version>
<jasper.version>6.0.14_1-SNAPSHOT</jasper.version>
<jaxb.api.version>2.1</jaxb.api.version>
- <jaxb.impl.version>2.1.6_1-SNAPSHOT</jaxb.impl.version>
+ <jaxb.impl.version>2.1.6_1</jaxb.impl.version>
<jaxws.api.version>2.1</jaxws.api.version>
- <jdt.core.version>3.2.3_1-SNAPSHOT</jdt.core.version>
- <jencks.version>2.1_1-SNAPSHOT</jencks.version>
- <jetty.version>6.1.12rc1-smx</jetty.version>
+ <jdt.core.version>3.2.3_1</jdt.core.version>
+ <jencks.version>2.1_1</jencks.version>
+ <jetty.version>6.1.12rc1</jetty.version>
+ <jetty.bundle.version>6.1.12rc1_1-SNAPSHOT</jetty.bundle.version>
<jline.version>0.9.94</jline.version>
<junit.version>4.4</junit.version>
<log4j.version>1.2.14</log4j.version>
<mina.version>1.1.6_1</mina.version>
<mina.original.version>1.1.6</mina.original.version>
- <neethi.version>2.0.4_1-SNAPSHOT</neethi.version>
- <oscore.version>2.2.4_1-SNAPSHOT</oscore.version>
- <osworkflow.version>2.7.0_1-SNAPSHOT</osworkflow.version>
- <oro.version>2.0.8_1-SNAPSHOT</oro.version>
+ <neethi.version>2.0.4_1</neethi.version>
+ <oscore.version>2.2.4_1</oscore.version>
+ <osworkflow.version>2.7.0_1</osworkflow.version>
+ <oro.version>2.0.8_1</oro.version>
<openejb.version>3.0-beta-2</openejb.version>
<openjpa.version>1.0.1</openjpa.version>
<pax.logging.version>1.1.1</pax.logging.version>
<pax.url.version>0.3.2</pax.url.version>
<pax.web.version>0.4.1</pax.web.version>
<pax.web.extender.version>0.3.0</pax.web.extender.version>
- <propertyset.version>1.3_1-SNAPSHOT</propertyset.version>
- <quartz.version>1.5.2_1-SNAPSHOT</quartz.version>
+ <propertyset.version>1.3_1</propertyset.version>
+ <quartz.version>1.5.2_1</quartz.version>
<saaj.impl.version>1.3_1-SNAPSHOT</saaj.impl.version>
- <saxon.version>9.1.0.1_1-SNAPSHOT</saxon.version>
+ <saxon.version>9.1.0.1_1</saxon.version>
<scriptengines.version>1.0</scriptengines.version>
<servicemix3.version>3.3-SNAPSHOT</servicemix3.version>
<servicemix-utils.version>1.0-SNAPSHOT</servicemix-utils.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
- <servicemix.kernel.version>1.0.0-SNAPSHOT</servicemix.kernel.version>
+ <servicemix.kernel.version>1.0.1-SNAPSHOT</servicemix.kernel.version>
<servicemix.nmr.version>1.0-m2-SNAPSHOT</servicemix.nmr.version>
- <servicemix.specs.version>1.1-SNAPSHOT</servicemix.specs.version>
+ <servicemix.specs.version>1.1.0</servicemix.specs.version>
<servicemix.bundle.suffix>_1-SNAPSHOT</servicemix.bundle.suffix>
<servicemix-shared-version>2008.01-SNAPSHOT</servicemix-shared-version>
@@ -173,71 +174,99 @@
<spring.version>2.5.5</spring.version>
<spring.osgi.version>1.1.0</spring.osgi.version>
- <wsdl4j.version>1.6.1_1-SNAPSHOT</wsdl4j.version>
- <woodstox.version>3.2.6_1-SNAPSHOT</woodstox.version>
+ <wsdl4j.version>1.6.1_1</wsdl4j.version>
+ <woodstox.version>3.2.7_1</woodstox.version>
<xstream.version>1.2.2</xstream.version>
<xbean.version>3.4.3</xbean.version>
- <xmlschema.version>1.4.2_1-SNAPSHOT</xmlschema.version>
- <xmlsec.version>1.3.0_1-SNAPSHOT</xmlsec.version>
- <xmlresolver.version>1.2_1-SNAPSHOT</xmlresolver.version>
- <wss4j.version>1.5.4_1-SNAPSHOT</wss4j.version>
+ <xmlschema.version>1.4.2_1</xmlschema.version>
+ <xmlsec.version>1.3.0_1</xmlsec.version>
+ <xmlresolver.version>1.2_1</xmlresolver.version>
+ <wss4j.version>1.5.4_1</wss4j.version>
</properties>
- <repositories>
+ <repositories>
+ <!-- Default repository -->
+ <repository>
+ <id>central</id>
+ <name>Default maven repo</name>
+ <url>http://repo1.maven.org/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
<!-- ServiceMix repo -->
<repository>
<id>servicemix</id>
<name>Apache ServiceMix Repository</name>
<url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
- </repository>
- <!-- Default repository -->
- <repository>
- <id>central</id>
- <name>Default maven repo</name>
- <url>http://repo1.maven.org/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
<!-- ASF M2 snapshot repo -->
<repository>
<id>apache.m2.snapshots</id>
<name>Apache m2 Snapshots Repository</name>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
</repository>
<!-- OPS4j repository -->
<repository>
<id>ops4j</id>
<name>OPS4j repo</name>
<url>http://repository.ops4j.org/maven2</url>
- </repository>
- <!-- OPS4j snapshot repository -->
- <repository>
- <id>ops4j.snapshots</id>
- <name>OP4j Snapshots repo</name>
- <url>http://repository.ops4j.org/mvn-snapshots</url>
- <snapshots>
+ <releases>
<enabled>true</enabled>
- </snapshots>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
<!-- Java.net repo -->
<repository>
<id>java.net</id>
<url>http://download.java.net/maven/1/</url>
<layout>legacy</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
<repository>
<id>java.net.2</id>
<name>Java Net 2 Repository</name>
<url>http://download.java.net/maven/2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
- <repository>
- <id>incubator</id>
- <name>Incubator Repository</name>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
<!--jboss repo for drools lib-->
<repository>
<id>jboss</id>
<name>Jboss Repository</name>
<url>http://repository.jboss.org/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
</repositories>