7:15 p.m.
Author: thomas.diesler(a)jboss.com
Date: 2010-02-08 13:15:35 -0500 (Mon, 08 Feb 2010)
New Revision: 100712
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/reactor/
projects/jboss-osgi/trunk/reactor/pom.xml
projects/jboss-osgi/trunk/testsuite/example/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/pom.xml
Log:
Update trunk dependencies
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-08 18:05:53 UTC
(rev 100711)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-08 18:15:35 UTC
(rev 100712)
@@ -55,14 +55,14 @@
<version.jboss.osgi.apache.xerces>2.9.1.SP3</version.jboss.osgi.apache.xerces>
<version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
-
<version.jboss.osgi.deployment>1.0.1-SNAPSHOT</version.jboss.osgi.deployment>
- <version.jboss.osgi.husky>1.0.3-SNAPSHOT</version.jboss.osgi.husky>
+ <version.jboss.osgi.deployment>1.0.1</version.jboss.osgi.deployment>
+ <version.jboss.osgi.husky>1.0.4-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb>
- <version.jboss.osgi.jmx>1.0.3-SNAPSHOT</version.jboss.osgi.jmx>
- <version.jboss.osgi.reflect>2.2.0-SNAPSHOT</version.jboss.osgi.reflect>
-
<version.jboss.osgi.runtime.deployers>1.0.4-SNAPSHOT</version.jboss.osgi.runtime.deployers>
- <version.jboss.osgi.spi>1.0.4-SNAPSHOT</version.jboss.osgi.spi>
-
<version.jboss.osgi.xml.binding>2.0.2.Beta4-SNAPSHOT</version.jboss.osgi.xml.binding>
+ <version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx>
+ <version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect>
+
<version.jboss.osgi.runtime.deployers>1.0.4</version.jboss.osgi.runtime.deployers>
+ <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
+
<version.jboss.osgi.xml.binding>2.0.2.Beta4</version.jboss.osgi.xml.binding>
<version.jboss.test>1.1.4.GA</version.jboss.test>
<version.ops4j.pax.web>0.7.2</version.ops4j.pax.web>
<version.osgi>4.2.0</version.osgi>
@@ -385,19 +385,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>javacc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-idea-plugin</artifactId>
<configuration>
<downloadSources>true</downloadSources>
@@ -438,7 +425,7 @@
</property>
<property>
<name>org.jboss.osgi.husky.Invoker</name>
- <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
+ <value>org.jboss.osgi.husky.internal.AbstractInvoker</value>
</property>
<property>
<name>test.archive.directory</name>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2010-02-08 18:05:53 UTC (rev 100711)
+++ projects/jboss-osgi/trunk/pom.xml 2010-02-08 18:15:35 UTC (rev 100712)
@@ -58,11 +58,11 @@
<version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
<version.jboss.osgi.deployment>1.0.1</version.jboss.osgi.deployment>
-
<version.jboss.osgi.framework>1.0.0.Alpha3</version.jboss.osgi.framework>
+
<version.jboss.osgi.framework>1.0.0.Alpha4-SNAPSHOT</version.jboss.osgi.framework>
<version.jboss.osgi.hotdeploy>1.0.4</version.jboss.osgi.hotdeploy>
- <version.jboss.osgi.husky>1.0.3</version.jboss.osgi.husky>
+ <version.jboss.osgi.husky>1.0.4-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb>
- <version.jboss.osgi.jmx>1.0.3</version.jboss.osgi.jmx>
+ <version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx>
<version.jboss.osgi.jndi>1.0.2</version.jboss.osgi.jndi>
<version.jboss.osgi.jta>1.0.0</version.jboss.osgi.jta>
<version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect>
@@ -71,7 +71,7 @@
<version.jboss.osgi.runtime.felix>2.0.2</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.runtime.jbossas>1.0.2</version.jboss.osgi.runtime.jbossas>
<version.jboss.osgi.serviceloader>1.0.0</version.jboss.osgi.serviceloader>
- <version.jboss.osgi.spi>1.0.4</version.jboss.osgi.spi>
+ <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.osgi.webapp>0.7.2.SP1</version.jboss.osgi.webapp>
<version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole>
<version.jboss.osgi.xml.binding>2.0.2.Beta4</version.jboss.osgi.xml.binding>
@@ -423,7 +423,7 @@
</property>
<property>
<name>org.jboss.osgi.husky.Invoker</name>
- <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
+
<value>org.jboss.osgi.husky.internal.AbstractInvoker</value>
</property>
<property>
<name>test.archive.directory</name>
@@ -471,7 +471,7 @@
</property>
<property>
<name>org.jboss.osgi.husky.Invoker</name>
- <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
+
<value>org.jboss.osgi.husky.internal.AbstractInvoker</value>
</property>
<property>
<name>org.jboss.osgi.husky.runtime.connector.host</name>
Property changes on: projects/jboss-osgi/trunk/reactor
___________________________________________________________________
Name: svn:externals
+ ../../projects/runtime/framework/trunk framework
Modified: projects/jboss-osgi/trunk/reactor/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/pom.xml 2010-02-08 18:05:53 UTC (rev 100711)
+++ projects/jboss-osgi/trunk/reactor/pom.xml 2010-02-08 18:15:35 UTC (rev 100712)
@@ -46,6 +46,7 @@
<!--
Name: framework-jbossmc
Descr: Build the JBossMC Framework
+ -->
<profile>
<id>framework-jbossmc</id>
<activation>
@@ -69,7 +70,6 @@
<module>framework</module>
</modules>
</profile>
- -->
<!--
Name: jbossmc-javadoc
Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2010-02-08 18:05:53 UTC (rev
100711)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2010-02-08 18:15:35 UTC (rev
100712)
@@ -15,7 +15,7 @@
Set these VM properties in your IDE debugger
-Dlog4j.output.dir=${workspace_loc:jboss-osgi-testsuite-example/target}
- -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.OSGiInvoker
+ -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.AbstractInvoker
-Dtest.archive.directory=${workspace_loc:jboss-osgi-testsuite-example/target}/test-libs
-->
Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2010-02-08 18:05:53 UTC (rev
100711)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2010-02-08 18:15:35 UTC (rev
100712)
@@ -15,7 +15,7 @@
Set these VM properties in your IDE debugger
-Dlog4j.output.dir=${workspace_loc:jboss-osgi-testsuite-functional/target}
- -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.OSGiInvoker
+ -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.AbstractInvoker
-Dtest.archive.directory=${workspace_loc:jboss-osgi-testsuite-functional/target}/test-libs
-->