Author: gnodet
Date: Wed Jun 11 03:06:03 2008
New Revision: 666598
URL: http://svn.apache.org/viewvc?rev=666598&view=rev
Log:
Upgrade to smx kernel 1.0.0-rc1
Modified:
servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF
servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml
servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml
servicemix/smx4/nmr/trunk/pom.xml
Modified:
servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF?rev=666598&r1=666597&r2=666598&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF
(original)
+++
servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF
Wed Jun 11 03:06:03 2008
@@ -24,6 +24,7 @@
org.apache.commons.logging,
org.springframework.core.io,
org.springframework.osgi.test,
+ org.apache.servicemix.document,
org.apache.servicemix.nmr.api,
org.apache.servicemix.nmr.core,
org.apache.servicemix.jbi.deployer,
Modified: servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml?rev=666598&r1=666597&r2=666598&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml Wed Jun 11 03:06:03 2008
@@ -67,6 +67,7 @@
javax.management,
javax.naming,
javax.transaction,
+ org.apache.servicemix.document,
org.apache.servicemix.nmr.api,
org.apache.servicemix.jbi.runtime,
org.apache.servicemix.jbi.runtime.impl,
Modified: servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml?rev=666598&r1=666597&r2=666598&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml Wed Jun 11 03:06:03 2008
@@ -81,10 +81,13 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>
+ org.apache.servicemix.document,
org.apache.servicemix.nmr.api,
org.apache.servicemix.nmr.api.event,
org.apache.servicemix.nmr.api.internal,
+ org.apache.servicemix.nmr.api.security,
org.apache.servicemix.nmr.core,
+ org.apache.servicemix.nmr.core.security,
org.apache.servicemix.nmr.osgi,
*
</Import-Package>
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=666598&r1=666597&r2=666598&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Wed Jun 11 03:06:03 2008
@@ -81,15 +81,15 @@
<jline.version>0.9.93</jline.version>
<log4j.version>1.2.14</log4j.version>
<mina.version>1.1.6</mina.version>
- <pax.logging.version>1.0</pax.logging.version>
+ <pax.logging.version>1.1.1</pax.logging.version>
<servicemix3.version>3.2.1</servicemix3.version>
- <servicemix.kernel.version>1.0-m3</servicemix.kernel.version>
+ <servicemix.kernel.version>1.0.0-rc1</servicemix.kernel.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
<servicemix.specs.version>1.0-SNAPSHOT</servicemix.specs.version>
- <spring.osgi.version>1.0.2</spring.osgi.version>
- <spring.version>2.5.2</spring.version>
+ <spring.osgi.version>1.1.0-m2</spring.osgi.version>
+ <spring.version>2.5.4</spring.version>
<woodstox.version>3.2.3</woodstox.version>
- <xbean.version>3.3.1-r631610</xbean.version>
+ <xbean.version>3.4.1</xbean.version>
<xstream.version>1.2.2</xstream.version>
</properties>
