10:30 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-04-08 11:30:43 -0400 (Wed, 08 Apr 2009)
New Revision: 86967
Modified:
projects/jboss-osgi/trunk/runtime/equinox/.classpath
projects/jboss-osgi/trunk/runtime/felix/pom.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Optimize testsuite build
Modified: projects/jboss-osgi/trunk/runtime/equinox/.classpath
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/.classpath 2009-04-08 14:44:32 UTC (rev
86966)
+++ projects/jboss-osgi/trunk/runtime/equinox/.classpath 2009-04-08 15:30:43 UTC (rev
86967)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes"
path="src/main/java"/>
- <classpathentry kind="src" path="src/testsuite/java"/>
<classpathentry excluding="**" kind="src"
output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes"
path="src/test/java"/>
<classpathentry excluding="**" kind="src"
output="target/test-classes" path="src/test/resources"/>
Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-08 14:44:32 UTC (rev 86966)
+++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-08 15:30:43 UTC (rev 86967)
@@ -197,8 +197,6 @@
<exclude>org/jboss/test/osgi/**/*DeployerTestCase.java</exclude>
<exclude>org/jboss/test/osgi/service/http/junit/*TestCase.java</exclude>
<exclude>org/jboss/test/osgi/service/microcontainer/junit/*TestCase.java</exclude>
- <!-- [JBOSGI-36] Bundle classes leak into system classloader -->
-
<exclude>org/jboss/test/osgi/jbosgi36/*TestCase.java</exclude>
<!-- [JBOSGI-39] Bundle gets wired to an already uninstalled bundle
-->
<exclude>org/jboss/test/osgi/jbosgi39/*TestCase.java</exclude>
</excludes>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-08 14:44:32 UTC (rev 86966)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-08 15:30:43 UTC (rev 86967)
@@ -2,11 +2,6 @@
<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>
- <!--
-
*************************************************************************************** *
* * The Testsuite module provides the test artifacts that can be reused by
- the various * * supported OSGi Frameworks. The tests are not run as part of the
Testsuite module. * * *
-
***************************************************************************************
- -->
<name>JBossOSGi - Testsuite</name>
<description>JBossOSGi - Testsuite</description>
@@ -64,46 +59,6 @@
</testResources>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>testsuite</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>scripts/assembly-testsuite.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>target/${project.artifactId}-${project.version}.zip
- </file>
- <type>zip</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -122,17 +77,75 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
</plugins>
</build>
<profiles>
+
<!--
+ Name: framework-any
+ Descr: Create the testsuite.zip and skip tests if there is a framework specified
+ -->
+ <profile>
+ <id>framework-any</id>
+ <activation>
+ <property>
+ <name>framework</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>testsuite</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-testsuite.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/${project.artifactId}-${project.version}.zip
+ </file>
+ <type>zip</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
Name: framework-default
Descr: Setup for default framework integration testing
-->
@@ -156,16 +169,6 @@
<classifier>config</classifier>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>false</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
</profile>
<!--
@@ -189,8 +192,6 @@
<exclude>org/jboss/test/osgi/**/*DeployerTestCase.java</exclude>
<exclude>org/jboss/test/osgi/service/http/junit/*TestCase.java</exclude>
<exclude>org/jboss/test/osgi/service/microcontainer/junit/*TestCase.java</exclude>
- <!-- [JBOSGI-36] Bundle classes leak into system classloader -->
-
<exclude>org/jboss/test/osgi/jbosgi36/*TestCase.java</exclude>
<!-- [JBOSGI-39] Bundle gets wired to an already uninstalled bundle
-->
<exclude>org/jboss/test/osgi/jbosgi39/*TestCase.java</exclude>
</excludes>