[webbeans-commits] Webbeans SVN: r2497 - in tck/trunk: impl/src/main/java/org/jboss/jsr299/tck and 1 other directories.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-04-17 13:22:01 -0400 (Fri, 17 Apr 2009)
New Revision: 2497

Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java
   tck/trunk/pom.xml
   tck/trunk/src/main/assembly/assembly.xml
Log:
fixes

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java	2009-04-17 16:39:12 UTC (rev 2496)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java	2009-04-17 17:22:01 UTC (rev 2497)
@@ -50,7 +50,7 @@
    }
 
    @Override
-   public Set<Type> getTypes()
+   public Set<? extends Type> getTypes()
    {
       return delegate().getTypes();
    }

Modified: tck/trunk/pom.xml
===================================================================
--- tck/trunk/pom.xml	2009-04-17 16:39:12 UTC (rev 2496)
+++ tck/trunk/pom.xml	2009-04-17 17:22:01 UTC (rev 2497)
@@ -62,6 +62,11 @@
       <module>api</module>
       <module>impl</module>
    </modules>
+   
+   <properties>
+      <jboss.test.audit.version>0.9.1</jboss.test.audit.version>
+      <jboss.test.harness.version>1.0.0.BETA2</jboss.test.harness.version>
+   </properties>
 
    <dependencyManagement>
       <dependencies>
@@ -106,7 +111,7 @@
          <dependency>
             <groupId>org.jboss.webbeans</groupId>
             <artifactId>jsr299-api</artifactId>
-            <version>1.0.0.BETA1</version>
+            <version>1.0.0.PREVIEW1</version>
          </dependency>
          <dependency>
             <groupId>org.jboss.jsr299.tck</groupId>
@@ -116,12 +121,12 @@
          <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>tck-utils-api</artifactId>
-            <version>0.9.1-SNAPSHOT</version>
+            <version>${jboss.test.audit.version}</version>
          </dependency>
          <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>tck-utils-impl</artifactId>
-            <version>0.9.1-SNAPSHOT</version>
+            <version>${jboss.test.audit.version}</version>
          </dependency>
          <dependency>
          	<groupId>org.jboss.ejb3</groupId>
@@ -150,12 +155,12 @@
          <dependency>
             <groupId>org.jboss.test-harness</groupId>
             <artifactId>jboss-test-harness-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>${jboss.test.harness.version}</version>
          </dependency>
          <dependency>
             <groupId>org.jboss.test-harness</groupId>
             <artifactId>jboss-test-harness</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>${jboss.test.harness.version}</version>
          </dependency>
       </dependencies>
    </dependencyManagement>

Modified: tck/trunk/src/main/assembly/assembly.xml
===================================================================
--- tck/trunk/src/main/assembly/assembly.xml	2009-04-17 16:39:12 UTC (rev 2496)
+++ tck/trunk/src/main/assembly/assembly.xml	2009-04-17 17:22:01 UTC (rev 2497)
@@ -19,6 +19,8 @@
          </includes>
          <excludes>
             <exclude>**/src/main/assembly/**</exclude>
+            <exclude>interceptor/**</exclude>
+            <exclude>xml</exclude>
             <exclude>**/bin/**</exclude>
          </excludes>
          <useDefaultExcludes />