[jboss-osgi-commits] JBoss-OSGI SVN: r102350 - in projects/jboss-osgi: projects/runtime/framework/trunk/bundle and 3 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Fri Mar 12 11:08:33 EST 2010
Author: thomas.diesler at jboss.com
Date: 2010-03-12 11:08:31 -0500 (Fri, 12 Mar 2010)
New Revision: 102350
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml
projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Cleanup framework dependencies
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-12 15:00:28 UTC (rev 102349)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-12 16:08:31 UTC (rev 102350)
@@ -34,19 +34,14 @@
<dependencies>
<dependency>
- <groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-core</artifactId>
- <version>${version}</version>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bnd</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-metadata</artifactId>
+ <artifactId>jboss-osgi-framework-core</artifactId>
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bnd</artifactId>
- </dependency>
<!-- Test bundles dependencies -->
<dependency>
@@ -162,6 +157,21 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-jmx-aop-mc-int</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-jmx-mc-int</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-testing</artifactId>
<scope>test</scope>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-12 15:00:28 UTC (rev 102349)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-12 16:08:31 UTC (rev 102350)
@@ -1,12 +1,12 @@
<?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$ -->
@@ -29,76 +29,14 @@
<dependencies>
<dependency>
- <groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-metadata</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
<groupId>biz.aQute</groupId>
<artifactId>bnd</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloader</artifactId>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-metadata</artifactId>
+ <version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-jmx-aop-mc-int</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-jmx-mc-int</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-dependency</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- </dependency>
<!-- JBoss OSGi Dependencies -->
<dependency>
@@ -119,11 +57,6 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
-
</dependencies>
- <build>
- <plugins>
- </plugins>
- </build>
</project>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-12 15:00:28 UTC (rev 102349)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-12 16:08:31 UTC (rev 102350)
@@ -300,7 +300,10 @@
<profiles>
- <!-- Name: distro Desc: Build the distribution -->
+ <!--
+ Name: distro
+ Desc: Build the distribution
+ -->
<profile>
<id>distro</id>
<build>
@@ -315,6 +318,29 @@
</build>
</profile>
+ <!--
+ Name: remote-testing
+ Descr: Setup for remote integration testing
+ -->
+ <profile>
+ <id>remote-testing</id>
+ <activation>
+ <property>
+ <name>target.container</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
</project>
Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml 2010-03-12 15:00:28 UTC (rev 102349)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml 2010-03-12 16:08:31 UTC (rev 102350)
@@ -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/example/scripts/assembly-compendium.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml 2010-03-12 15:00:28 UTC (rev 102349)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml 2010-03-12 16:08:31 UTC (rev 102350)
@@ -18,6 +18,7 @@
<include>org.osgi:org.osgi.compendium:jar</include>
</includes>
<useStrictFiltering>false</useStrictFiltering>
+ <scope>provided</scope>
<unpack>false</unpack>
</dependencySet>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-12 15:00:28 UTC (rev 102349)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-12 16:08:31 UTC (rev 102350)
@@ -1,18 +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. -->
<!-- -->
- <!-- ======================================================================
--->
+ <!-- ====================================================================== -->
- <!-- $Id$
--->
+ <!-- $Id$ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -282,7 +279,13 @@
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-equinox</artifactId>
+ <scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs30</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</profile>
@@ -305,7 +308,13 @@
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-felix</artifactId>
+ <scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs30</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</profile>
@@ -322,15 +331,16 @@
</property>
</activation>
<dependencies>
- <!-- Promote the framework core dependencies -->
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-core</artifactId>
+ <artifactId>jboss-osgi-framework-vfs30</artifactId>
<version>${version.jboss.osgi.framework}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
</profile>
@@ -342,15 +352,16 @@
</property>
</activation>
<dependencies>
- <!-- Promote the framework core dependencies -->
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-core</artifactId>
+ <artifactId>jboss-osgi-framework-vfs30</artifactId>
<version>${version.jboss.osgi.framework}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
</profile>
@@ -400,12 +411,6 @@
<properties>
<target.container.excludes>org/jboss/test/osgi/jbossas/**</target.container.excludes>
</properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs30</artifactId>
- </dependency>
- </dependencies>
</profile>
<!--
@@ -430,10 +435,6 @@
<version>${version.jmx.invoker.adaptor.client}</version>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs30</artifactId>
- </dependency>
</dependencies>
</profile>
@@ -460,10 +461,6 @@
<scope>test</scope>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs21</artifactId>
- </dependency>
</dependencies>
</profile>
@@ -490,10 +487,6 @@
<scope>test</scope>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs21</artifactId>
- </dependency>
</dependencies>
</profile>
@@ -526,10 +519,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs21</artifactId>
- </dependency>
</dependencies>
</profile>
@@ -562,10 +551,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs30</artifactId>
- </dependency>
</dependencies>
</profile>
More information about the jboss-osgi-commits
mailing list