[weld-commits] Weld SVN: r5172 - in archetypes/trunk/jsf: jee-minimal/src/main/resources/archetype-resources and 1 other directory.

[weld-commits at lists.jboss.org]

Author: sboscarine
Date: 2009-11-29 16:13:40 -0500 (Sun, 29 Nov 2009)
New Revision: 5172

Modified:
   archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml
   archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml
Log:
fixed bugs


Modified: archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml
===================================================================
--- archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml	2009-11-29 20:55:27 UTC (rev 5171)
+++ archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml	2009-11-29 21:13:40 UTC (rev 5172)
@@ -17,15 +17,16 @@
       <!-- To set the jboss.home environment variable the Maven way, set the jboss.home property in an active profile in the Maven 2 settings.xml file -->
       <jboss.home>${env.JBOSS_HOME}</jboss.home>
       <jboss.domain>default</jboss.domain>
-      <weld.api.version>1.0</weld.api.version>
+      <!-- The version of Weld extensions in use -->
+      <weld.extensions.version>1.0.0-CR2</weld.extensions.version>
    </properties>
    <dependencyManagement>
       <dependencies>
          <!-- Import scope will provide versions for dependencies below. -->
          <dependency>
             <groupId>org.jboss.weld</groupId>
-            <artifactId>weld-api-bom</artifactId>
-            <version>${weld.api.version}</version>
+            <artifactId>weld-extensions-bom</artifactId>
+            <version>${weld.extensions.version}</version>
             <type>pom</type>
             <scope>import</scope>
          </dependency>
@@ -83,6 +84,9 @@
       <dependency>
          <groupId>org.glassfish.web</groupId>
          <artifactId>el-impl</artifactId>
+         <scope>runtime</scope>
+         <!-- FIXME this version should be in the Weld API BOM -->
+         <version>2.1.2-b04</version>
          <exclusions>
             <exclusion>
                <groupId>javax.el</groupId>
@@ -93,6 +97,9 @@
 
 
 
+      <!-- Experimental Dependencies.   -->
+
+
 	  <!-- JPA Dependencies. -->
 	  <!-- Dan, should this be provided? -->
 		<dependency>
@@ -139,18 +146,30 @@
 
 
 
+      <!-- Bean Validation API (JSR 303) -->
+      <dependency>
+         <groupId>javax.validation</groupId>
+         <artifactId>validation-api</artifactId>
+      </dependency>
 
+      <!-- Bean Validation Implementation -->
+      <dependency>
+         <groupId>org.hibernate</groupId>
+         <artifactId>hibernate-validator</artifactId>
+         <version>4.0.0.GA</version>
+      </dependency>
+
    </dependencies>
    <build>
       <finalName>${artifactId}</finalName>
       <plugins>
-         <!-- Compiler plugin enforces Java 1.5 compatiblity -->
+         <!-- Compiler plugin enforces Java 1.6 compatiblity -->
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
             <configuration>
-               <source>1.5</source>
-               <target>1.5</target>
+               <source>1.6</source>
+               <target>1.6</target>
             </configuration>
          </plugin>
 

Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml
===================================================================
--- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml	2009-11-29 20:55:27 UTC (rev 5171)
+++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml	2009-11-29 21:13:40 UTC (rev 5172)
@@ -17,15 +17,17 @@
       <!-- To set the jboss.home environment variable the Maven way, set the jboss.home property in an active profile in the Maven 2 settings.xml file -->
       <jboss.home>${env.JBOSS_HOME}</jboss.home>
       <jboss.domain>default</jboss.domain>
-      <weld.api.version>1.0</weld.api.version>
+      <!-- The version of Weld extensions in use -->
+      <weld.extensions.version>1.0.0-CR2</weld.extensions.version>
+
    </properties>
    <dependencyManagement>
       <dependencies>
          <!-- Import scope will provide versions for dependencies below. -->
          <dependency>
             <groupId>org.jboss.weld</groupId>
-            <artifactId>weld-api-bom</artifactId>
-            <version>${weld.api.version}</version>
+            <artifactId>weld-extensions-bom</artifactId>
+            <version>${weld.extensions.version}</version>
             <type>pom</type>
             <scope>import</scope>
          </dependency>
@@ -94,17 +96,31 @@
          </exclusions>
       </dependency>
 
+
+
+      <!-- Bean Validation API (JSR 303) -->
+      <dependency>
+         <groupId>javax.validation</groupId>
+         <artifactId>validation-api</artifactId>
+      </dependency>
+
+      <!-- Bean Validation Implementation -->
+      <dependency>
+         <groupId>org.hibernate</groupId>
+         <artifactId>hibernate-validator</artifactId>
+         <version>4.0.0.GA</version>
+      </dependency>
    </dependencies>
    <build>
       <finalName>${artifactId}</finalName>
       <plugins>
-         <!-- Compiler plugin enforces Java 1.5 compatiblity -->
+         <!-- Compiler plugin enforces Java 1.6 compatibility -->
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
             <configuration>
-               <source>1.5</source>
-               <target>1.5</target>
+               <source>1.6</source>
+               <target>1.6</target>
             </configuration>
          </plugin>
 
@@ -130,4 +146,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file