10:29 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2010-03-12 11:29:26 -0500 (Fri, 12 Mar 2010)
New Revision: 102352
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml
projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml
Log:
Cleanup framework dependencies
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-12 16:26:37 UTC
(rev 102351)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-12 16:29:26 UTC
(rev 102352)
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
-<!-- $Id$ -->
+ <!-- $Id$ -->
<!--
Set these VM properties in your IDE debugger
@@ -84,65 +84,15 @@
<dependencies>
<dependency>
<groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloader</artifactId>
- <version>${version.jboss.classloading}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading</artifactId>
- <version>${version.jboss.classloading}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
<artifactId>jboss-classloading-vfs</artifactId>
<version>${version.jboss.classloading}</version>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
- <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-core</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-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-structure-spi</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.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
<version>${version.jboss.deployers}</version>
</dependency>
<dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-jmx</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
<version>${version.jboss.kernel}</version>
@@ -158,16 +108,6 @@
<version>${version.jboss.kernel}</version>
</dependency>
<dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-dependency</artifactId>
- <version>${version.jboss.kernel}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${version.jboss.logging}</version>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-mdr</artifactId>
<version>${version.jboss.mdr}</version>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml 2010-03-12 16:26:37
UTC (rev 102351)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml 2010-03-12 16:29:26
UTC (rev 102352)
@@ -31,6 +31,7 @@
<properties>
<version.jboss.classloading>2.2.0.Alpha1</version.jboss.classloading>
<version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers>
+ <version.jboss.kernel>2.2.0.Alpha1</version.jboss.kernel>
</properties>
<!-- Dependencies -->
Modified:
projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml 2010-03-12
16:26:37 UTC (rev 102351)
+++
projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml 2010-03-12
16:29:26 UTC (rev 102352)
@@ -18,6 +18,7 @@
<include>org.eclipse.equinox:org.eclipse.osgi.util:jar</include>
</includes>
<useStrictFiltering>false</useStrictFiltering>
+ <scope>provided</scope>
<unpack>false</unpack>
</dependencySet>
Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml 2010-03-12
16:26:37 UTC (rev 102351)
+++
projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml 2010-03-12
16:29:26 UTC (rev 102352)
@@ -18,6 +18,7 @@
<include>org.osgi:org.osgi.compendium:jar</include>
</includes>
<useStrictFiltering>false</useStrictFiltering>
+ <scope>provided</scope>
<unpack>false</unpack>
</dependencySet>