Author: ffang
Date: Tue Aug 28 06:18:04 2012
New Revision: 1377982
URL: http://svn.apache.org/viewvc?rev=1377982&view=rev
Log:
[SMX4-1224]remove jetty6 bundle from kit
Modified:
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/pom.xml
Modified:
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml?rev=1377982&r1=1377981&r2=1377982&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
(original)
+++
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
Tue Aug 28 06:18:04 2012
@@ -186,13 +186,13 @@
</feature>
<feature name="servicemix-http" version="${servicemix.components.version}"
resolver="(obr)" start-level='50'>
<feature
version="${servicemix.components.version}">servicemix-shared</feature>
+ <feature>jetty</feature>
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
<bundle
dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
<bundle
dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${xmlschema.version}</bundle>
<bundle
dependency="true">mvn:org.apache.santuario/xmlsec/${xmlsec.bundle.version}</bundle>
<bundle
dependency="true">mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty6.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-http/${servicemix.components.version}</bundle>
</feature>
<feature name="servicemix-jms" version="${servicemix.components.version}"
resolver="(obr)" start-level='50'>
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1377982&r1=1377981&r2=1377982&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Tue Aug 28 06:18:04 2012
@@ -164,7 +164,6 @@
<jaxp-ri.bundle.version>1.4.4_2</jaxp-ri.bundle.version>
<jdt-core.bundle.version>3.2.3_4</jdt-core.bundle.version>
<jdom.bundle.version>1.1_4</jdom.bundle.version>
- <jetty6.bundle.version>6.1.26_1</jetty6.bundle.version>
<jruby.bundle.version>1.1.2_3</jruby.bundle.version>
<josql.bundle.version>1.5_4</josql.bundle.version>
<jsmpp.bundle.version>2.1.0_2</jsmpp.bundle.version>
