change to use jboss-javaee-6.0-with-tools bom

claudiosterrantino · Mar 21, 2012 · ed4a898 · ed4a898
1 parent 83129c5
commit ed4a898
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,9 @@
 *~
-.classpath
-.project
 target
-.settings
 .DS_Store
 .faces-config.xml.faceside
 .faces-config.xml.jsfdia
 MANIFEST.MF
-.idea
-*.iml
 bin
 .openshift
 */.gitignore
@@ -17,3 +12,20 @@ bin
 README.html
 CONTRIBUTING.html
 .errai
+helloworld-gwt/src/main/gwt-unitCache
+helloworld-gwt/src/main/webapp/HelloWorldApp
+helloworld-gwt/src/main/webapp/WEB-INF/deploy
+out
+.idea
+*.ipr
+*.iws
+*.iml
+atlassian-ide-plugin.xml
+.classpath
+.project
+.settings
+.metadata
+bin
+.nbattrs
+*.log
+.clover
diff --git a/hibernate4/pom.xml b/hibernate4/pom.xml
@@ -15,16 +15,13 @@
       <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered 
          resources, i.e. build is platform dependent! -->
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <!-- Define the version of JBoss' Java EE 6 APIs we want to import. 
-        Any dependencies from org.jboss.spec will have their version defined by this 
-        BOM -->
-      <javaee6.spec.version>3.0.0.Beta1</javaee6.spec.version>	
-      <!--javaee6.web.spec.version>2.0.0.Final</javaee6.web.spec.version-->
-      <!-- Alternatively, comment out the above line, and un-comment the line below to 
-        use version 3.0.0.Beta1-redhat-1 which is a release certified 
-      to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 maven repository. -->
-      <!-- 
-      <javaee6.web.spec.version>3.0.0.Beta1-redhat-1</javaee6.web.spec.version> 
+      <!-- Define the version of JBoss' Java EE 6 APIs and Tools we want to import.  -->
+      <jboss.bom.version>1.0.0.M5</jboss.bom.version>
+      <!-- Alternatively, comment out the above line, and un-comment the line below to
+         use version 3.0.0.Beta1-redhat-1 which is a release certified
+         to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 maven repository. -->
+      <!--
+      <jboss.bom.version>1.0.0.M5-redhat-1</jboss.bom.version>
       -->
    </properties>
 
@@ -33,12 +30,13 @@
          <!-- JBoss distributes a complete set of Java EE 6 APIs including 
             a Bill of Materials (BOM). A BOM specifies the versions of a "stack" (or 
             a collection) of artifacts. We use this here so that we always get the correct 
-            versions of artifacts. Here we use the jboss-javaee-web-6.0 stack (you can 
-            read this as the JBoss stack of the Java EE Web Profile 6 APIs) -->
+            versions of artifacts. Here we use the jboss-javaee-6.0-with-hibernate stack 
+            (you can read this as the JBoss stack of the Java EE Web Profile 6 APIs with 
+            extras from the Hibernate family of projects) -->
         <dependency>
-            <groupId>org.jboss.spec</groupId>
-            <artifactId>jboss-javaee-web-6.0</artifactId>
-            <version>${javaee6.spec.version}</version>
+            <groupId>org.jboss.bom</groupId>
+            <artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
+            <version>${jboss.bom.version}</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
@@ -103,7 +101,6 @@
       <dependency>
          <groupId>org.hibernate</groupId>
          <artifactId>hibernate-validator</artifactId>
-         <version>4.2.0.Final</version>
          <scope>provided</scope>
          <exclusions>
             <exclusion>
@@ -112,26 +109,16 @@
             </exclusion>
          </exclusions>
       </dependency>
-
-      <!-- Now we declare any tools needed -->
-      <!--Commenting the following dependency as we are using the Hibernate4 Core Native API Criterion queries in this example-->
-      <!-- Annotation processor to generate the JPA 2.0 metamodel classes 
-         for typesafe criteria queries -->
-      <!--dependency>
-         <groupId>org.hibernate</groupId>
-         <artifactId>hibernate-jpamodelgen</artifactId>
-         <version>1.1.1.Final</version>
-         <scope>provided</scope>
-      </dependency-->
 
       <!--Import dependencies to hibernate packages(eg. hibernate-core) depending on features you want to use like Hibernate Session used in the 	quickstart-->
       <!--please note that scope is provided as these jars are shipped with as7-->
       <dependency>
          <groupId>org.hibernate</groupId>
          <artifactId>hibernate-core</artifactId>
-         <version>4.0.1.Final</version>
          <scope>provided</scope>
       </dependency>
+
+      <!-- Now we declare any tools needed -->
 
       <!-- Needed for running tests (you may also use TestNG) -->
       <dependency>

diff --git a/kitchensink/pom.xml b/kitchensink/pom.xml
@@ -16,12 +16,12 @@
          resources, i.e. build is platform dependent! -->
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <!-- Define the version of JBoss' Java EE 6 APIs and Tools we want to import.  -->
-      <javaee6.with.tools.version>1.0.0.M1</javaee6.with.tools.version>
+      <jboss.bom.version>1.0.0.M5</jboss.bom.version>
       <!-- Alternatively, comment out the above line, and un-comment the line below to 
         use version 3.0.0.Beta1-redhat-1 which is a release certified 
       to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 maven repository. -->
       <!-- 
-      <javaee6.spec.version>3.0.0.Beta1-redhat-1</javaee6.spec.version> 
+      <jboss.bom.version>1.0.0.M5-redhat-1</jboss.bom.version>> 
       -->
    </properties>
 
@@ -30,16 +30,24 @@
         <!-- JBoss distributes a complete set of Java EE 6 APIs including a Bill 
           of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection) 
           of artifacts. We use this here so that we always get the correct versions 
-          of artifacts. Here we use the jboss-javaee-6.0-with tools stack (you can read this as 
+          of artifacts. Here we use the jboss-javaee-6.0-with-tools stack (you can read this as 
           the JBoss stack of the Java EE 6 APIs, with some extras tools for your project, such
-          as Arquillian for testing) -->
+          as Arquillian for testing) and the jboss-javaee-6.0-with-hibernate stack you can read this as 
+          the JBoss stack of the Java EE 6 APIs, with extras from the Hibernate family of projects) -->
          <dependency>
             <groupId>org.jboss.bom</groupId>
             <artifactId>jboss-javaee-6.0-with-tools</artifactId>
-            <version>${javaee6.with.tools.version}</version>
+            <version>${jboss.bom.version}</version>
             <type>pom</type>
             <scope>import</scope>
          </dependency>
+          <dependency>
+              <groupId>org.jboss.bom</groupId>
+              <artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
+              <version>${jboss.bom.version}</version>
+              <type>pom</type>
+              <scope>import</scope>
+          </dependency>
       </dependencies>
    </dependencyManagement>
 
@@ -94,7 +102,6 @@
       <dependency>
          <groupId>org.hibernate</groupId>
          <artifactId>hibernate-validator</artifactId>
-         <version>4.2.0.Final</version>
          <scope>provided</scope>
          <exclusions>
             <exclusion>
@@ -119,7 +126,13 @@
       <dependency>
          <groupId>org.hibernate</groupId>
          <artifactId>hibernate-jpamodelgen</artifactId>
-         <version>1.1.1.Final</version>
+         <scope>provided</scope>
+      </dependency>
+
+      <!-- Annotation processor that raising compilation errors whenever constraint annotations are incorrectly used. -->
+      <dependency>
+         <groupId>org.hibernate</groupId>
+         <artifactId>hibernate-validator-annotation-processor</artifactId>
          <scope>provided</scope>
       </dependency>