[webbeans-commits] Webbeans SVN: r2059 - in ri/trunk: tests and 1 other directory.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Mon Mar 16 19:01:12 EDT 2009


Author: pete.muir at jboss.org
Date: 2009-03-16 19:01:12 -0400 (Mon, 16 Mar 2009)
New Revision: 2059

Modified:
   ri/trunk/impl/pom.xml
   ri/trunk/tests/pom.xml
Log:
minor

Modified: ri/trunk/impl/pom.xml
===================================================================
--- ri/trunk/impl/pom.xml	2009-03-16 22:53:19 UTC (rev 2058)
+++ ri/trunk/impl/pom.xml	2009-03-16 23:01:12 UTC (rev 2059)
@@ -30,19 +30,6 @@
          <groupId>org.jboss.webbeans</groupId>
          <artifactId>webbeans-logging</artifactId>
       </dependency>
-
-      <dependency>
-         <groupId>org.testng</groupId>
-         <artifactId>testng</artifactId>
-         <scope>test</scope>
-         <classifier>jdk15</classifier>
-         <exclusions>
-         	<exclusion>
-         		<artifactId>junit</artifactId>
-         		<groupId>junit</groupId>
-         	</exclusion>
-         </exclusions>
-      </dependency>
       
       <dependency>
          <groupId>org.jboss.ejb3</groupId>
@@ -121,174 +108,10 @@
          <optional>true</optional>
       </dependency>
       
-      <dependency>
-         <groupId>org.jboss.test-harness</groupId>
-         <artifactId>jboss-test-harness</artifactId>
-         <scope>test</scope>
-      </dependency>
-      
-      <dependency>
-         <groupId>org.jboss.test-harness</groupId>
-         <artifactId>jboss-test-harness-jboss-as-5</artifactId>
-         <scope>test</scope>
-      </dependency>
-      
    </dependencies>
 
    <build>
    	<defaultGoal>install</defaultGoal>
-   	<plugins>
-   	   <plugin>
-   	      <groupId>org.apache.maven.plugins</groupId>
-   	      <artifactId>maven-surefire-plugin</artifactId>
-   	      <configuration>
-   	         <suiteXmlFiles>
-                  <suiteXmlFile>unit-tests.xml</suiteXmlFile>
-   	         </suiteXmlFiles>
-   	      </configuration>
-   	   </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-report-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>generate-test-report</id>
-                  <phase>test</phase>
-                  <goals>
-                     <goal>report-only</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <configuration>
-               <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
-               <outputName>test-report</outputName>
-            </configuration>
-         </plugin>
-   	</plugins>
    </build>
    
-   <profiles>
-      <profile>
-         <id>incontainer</id>
-         <activation>
-            <property>
-               <name>incontainer</name>
-            </property>
-         </activation>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-dependency-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>copy</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                           <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                           <stripVersion>true</stripVersion>
-                           <artifactItems>
-                              <artifactItem>
-                                 <groupId>org.jboss.test-harness</groupId>
-                                 <artifactId>jboss-test-harness</artifactId>
-                                 <overWrite>true</overWrite>
-                                 <outputDirectory>${project.build.directory}/classes/lib</outputDirectory>
-                              </artifactItem>
-                              <artifactItem>
-                                 <groupId>javax.el</groupId>
-                                 <artifactId>el-ri</artifactId>
-                                 <overWrite>true</overWrite>
-                                 <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
-                              </artifactItem>
-                           </artifactItems>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-surefire-plugin</artifactId>
-                  <configuration>
-                     <suiteXmlFiles>
-                        <suiteXmlFile>unit-tests.xml</suiteXmlFile>
-                     </suiteXmlFiles>
-                     <systemProperties>
-                        <property>
-                           <name>org.jboss.testharness.standalone</name>
-                           <value>false</value>
-                        </property>
-                        <property>
-                           <name>jboss-as.dir</name>
-                           <value>../jboss-as</value>
-                        </property>
-                        <property>
-                           <name>jboss.force.restart</name>
-                           <value>true</value>
-                        </property>
-                        <property>
-                           <name>org.jboss.testharness.runIntegrationTests</name>
-                           <value>true</value>
-                        </property>
-                        <property>
-                           <name>org.jboss.testharness.libraryDirectory</name>
-                           <value>target/dependency/lib</value>
-                        </property>
-                        <property>
-                           <name>org.jboss.testharness.outputDirectory</name>
-                           <value>target</value>
-                        </property>
-                     </systemProperties>
-                  </configuration>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-      <profile>
-         <id>write-artifacts-to-disk</id>
-         <activation>
-            <property>
-               <name>dumpArtifacts</name>
-            </property>
-         </activation>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.codehaus.mojo</groupId>
-                  <artifactId>exec-maven-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>generate-test-artifacts</id>
-                        <phase>generate-test-sources</phase> 
-                        <goals>
-                        <goal>java</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-                  <configuration>
-                     <mainClass>org.jboss.testharness.api.TCK</mainClass>
-                     <classpathScope>test</classpathScope>
-                     <systemProperties>
-                        <systemProperty>
-                           <key>dumpArtifacts</key>
-                           <value>true</value>
-                        </systemProperty>
-                        <systemProperty>
-                           <key>org.jboss.testharness.outputDirectory</key>
-                           <value>target/test-artifacts</value>
-                        </systemProperty>
-                        <systemProperty>
-                           <key>org.jboss.testharness.libraryDirectory</key>
-                           <value>target/dependency/lib</value>
-                        </systemProperty>
-                     </systemProperties>
-                  </configuration>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-   </profiles>
-   
-   
 </project>

Modified: ri/trunk/tests/pom.xml
===================================================================
--- ri/trunk/tests/pom.xml	2009-03-16 22:53:19 UTC (rev 2058)
+++ ri/trunk/tests/pom.xml	2009-03-16 23:01:12 UTC (rev 2059)
@@ -41,6 +41,26 @@
          <scope>test</scope>
       </dependency>
       
+      <dependency>
+         <groupId>org.jboss.ejb3</groupId>
+         <artifactId>jboss-ejb3-api</artifactId>
+         <optional>true</optional>
+         <exclusions>
+            <exclusion>
+               <artifactId>jboss-jaxrpc</artifactId>
+               <groupId>jbossws</groupId>
+            </exclusion>
+            <exclusion>
+               <artifactId>jboss-transaction-api</artifactId>
+               <groupId>org.jboss.javaee</groupId>
+            </exclusion>
+            <exclusion>
+               <artifactId>jboss-jaxrpc</artifactId>
+               <groupId>jboss.jbossws</groupId>
+            </exclusion>
+         </exclusions>
+      </dependency>
+      
    </dependencies>
 
    <build>




More information about the weld-commits mailing list