[jboss-cvs] JBossAS SVN: r93924 - in projects/webbeans-ri-int/trunk: webtier/src/main/java/org/jboss/webbeans/integration/webtier/jsf and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-09-22 09:28:48 -0400 (Tue, 22 Sep 2009)
New Revision: 93924

Modified:
   projects/webbeans-ri-int/trunk/pom.xml
   projects/webbeans-ri-int/trunk/webtier/src/main/java/org/jboss/webbeans/integration/webtier/jsf/ForwardingApplication.java
Log:
don't let maven auto-detect JVM

Modified: projects/webbeans-ri-int/trunk/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/pom.xml	2009-09-22 12:09:42 UTC (rev 93923)
+++ projects/webbeans-ri-int/trunk/pom.xml	2009-09-22 13:28:48 UTC (rev 93924)
@@ -47,7 +47,7 @@
     <version.junit>4.4</version.junit>
     <version.validation>1.0.CR3</version.validation>
     <version.jbossts>4.6.1.GA</version.jbossts>
-    <version.faces>1.2_12</version.faces>
+    <version.faces>2.0.0-RC</version.faces>
   </properties>
 
   <build>
@@ -99,6 +99,14 @@
           </configuration>
         </plugin>
         <plugin>
+          <artifactId>maven-eclipse-plugin</artifactId>
+          <configuration>
+            <classpathContainers>
+              <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            </classpathContainers>
+          </configuration>
+        </plugin>
+        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
           <version>2.2</version>

Modified: projects/webbeans-ri-int/trunk/webtier/src/main/java/org/jboss/webbeans/integration/webtier/jsf/ForwardingApplication.java
===================================================================
--- projects/webbeans-ri-int/trunk/webtier/src/main/java/org/jboss/webbeans/integration/webtier/jsf/ForwardingApplication.java	2009-09-22 12:09:42 UTC (rev 93923)
+++ projects/webbeans-ri-int/trunk/webtier/src/main/java/org/jboss/webbeans/integration/webtier/jsf/ForwardingApplication.java	2009-09-22 13:28:48 UTC (rev 93924)
@@ -137,7 +137,7 @@
 
    @SuppressWarnings("unchecked")
    @Override
-   public Iterator<Class> getConverterTypes()
+   public Iterator<Class<?>> getConverterTypes()
    {
       return delegate().getConverterTypes();
    }