gistfile1.txt

diff --git a/assembly/src/main/filtered-resources/etc/jre.properties b/assembly/src/main/filtered-resources/etc/jre.properties
index ec48374..ceb568b 100644
--- a/assembly/src/main/filtered-resources/etc/jre.properties
+++ b/assembly/src/main/filtered-resources/etc/jre.properties
@@ -178,8 +178,6 @@ jre-1.6= \
  javax.imageio.plugins.jpeg, \
  javax.imageio.spi, \
  javax.imageio.stream, \
- javax.jws, \
- javax.jws.soap, \
  javax.lang.model, \
  javax.lang.model.element, \
  javax.lang.model.type, \
@@ -243,29 +241,15 @@ jre-1.6= \
  javax.swing.undo, \
  javax.tools, \
  javax.xml, \
- javax.xml.crypto, \
- javax.xml.crypto.dom, \
- javax.xml.crypto.dsig, \
- javax.xml.crypto.dsig.dom, \
- javax.xml.crypto.dsig.keyinfo, \
- javax.xml.crypto.dsig.spec, \
  javax.xml.datatype, \
  javax.xml.namespace, \
  javax.xml.parsers, \
- javax.xml.soap, \
  javax.xml.transform, \
  javax.xml.transform.dom, \
  javax.xml.transform.sax, \
  javax.xml.transform.stax, \
  javax.xml.transform.stream, \
  javax.xml.validation, \
- javax.xml.ws, \
- javax.xml.ws.handler, \
- javax.xml.ws.handler.soap, \
- javax.xml.ws.http, \
- javax.xml.ws.soap, \
- javax.xml.ws.spi, \
- javax.xml.ws.wsaddressing, \
  javax.xml.xpath, \
  org.ietf.jgss, \
  org.omg.CORBA, \
@@ -327,8 +311,6 @@ jre-1.7= \
  javax.imageio.plugins.jpeg, \
  javax.imageio.spi, \
  javax.imageio.stream, \
- javax.jws, \
- javax.jws.soap, \
  javax.lang.model, \
  javax.lang.model.element, \
  javax.lang.model.type, \
@@ -392,29 +374,15 @@ jre-1.7= \
  javax.swing.undo, \
  javax.tools, \
  javax.xml, \
- javax.xml.crypto, \
- javax.xml.crypto.dom, \
- javax.xml.crypto.dsig, \
- javax.xml.crypto.dsig.dom, \
- javax.xml.crypto.dsig.keyinfo, \
- javax.xml.crypto.dsig.spec, \
  javax.xml.datatype, \
  javax.xml.namespace, \
  javax.xml.parsers, \
- javax.xml.soap, \
  javax.xml.transform, \
  javax.xml.transform.dom, \
  javax.xml.transform.sax, \
  javax.xml.transform.stax, \
  javax.xml.transform.stream, \
  javax.xml.validation, \
- javax.xml.ws, \
- javax.xml.ws.handler, \
- javax.xml.ws.handler.soap, \
- javax.xml.ws.http, \
- javax.xml.ws.soap, \
- javax.xml.ws.spi, \
- javax.xml.ws.wsaddressing, \
  javax.xml.xpath, \
  org.ietf.jgss, \
  org.omg.CORBA, \
diff --git a/assembly/src/main/filtered-resources/features.xml b/assembly/src/main/filtered-resources/features.xml
index f2b1ad2..819bc19 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -47,8 +47,8 @@
       backend.id=workflow-persistence
       configuration.id=WORKFLOW
     </config>
-	<config name="org.openengsb.persistence.config-context">
-	  backend.id=contextFilePersistenceService
+    <config name="org.openengsb.persistence.config-context">
+      backend.id=contextFilePersistenceService
       configuration.id=CONTEXT
     </config>
 
@@ -74,10 +74,9 @@
     <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${jaxws.api.version}</bundle>
     <bundle start-level='10'>mvn:com.sun.mail/javax.mail/${javax.mail.version}</bundle> 
     <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1/${jsr311.api.version}</bundle>
