8:48 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-10-29 09:48:34 -0400 (Thu, 29 Oct 2009)
New Revision: 95759
Modified:
projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/reactor/deployment/pom.xml
projects/jboss-osgi/trunk/reactor/testing/pom.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Update husky
Modified:
projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml
===================================================================
---
projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml 2009-10-29
13:30:22 UTC (rev 95758)
+++
projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml 2009-10-29
13:48:34 UTC (rev 95759)
@@ -347,9 +347,8 @@
<sect1 xml:id="SecMicrocontainerServiceExample">
<title>Microcontainer Service Example</title>
- <para>The <emphasis
role="bold">example-microcontainer.jar</emphasis> bundle contains a
Service
- that calls a service from an MC bean and vica versa. The MC bean registeres itself as
an MBean
- after it got the MBeanServer injected.</para>
+ <para>The <emphasis
role="bold">example-microcontainer.jar</emphasis> bundle calls a
service
+ from an MC bean and vica versa. The MC bean gets the MBeanServer injected and
registeres itself as an MBean.</para>
<para>The test accesses the registered MBean.</para>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-10-29 13:30:22 UTC (rev 95758)
+++ projects/jboss-osgi/trunk/pom.xml 2009-10-29 13:48:34 UTC (rev 95759)
@@ -43,7 +43,6 @@
<!-- Properties -->
<properties>
- <version.aqute.bnd>0.0.356</version.aqute.bnd>
<version.apache.felix.configadmin>1.0.10</version.apache.felix.configadmin>
<version.apache.felix.core>1.4.0</version.apache.felix.core>
<version.apache.felix.eventadmin>1.0.0</version.apache.felix.eventadmin>
@@ -54,10 +53,10 @@
<version.jboss.osgi.blueprint>1.0.0.Alpha3</version.jboss.osgi.blueprint>
<version.jboss.osgi.common>1.0.3-SNAPSHOT</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
-
<version.jboss.osgi.deployment>0.0.1-SNAPSHOT</version.jboss.osgi.deployment>
+
<version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment>
<version.jboss.osgi.framework>1.0.0.Alpha2</version.jboss.osgi.framework>
<version.jboss.osgi.hotdeploy>1.0.3-SNAPSHOT</version.jboss.osgi.hotdeploy>
- <version.jboss.osgi.husky>1.0.1</version.jboss.osgi.husky>
+ <version.jboss.osgi.husky>1.0.2-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10.SP2</version.jboss.osgi.jaxb>
<version.jboss.osgi.jmx>1.0.2-SNAPSHOT</version.jboss.osgi.jmx>
<version.jboss.osgi.jndi>1.0.1</version.jboss.osgi.jndi>
@@ -68,7 +67,7 @@
<version.jboss.osgi.runtime.felix>2.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.runtime.jbossas>1.0.2-SNAPSHOT</version.jboss.osgi.runtime.jbossas>
<version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
- <version.jboss.osgi.testing>0.0.1-SNAPSHOT</version.jboss.osgi.testing>
+ <version.jboss.osgi.testing>1.0.0-SNAPSHOT</version.jboss.osgi.testing>
<version.jboss.osgi.webapp>0.7.2-SNAPSHOT</version.jboss.osgi.webapp>
<version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole>
<version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding>
@@ -83,14 +82,7 @@
<!-- DependencyManagement -->
<dependencyManagement>
<dependencies>
-
- <!-- aQute -->
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bnd</artifactId>
- <version>${version.aqute.bnd}</version>
- </dependency>
-
+
<!-- jboss.osgi -->
<dependency>
<groupId>org.jboss.osgi</groupId>
Modified: projects/jboss-osgi/trunk/reactor/deployment/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/deployment/pom.xml 2009-10-29 13:30:22 UTC (rev
95758)
+++ projects/jboss-osgi/trunk/reactor/deployment/pom.xml 2009-10-29 13:48:34 UTC (rev
95759)
@@ -20,7 +20,7 @@
<artifactId>jboss-osgi-deployment</artifactId>
<packaging>jar</packaging>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
Modified: projects/jboss-osgi/trunk/reactor/testing/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/testing/pom.xml 2009-10-29 13:30:22 UTC (rev 95758)
+++ projects/jboss-osgi/trunk/reactor/testing/pom.xml 2009-10-29 13:48:34 UTC (rev 95759)
@@ -20,7 +20,7 @@
<artifactId>jboss-osgi-testing</artifactId>
<packaging>jar</packaging>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-10-29 13:30:22 UTC (rev 95758)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-10-29 13:48:34 UTC (rev 95759)
@@ -134,6 +134,16 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jmx</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jndi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jta</artifactId>
<scope>provided</scope>
</dependency>