Author: arne
Date: Sat Jun 15 10:33:51 2013
New Revision: 1493339
URL: http://svn.apache.org/r1493339
Log:
OWB-846: Configured execution of the CDI 1.1 tck
Modified:
openwebbeans/trunk/webbeans-cdi11/pom.xml
openwebbeans/trunk/webbeans-cdi11/standalone-suite.xml
Modified: openwebbeans/trunk/webbeans-cdi11/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-cdi11/pom.xml?rev=1493339&r1=1493338&r2=1493339&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-cdi11/pom.xml (original)
+++ openwebbeans/trunk/webbeans-cdi11/pom.xml Sat Jun 15 10:33:51 2013
@@ -160,6 +160,7 @@
</execution>
</executions>
<configuration>
+ <basedir>${basedir}</basedir>
<preserveDir>true</preserveDir>
<includes>
<include>target/generated-sources/**/*.java</include>
@@ -201,11 +202,23 @@
<sources>
<source>${project.build.directory}/generated-sources</source>
</sources>
+ <resources>
+ <resource>
+
<directory>${project.build.directory}/generated-sources</directory>
+
<targetPath>${project.build.outputDirectory}</targetPath>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
</configuration>
<executions>
<execution>
<id>add-sources</id>
- <goals><goal>add-source</goal></goals>
+ <goals>
+ <goal>add-source</goal>
+ <goal>add-resource</goal>
+ </goals>
<phase>process-sources</phase>
</execution>
</executions>
@@ -336,7 +349,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <excludedGroups>javaee-full</excludedGroups>
+
<excludedGroups>integration,javaee-full</excludedGroups>
<suiteXmlFiles>
<suiteXmlFile>standalone-suite.xml</suiteXmlFile>
</suiteXmlFiles>
Modified: openwebbeans/trunk/webbeans-cdi11/standalone-suite.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-cdi11/standalone-suite.xml?rev=1493339&r1=1493338&r2=1493339&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-cdi11/standalone-suite.xml (original)
+++ openwebbeans/trunk/webbeans-cdi11/standalone-suite.xml Sat Jun 15 10:33:51
2013
@@ -17,20 +17,6 @@
-->
<suite name="JSR-346-TCK" verbose="2">
<test name="JSR-346 TCK">
- <method-selectors>
-<!--
- <method-selector>
- <selector-class
-
name="org.jboss.testharness.impl.testng.DisableIntegrationTestsMethodSelector"
/>
- </method-selector>
-
- <method-selector>
- <selector-class
-
name="org.jboss.testharness.impl.testng.ExcludeIncontainerUnderInvestigationMethodSelector"
/>
- </method-selector>
--->
- </method-selectors>
-
<groups>
<run>
<exclude name="integration" />
@@ -38,10 +24,6 @@
</run>
</groups>
- <classes>
-
- </classes>
-
<packages>
<package name="org.jboss.cdi.tck.tests.*">
<exclude name="org.jboss.cdi.tck.tests.*.broken.*" />
