[jboss-cvs] JBossAS SVN: r89423 - in projects/jboss-osgi/trunk: 3rdparty/apache-xerces and 25 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 26 04:10:22 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-05-26 04:10:22 -0400 (Tue, 26 May 2009)
New Revision: 89423
Modified:
projects/jboss-osgi/trunk/3rdparty/apache-xerces/pom.xml
projects/jboss-osgi/trunk/3rdparty/jbossxb/pom.xml
projects/jboss-osgi/trunk/blueprint/pom.xml
projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml
projects/jboss-osgi/trunk/blueprint/testsuite/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/jboss-osgi-framework.properties
projects/jboss-osgi/trunk/bundles/common/pom.xml
projects/jboss-osgi/trunk/bundles/jmx/pom.xml
projects/jboss-osgi/trunk/bundles/jndi/pom.xml
projects/jboss-osgi/trunk/bundles/logging/pom.xml
projects/jboss-osgi/trunk/bundles/microcontainer/pom.xml
projects/jboss-osgi/trunk/bundles/remotelog/pom.xml
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-equinox.properties
projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties
projects/jboss-osgi/trunk/docbook/pom.xml
projects/jboss-osgi/trunk/husky/pom.xml
projects/jboss-osgi/trunk/husky/testsuite/pom.xml
projects/jboss-osgi/trunk/integration/deployers/pom.xml
projects/jboss-osgi/trunk/integration/jbossas/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/repository/api/pom.xml
projects/jboss-osgi/trunk/runtime/equinox/pom.xml
projects/jboss-osgi/trunk/runtime/felix/pom.xml
projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml
projects/jboss-osgi/trunk/runtime/microcontainer/osgi-int/pom.xml
projects/jboss-osgi/trunk/spi/pom.xml
projects/jboss-osgi/trunk/testsuite/.project
Log:
Move dependency management to top-level
Modified: projects/jboss-osgi/trunk/3rdparty/apache-xerces/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/3rdparty/apache-xerces/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/3rdparty/apache-xerces/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -19,7 +19,6 @@
<version.apache.xerces>2.9.1</version.apache.xerces>
<version.wutka.dtdparser>1.2.1</version.wutka.dtdparser>
<version.xml.resolver>1.2</version.xml.resolver>
- <version.osgi>r4v41</version.osgi>
</properties>
<dependencies>
@@ -47,13 +46,11 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/3rdparty/jbossxb/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/3rdparty/jbossxb/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/3rdparty/jbossxb/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -16,10 +16,8 @@
</parent>
<properties>
- <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common>
<version.jboss.xb>2.0.0.GA</version.jboss.xb>
<version.javassist>3.9.0.GA</version.javassist>
- <version.osgi>r4v41</version.osgi>
<!-- Transitive Dependencies -->
<version.jboss.reflect>2.0.0.GA</version.jboss.reflect>
@@ -41,19 +39,16 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/blueprint/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/blueprint/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/blueprint/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -21,91 +21,4 @@
<module>testsuite</module>
</modules>
- <!-- Properties -->
- <properties>
- <version.apache.xerces.bundle>2.9.1-SNAPSHOT</version.apache.xerces.bundle>
- <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common>
- <version.jboss.osgi.husky>1.0.0-SNAPSHOT</version.jboss.osgi.husky>
- <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx>
- <version.jboss.osgi.logging>1.0.0-SNAPSHOT</version.jboss.osgi.logging>
- <version.jboss.osgi.runtime.felix>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix>
- <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
- <version.jboss.common.core.bundle>2.2.11-SNAPSHOT</version.jboss.common.core.bundle>
- <version.jbossxb.bundle>2.0.0-SNAPSHOT</version.jbossxb.bundle>
- <version.osgi>r4v41</version.osgi>
- </properties>
-
- <!-- Dependencies -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bnd</artifactId>
- <version>${version.aqute.bnd}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
- </dependency>
-
-
- <!-- OSGi Dependencies -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
- </dependency>
-
- <!-- Bundle Dependencies -->
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-apache-xerces</artifactId>
- <version>${version.apache.xerces.bundle}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jmx</artifactId>
- <version>${version.jboss.osgi.jmx}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-husky-harness</artifactId>
- <version>${version.jboss.osgi.husky}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-logging</artifactId>
- <version>${version.jboss.osgi.logging}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-xml-binding</artifactId>
- <version>${version.jbossxb.bundle}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common-core</artifactId>
- <version>${version.jboss.common.core.bundle}</version>
- </dependency>
-
- <!-- Test Dependencies -->
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
- <version>${version.jboss.osgi.runtime.felix}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
</project>
Modified: projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -32,6 +32,8 @@
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-husky-harness</artifactId>
</dependency>
+
+ <!-- OSGi Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -45,7 +47,6 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-blueprint-impl</artifactId>
- <version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -65,6 +66,11 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jaxb</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jmx</artifactId>
<scope>provided</scope>
</dependency>
Modified: projects/jboss-osgi/trunk/blueprint/testsuite/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/scripts/assembly-bundles.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/scripts/assembly-bundles.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -20,6 +20,7 @@
<include>*:jboss-osgi-common:jar</include>
<include>*:jboss-osgi-common-core:jar</include>
<include>*:jboss-osgi-husky-harness:jar</include>
+ <include>*:jboss-osgi-jaxb:jar</include>
<include>*:jboss-osgi-jmx:jar</include>
<include>*:jboss-osgi-logging:jar</include>
<include>*:jboss-osgi-xml-binding:jar</include>
Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/jboss-osgi-framework.properties 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/jboss-osgi-framework.properties 2009-05-26 08:10:22 UTC (rev 89423)
@@ -34,6 +34,7 @@
file://${test.archive.directory}/bundles/jboss-osgi-husky-harness.jar \
file://${test.archive.directory}/bundles/jboss-osgi-common-core.jar \
file://${test.archive.directory}/bundles/jboss-osgi-apache-xerces.jar \
+ file://${test.archive.directory}/bundles/jboss-osgi-jaxb.jar \
file://${test.archive.directory}/bundles/jboss-osgi-xml-binding.jar \
file://${test.archive.directory}/bundles/jboss-osgi-blueprint-impl.jar
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/bundles/common/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundles/common/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/bundles/common/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -15,11 +15,6 @@
<version>1.0.0.Beta2</version>
</parent>
- <!-- Properties -->
- <properties>
- <version.osgi>r4v41</version.osgi>
- </properties>
-
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -27,16 +22,16 @@
<artifactId>jboss-logging-spi</artifactId>
<scope>provided</scope>
</dependency>
+
+ <!-- OSGi Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/bundles/jmx/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundles/jmx/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/bundles/jmx/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -15,24 +15,18 @@
<version>1.0.0.Beta2</version>
</parent>
- <!-- Properties -->
- <properties>
- <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common>
- <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
- <version.osgi>r4v41</version.osgi>
- </properties>
-
<!-- Dependencies -->
<dependencies>
+
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
</dependency>
+
+ <!-- OSGi Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
@@ -40,19 +34,16 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jndi</artifactId>
- <version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/bundles/jndi/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundles/jndi/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/bundles/jndi/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -17,9 +17,7 @@
<!-- Properties -->
<properties>
- <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common>
<version.jboss.naming>5.0.1.GA</version.jboss.naming>
- <version.osgi>r4v41</version.osgi>
</properties>
<!-- Dependencies -->
@@ -31,26 +29,25 @@
<version>${version.jboss.naming}</version>
<scope>provided</scope>
</dependency>
+
+ <!-- OSGi Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Bundles -->
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Modified: projects/jboss-osgi/trunk/bundles/logging/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundles/logging/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/bundles/logging/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -17,11 +17,6 @@
<version>1.0.0.Beta2</version>
</parent>
- <!-- Properties -->
- <properties>
- <version.osgi>r4v41</version.osgi>
- </properties>
-
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -29,16 +24,16 @@
<artifactId>jboss-logging-spi</artifactId>
<scope>provided</scope>
</dependency>
+
+ <!-- OSGi Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/bundles/microcontainer/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundles/microcontainer/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/bundles/microcontainer/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -17,75 +17,52 @@
<version>1.0.0.Beta2</version>
</parent>
- <!-- Properties -->
- <properties>
- <version.apache.xerces.bundle>2.9.1-SNAPSHOT</version.apache.xerces.bundle>
- <version.jboss.deployers>2.0.5.GA</version.jboss.deployers>
- <version.jboss.microcontainer>2.0.4.GA</version.jboss.microcontainer>
- <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common>
- <version.jboss.osgi.deployers>1.0.0-SNAPSHOT</version.jboss.osgi.deployers>
- <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx>
- <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
- <version.jbossxb.bundle>2.0.0-SNAPSHOT</version.jbossxb.bundle>
- <version.osgi>r4v41</version.osgi>
- </properties>
-
<!-- Dependencies -->
<dependencies>
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
- <version>${version.jboss.deployers}</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>${version.jboss.microcontainer}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-deployers</artifactId>
- <version>${version.jboss.osgi.deployers}</version>
</dependency>
<!-- Bundle Dependencies -->
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jmx</artifactId>
- <version>${version.jboss.osgi.jmx}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-apache-xerces</artifactId>
- <version>${version.apache.xerces.bundle}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-xml-binding</artifactId>
- <version>${version.jbossxb.bundle}</version>
</dependency>
<!-- Provided Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/bundles/remotelog/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundles/remotelog/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/bundles/remotelog/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -20,10 +20,8 @@
<!-- Properties -->
<properties>
<version.concurrent>1.3.4</version.concurrent>
- <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.remoting>2.5.0.SP2</version.jboss.remoting>
<version.jboss.serialization>1.0.3.GA</version.jboss.serialization>
- <version.osgi>r4v41</version.osgi>
</properties>
<!-- Dependencies -->
@@ -31,18 +29,17 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
</dependency>
+
+ <!-- OSGi Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -24,19 +24,13 @@
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi</artifactId>
<version>1.0.0.Beta2</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <!-- Properties -->
- <properties>
- </properties>
-
<!-- Dependencies -->
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-deployers</artifactId>
- <version>${version.jboss.osgi.deployers}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
@@ -47,7 +41,6 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-integration-jbossas</artifactId>
- <version>${version.jboss.osgi.integration.jbossas}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
Modified: projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-equinox.properties 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-equinox.properties 2009-05-26 08:10:22 UTC (rev 89423)
@@ -63,10 +63,10 @@
# Bundles that need to be started automatically
org.jboss.osgi.spi.framework.autoStart=\
file://${osgi.home}/bundles/org.apache.felix.log.jar \
- file://${osgi.home}/bundles/apache-xerces-bundle.jar \
- file://${osgi.home}/bundles/jboss-common-core-bundle.jar \
- file://${osgi.home}/bundles/jaxb-bundle.jar \
- file://${osgi.home}/bundles/jbossxb-bundle.jar \
+ file://${osgi.home}/bundles/jboss-osgi-apache-xerces.jar \
+ file://${osgi.home}/bundles/jboss-osgi-common-core.jar \
+ file://${osgi.home}/bundles/jboss-osgi-jaxb.jar \
+ file://${osgi.home}/bundles/jboss-osgi-xml-binding.jar \
file://${osgi.home}/bundles/jboss-osgi-common.jar \
file://${osgi.home}/bundles/jboss-osgi-logging.jar \
file://${osgi.home}/bundles/jboss-osgi-jndi.jar \
Modified: projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties 2009-05-26 08:10:22 UTC (rev 89423)
@@ -63,10 +63,10 @@
# Bundles that need to be started automatically
org.jboss.osgi.spi.framework.autoStart=\
file://${osgi.home}/bundles/org.apache.felix.log.jar \
- file://${osgi.home}/bundles/apache-xerces-bundle.jar \
- file://${osgi.home}/bundles/jboss-common-core-bundle.jar \
- file://${osgi.home}/bundles/jaxb-bundle.jar \
- file://${osgi.home}/bundles/jbossxb-bundle.jar \
+ file://${osgi.home}/bundles/jboss-osgi-apache-xerces.jar \
+ file://${osgi.home}/bundles/jboss-osgi-common-core.jar \
+ file://${osgi.home}/bundles/jboss-osgi-jaxb.jar \
+ file://${osgi.home}/bundles/jboss-osgi-xml-binding.jar \
file://${osgi.home}/bundles/jboss-osgi-common.jar \
file://${osgi.home}/bundles/jboss-osgi-logging.jar \
file://${osgi.home}/bundles/jboss-osgi-jndi.jar \
Modified: projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties 2009-05-26 08:10:22 UTC (rev 89423)
@@ -63,10 +63,10 @@
# Bundles that need to be started automatically
org.jboss.osgi.spi.framework.autoStart=\
file://${osgi.home}/bundles/org.apache.felix.log.jar \
- file://${osgi.home}/bundles/apache-xerces-bundle.jar \
- file://${osgi.home}/bundles/jboss-common-core-bundle.jar \
- file://${osgi.home}/bundles/jaxb-bundle.jar \
- file://${osgi.home}/bundles/jbossxb-bundle.jar \
+ file://${osgi.home}/bundles/jboss-osgi-apache-xerces.jar \
+ file://${osgi.home}/bundles/jboss-osgi-common-core.jar \
+ file://${osgi.home}/bundles/jboss-osgi-jaxb.jar \
+ file://${osgi.home}/bundles/jboss-osgi-xml-binding.jar \
file://${osgi.home}/bundles/jboss-osgi-common.jar \
file://${osgi.home}/bundles/jboss-osgi-logging.jar \
file://${osgi.home}/bundles/jboss-osgi-jndi.jar \
Modified: projects/jboss-osgi/trunk/docbook/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/docbook/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/docbook/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -24,7 +24,6 @@
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi</artifactId>
<version>1.0.0.Beta2</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<!-- Plugins -->
Modified: projects/jboss-osgi/trunk/husky/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/husky/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/husky/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<name>JBossOSGi Husky</name>
- <description>JBoss OSGi Bundle Testsuite</description>
+ <description>JBoss OSGi Test Support</description>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-husky</artifactId>
@@ -37,55 +37,4 @@
<module>testsuite</module>
</modules>
- <!-- Properties -->
- <properties>
- <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common>
- <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx>
- <version.jboss.osgi.logging>1.0.0-SNAPSHOT</version.jboss.osgi.logging>
- <version.jboss.osgi.runtime.felix>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix>
- <version.junit>4.6</version.junit>
- <version.osgi>r4v41</version.osgi>
- </properties>
-
- <!-- Dependencies -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jmx</artifactId>
- <version>${version.jboss.osgi.jmx}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-logging</artifactId>
- <version>${version.jboss.osgi.logging}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
- <version>${version.jboss.osgi.runtime.felix}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
</project>
Modified: projects/jboss-osgi/trunk/husky/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/husky/testsuite/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/husky/testsuite/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -56,25 +56,21 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-husky-harness</artifactId>
- <version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jmx</artifactId>
- <version>${version.jboss.osgi.jmx}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-logging</artifactId>
- <version>${version.jboss.osgi.logging}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/integration/deployers/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/integration/deployers/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/integration/deployers/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -16,31 +16,22 @@
<version>1.0.0.Beta2</version>
</parent>
- <!-- Properties -->
- <properties>
- <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
- <version.jboss.system.jmx>5.0.1.GA</version.jboss.system.jmx>
- <version.osgi>r4v41</version.osgi>
- </properties>
-
<!-- Dependencies -->
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
</dependency>
+ <!-- OSGi Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/integration/jbossas/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/integration/jbossas/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/integration/jbossas/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -16,29 +16,22 @@
<version>1.0.0.Beta2</version>
</parent>
- <!-- Properties -->
- <properties>
- <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
- <version.osgi>r4v41</version.osgi>
- </properties>
-
<!-- Dependencies -->
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
</dependency>
+
+ <!-- OSGi Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -40,18 +40,21 @@
<version.felix.webconsole>1.2.8</version.felix.webconsole>
<version.izpack>4.2.0</version.izpack>
<version.javax.servlet>2.4</version.javax.servlet>
- <version.jaxb.bundle>2.1.10-SNAPSHOT</version.jaxb.bundle>
- <version.jboss.common.core.bundle>2.2.11-SNAPSHOT</version.jboss.common.core.bundle>
+ <version.jboss.aop>2.0.1.GA</version.jboss.aop>
+ <version.jboss.deployers>2.0.5.GA</version.jboss.deployers>
<version.jboss.jdocbook.plugin>2.1.2</version.jboss.jdocbook.plugin>
<version.jboss.jdocbook.style>1.1.0</version.jboss.jdocbook.style>
<version.jboss.logging>2.0.5.GA</version.jboss.logging>
<version.jboss.microcontainer>2.0.4.GA</version.jboss.microcontainer>
<version.jboss.naming>5.0.1.GA</version.jboss.naming>
<version.jboss.osgi.apache.xerces>2.9.1-SNAPSHOT</version.jboss.osgi.apache.xerces>
+ <version.jboss.osgi.blueprint>1.0.0-SNAPSHOT</version.jboss.osgi.blueprint>
<version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common>
+ <version.jboss.osgi.common.core>2.2.11-SNAPSHOT</version.jboss.osgi.common.core>
<version.jboss.osgi.deployers>1.0.0-SNAPSHOT</version.jboss.osgi.deployers>
- <version.jboss.osgi.jbossxb>2.0.0-SNAPSHOT</version.jboss.osgi.jbossxb>
+ <version.jboss.osgi.husky>1.0.0-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.integration.jbossas>1.0.0-SNAPSHOT</version.jboss.osgi.integration.jbossas>
+ <version.jboss.osgi.jaxb>2.1.10-SNAPSHOT</version.jboss.osgi.jaxb>
<version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx>
<version.jboss.osgi.jndi>1.0.0-SNAPSHOT</version.jboss.osgi.jndi>
<version.jboss.osgi.logging>1.0.0-SNAPSHOT</version.jboss.osgi.logging>
@@ -62,6 +65,7 @@
<version.jboss.osgi.runtime.knopflerfish>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.knopflerfish>
<version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.osgi.webconsole>1.0.0-SNAPSHOT</version.jboss.osgi.webconsole>
+ <version.jboss.osgi.xml.binding>2.0.0-SNAPSHOT</version.jboss.osgi.xml.binding>
<version.jbossas>5.0.1.GA</version.jbossas>
<version.junit>4.6</version.junit>
<version.knopflerfish>2.2.0</version.knopflerfish>
@@ -71,71 +75,72 @@
<!-- DependencyManagement -->
<dependencyManagement>
<dependencies>
+
+ <!-- JBoss OSGi Dependencies -->
<dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bnd</artifactId>
- <version>${version.aqute.bnd}</version>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-blueprint-impl</artifactId>
+ <version>${version.jboss.osgi.blueprint}</version>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${version.jboss.logging}</version>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-deployers</artifactId>
+ <version>${version.jboss.osgi.deployers}</version>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <version>${version.jboss.logging}</version>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-integration-jbossas</artifactId>
+ <version>${version.jboss.osgi.integration.jbossas}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-husky-harness</artifactId>
+ <version>${version.jboss.osgi.husky}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${version.javax.servlet}</version>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
</dependency>
+
+ <!-- JBoss OSGi Bundle Dependencies -->
<dependency>
- <groupId>org.codehaus.izpack</groupId>
- <artifactId>izpack-standalone-compiler</artifactId>
- <version>${version.izpack}</version>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jmx</artifactId>
+ <version>${version.jboss.osgi.jmx}</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- <version>${version.jboss.microcontainer}</version>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jndi</artifactId>
+ <version>${version.jboss.osgi.jndi}</version>
</dependency>
<dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnpserver</artifactId>
- <version>${version.jboss.naming}</version>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-logging</artifactId>
+ <version>${version.jboss.osgi.logging}</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-client</artifactId>
- <version>${version.jbossas}</version>
- <type>pom</type>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-microcontainer</artifactId>
+ <version>${version.jboss.osgi.microcontainer}</version>
</dependency>
-
- <!-- OSGi Dependencies -->
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-remotelog</artifactId>
+ <version>${version.jboss.osgi.remotelog}</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-webconsole</artifactId>
+ <version>${version.jboss.osgi.webconsole}</version>
</dependency>
- <!-- Bundle Dependencies -->
+ <!-- 3rd Party Bundle Dependencies -->
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-apache-xerces</artifactId>
@@ -143,55 +148,110 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jaxb</artifactId>
- <version>${version.jaxb.bundle}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common-core</artifactId>
- <version>${version.jboss.common.core.bundle}</version>
+ <version>${version.jboss.osgi.common.core}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
+ <artifactId>jboss-osgi-jaxb</artifactId>
+ <version>${version.jboss.osgi.jaxb}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-xml-binding</artifactId>
- <version>${version.jboss.osgi.jbossxb}</version>
+ <version>${version.jboss.osgi.xml.binding}</version>
</dependency>
+
+ <!-- 3rd Party Dependencies -->
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jmx</artifactId>
- <version>${version.jboss.osgi.jmx}</version>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bnd</artifactId>
+ <version>${version.aqute.bnd}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
- <version>${version.jboss.osgi.jndi}</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${version.javax.servlet}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-logging</artifactId>
- <version>${version.jboss.osgi.logging}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-microcontainer</artifactId>
- <version>${version.jboss.osgi.microcontainer}</version>
+ <groupId>org.codehaus.izpack</groupId>
+ <artifactId>izpack-standalone-compiler</artifactId>
+ <version>${version.izpack}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-remotelog</artifactId>
- <version>${version.jboss.osgi.remotelog}</version>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>${version.jboss.aop}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-webconsole</artifactId>
- <version>${version.jboss.osgi.webconsole}</version>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ <version>${version.jboss.deployers}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>${version.jboss.logging}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <version>${version.jboss.logging}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ <version>${version.jboss.microcontainer}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${version.jboss.microcontainer}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ <version>${version.jboss.naming}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-client</artifactId>
+ <version>${version.jbossas}</version>
+ <type>pom</type>
+ </dependency>
+ <!-- OSGi Dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
+ </dependency>
+
<!-- Equinox Dependencies -->
<dependency>
<groupId>org.jboss.osgi</groupId>
@@ -419,7 +479,7 @@
</snapshots>
</pluginRepository>
</pluginRepositories>
-
+
<!-- Source Repository -->
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi</connection>
@@ -473,7 +533,7 @@
</plugin>
</plugins>
</reporting>
-
+
<!-- Profiles -->
<profiles>
Modified: projects/jboss-osgi/trunk/repository/api/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/repository/api/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/repository/api/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -11,17 +11,11 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
- <!-- Properties -->
- <properties>
- <version.osgi>r4v41</version.osgi>
- </properties>
-
<!-- Dependencies -->
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
</dependency>
</dependencies>
</project>
Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -16,17 +16,11 @@
<version>1.0.0.Beta2</version>
</parent>
- <!-- Properties -->
- <properties>
- <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
- </properties>
-
<!-- Dependencies -->
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -16,17 +16,11 @@
<version>1.0.0.Beta2</version>
</parent>
- <!-- Properties -->
- <properties>
- <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
- </properties>
-
<!-- Dependencies -->
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -16,18 +16,11 @@
<version>1.0.0.Beta2</version>
</parent>
- <!-- Properties -->
- <properties>
- <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
- <version.osgi>r4v41</version.osgi>
- </properties>
-
<!-- Dependencies -->
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
</dependency>
<dependency>
<groupId>org.knopflerfish</groupId>
@@ -36,7 +29,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/runtime/microcontainer/osgi-int/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/microcontainer/osgi-int/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/runtime/microcontainer/osgi-int/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -13,11 +13,7 @@
<!-- Properties -->
<properties>
- <version.jboss.aop>2.0.1.GA</version.jboss.aop>
- <version.jboss.deployers>2.0.5.GA</version.jboss.deployers>
- <version.jboss.microcontainer>2.0.4.GA</version.jboss.microcontainer>
<version.jboss.test>1.0.5.GA</version.jboss.test>
- <version.osgi>r4v41</version.osgi>
</properties>
<dependencies>
@@ -25,32 +21,26 @@
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>${version.jboss.microcontainer}</version>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>${version.jboss.deployers}</version>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
- <version>${version.jboss.deployers}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
</dependency>
<dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
- <version>${version.jboss.aop}</version>
<exclusions>
<exclusion>
<groupId>ant</groupId>
@@ -111,7 +101,6 @@
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-impl</artifactId>
- <version>${version.jboss.deployers}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/spi/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/spi/pom.xml 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/spi/pom.xml 2009-05-26 08:10:22 UTC (rev 89423)
@@ -17,13 +17,6 @@
<version>1.0.0.Beta2</version>
</parent>
- <!-- Properties -->
- <properties>
- <version.jboss.deployers>2.0.5.GA</version.jboss.deployers>
- <version.jboss.microcontainer>2.0.4.GA</version.jboss.microcontainer>
- <version.osgi>r4v41</version.osgi>
- </properties>
-
<!-- Dependencies -->
<dependencies>
@@ -35,7 +28,6 @@
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
- <version>${version.jboss.deployers}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -46,25 +38,21 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-client-spi</artifactId>
- <version>${version.jboss.deployers}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>${version.jboss.microcontainer}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/testsuite/.project
===================================================================
--- projects/jboss-osgi/trunk/testsuite/.project 2009-05-26 07:07:36 UTC (rev 89422)
+++ projects/jboss-osgi/trunk/testsuite/.project 2009-05-26 08:10:22 UTC (rev 89423)
@@ -6,11 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
@@ -18,6 +13,5 @@
</buildSpec>
<natures>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
More information about the jboss-cvs-commits
mailing list