-    <bundle start-level='10'>mvn:javax.jms/com.springsource.javax.jms/${javax.jms.version}</bundle>
     <!-- Templating -->
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.version}</bundle>
+    <bundle>mvn:org.apache.velocity/velocity/${velocity.version}</bundle>
     <!-- jaxb -->
     <bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb.wrapped.version}</bundle>
     <bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${jaxb.wrapped.version}</bundle>
@@ -113,7 +112,6 @@
     <bundle>mvn:org.codehaus.jackson/jackson-core-asl/${jackson.version}</bundle>
     <bundle>mvn:org.springframework/spring-jms/${spring.version}</bundle>
     <!-- OpenEngSB Deps (have to be splitted into the different parts -->
-    <bundle>mvn:javax.xml.soap/com.springsource.javax.xml.soap/${javax.xml.soap}</bundle>
     <bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${fastinfoset.version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.guava/${guava.wrapped.version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch.wrapped.version}</bundle>
@@ -213,7 +211,8 @@
     <bundle>mvn:joda-time/joda-time/${joda.version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${opensaml.version}</bundle>
     <bundle>mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
-    <bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${saaj.impl.version}</bundle>
+    <bundle start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${saaj.impl.version}</bundle>
+    <bundle start-level="25">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxp-ri/1.4.4_2</bundle>
     <bundle start-level='20'>mvn:org.codehaus.woodstox/stax2-api/${stax2.api.version}</bundle>
     <bundle start-level='20'>mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox.version}</bundle>
     <bundle>mvn:org.apache.neethi/neethi/${neethi.version}</bundle>
diff --git a/parents/shared/pom.xml b/parents/shared/pom.xml
index 7d3ca44..18b6f4b 100644
--- a/parents/shared/pom.xml
+++ b/parents/shared/pom.xml
@@ -173,7 +173,7 @@
     <xmltooling.version>1.3.1</xmltooling.version>
     <openws.version>1.4.1</openws.version>
     <opensaml.version>2.4.1_1</opensaml.version>
-    <wss4j.version>1.6.1</wss4j.version>
+    <wss4j.version>1.6.2</wss4j.version>
     <log4j.version>1.2.14</log4j.version>
     <lucene.version>2.4.1</lucene.version>
     <maven.code.version>3.0-alpha-2</maven.code.version>
@@ -201,7 +201,7 @@
     <backport.util.concurrent.version>2.2</backport.util.concurrent.version>
     <classworlds.version>1.1</classworlds.version>
     <derby.version>10.2.2.0</derby.version>
-    <velocity.version>1.6.2_4</velocity.version>
+    <velocity.version>1.7</velocity.version>
     <jdom.version>1.1_3</jdom.version>
     <geronimo.ejb.version>1.1</geronimo.ejb.version>
     <geronimo.j2ee.version>2.0.0</geronimo.j2ee.version>
@@ -218,7 +218,7 @@
     <stax2.api.version>3.1.1</stax2.api.version>
     <staxex.version>1.0.0</staxex.version>
     <woodstox.version>4.1.1</woodstox.version>
-    <neethi.version>3.0.0</neethi.version>
+    <neethi.version>3.0.1</neethi.version>
     <howl.version>1.0.1-1</howl.version>
     <hsqldb.version>1.7.3.3</hsqldb.version>
     <javax.mail.version>1.4.4</javax.mail.version>
@@ -232,7 +232,7 @@
     <jasypt.version>1.6_1</jasypt.version>
     <mvel2.version>2.1.0.drools2</mvel2.version>
     <fastinfoset.version>1.2.7_3</fastinfoset.version>
-    <activation.api.version>1.7.0</activation.api.version>
+    <activation.api.version>1.8.0</activation.api.version>
     <xstream.version>1.3.1</xstream.version>
     <xmlpull.version>1.1.4.c</xmlpull.version>
     <antlr.version>3.1.3</antlr.version>