Skip to content
Browse files

Fix #16 : align annotation processors on all archetypes

Signed-off-by: Fred Bricon <fbricon@gmail.com>
  • Loading branch information...
1 parent ee90b63 commit ca4d002a02a8faae0a0c1e67d03b519058b3d4dd @fbricon fbricon committed Jun 19, 2012
View
4 jboss-javaee6-webapp-archetype/src/main/resources/archetype-resources/.factorypath
@@ -1,5 +1,5 @@
<factorypath>
<factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/hibernate-jpamodelgen/1.1.1.Final/hibernate-jpamodelgen-1.1.1.Final.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.0.Final/hibernate-jpa-2.0-api-1.0.0.Final.jar" enabled="true" runInBatchMode="false"/>
+ <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/hibernate-jpamodelgen/1.2.0.Final/hibernate-jpamodelgen-1.2.0.Final.jar" enabled="true" runInBatchMode="false"/>
+ <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.1.Final/hibernate-jpa-2.0-api-1.0.1.Final.jar" enabled="true" runInBatchMode="false"/>
</factorypath>
View
4 jboss-javaee6-webapp-blank-archetype/src/main/resources/archetype-resources/.factorypath
@@ -1,5 +1,5 @@
<factorypath>
<factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/hibernate-jpamodelgen/1.1.1.Final/hibernate-jpamodelgen-1.1.1.Final.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.0.Final/hibernate-jpa-2.0-api-1.0.0.Final.jar" enabled="true" runInBatchMode="false"/>
+ <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/hibernate-jpamodelgen/1.2.0.Final/hibernate-jpamodelgen-1.2.0.Final.jar" enabled="true" runInBatchMode="false"/>
+ <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.1.Final/hibernate-jpa-2.0-api-1.0.1.Final.jar" enabled="true" runInBatchMode="false"/>
</factorypath>
View
6 jboss-javaee6-webapp-ear-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -72,6 +72,12 @@
<include>**/*.xml</include>
</includes>
</fileSet>
+ <fileSet encoding="UTF-8">
+ <directory></directory>
+ <includes>
+ <include>**/*.factorypath</include>
+ </includes>
+ </fileSet>
</fileSets>
</module>
<module id="${rootArtifactId}-web" dir="__rootArtifactId__-web"
View
5 ...-ear-archetype/src/main/resources/archetype-resources/__rootArtifactId__-ejb/.factorypath
@@ -0,0 +1,5 @@
+<factorypath>
+ <factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="true" runInBatchMode="false"/>
+ <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/hibernate-jpamodelgen/1.2.0.Final/hibernate-jpamodelgen-1.2.0.Final.jar" enabled="true" runInBatchMode="false"/>
+ <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.1.Final/hibernate-jpa-2.0-api-1.0.1.Final.jar" enabled="true" runInBatchMode="false"/>
+</factorypath>
View
17 ...ebapp-ear-archetype/src/main/resources/archetype-resources/__rootArtifactId__-ejb/pom.xml
@@ -52,6 +52,23 @@
<scope>provided</scope>
</dependency>
+ <!-- Now we declare any tools needed -->
+
+ <!-- Annotation processor to generate the JPA 2.0 metamodel classes
+ for typesafe criteria queries -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jpamodelgen</artifactId>
+ <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>
<!-- Test scope dependencies -->
<dependency>
View
2 jboss-javaee6-webapp-ear-archetype/src/main/resources/archetype-resources/pom.xml
@@ -93,7 +93,7 @@ $symbol_escape = '\' )
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>4.1.0.Final</version>
+ <version>4.2.0.Final</version>
<scope>provided</scope>
<exclusions>
<exclusion>
View
6 ...vaee6-webapp-ear-blank-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -49,6 +49,12 @@
<include>**/*.xml</include>
</includes>
</fileSet>
+ <fileSet encoding="UTF-8">
+ <directory></directory>
+ <includes>
+ <include>**/*.factorypath</include>
+ </includes>
+ </fileSet>
</fileSets>
</module>
<module id="${rootArtifactId}-web" dir="__rootArtifactId__-web"
View
5 ...lank-archetype/src/main/resources/archetype-resources/__rootArtifactId__-ejb/.factorypath
@@ -0,0 +1,5 @@
+<factorypath>
+ <factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="true" runInBatchMode="false"/>
+ <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/hibernate-jpamodelgen/1.2.0.Final/hibernate-jpamodelgen-1.2.0.Final.jar" enabled="true" runInBatchMode="false"/>
+ <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.1.Final/hibernate-jpa-2.0-api-1.0.1.Final.jar" enabled="true" runInBatchMode="false"/>
+</factorypath>
View
17 ...ear-blank-archetype/src/main/resources/archetype-resources/__rootArtifactId__-ejb/pom.xml
@@ -52,6 +52,23 @@
<scope>provided</scope>
</dependency>
+ <!-- Now we declare any tools needed -->
+
+ <!-- Annotation processor to generate the JPA 2.0 metamodel classes
+ for typesafe criteria queries -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jpamodelgen</artifactId>
+ <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>
<!-- Test scope dependencies -->
<dependency>
View
2 jboss-javaee6-webapp-ear-blank-archetype/src/main/resources/archetype-resources/pom.xml
@@ -93,7 +93,7 @@ $symbol_escape = '\' )
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>4.1.0.Final</version>
+ <version>4.2.0.Final</version>
<scope>provided</scope>
<exclusions>
<exclusion>

0 comments on commit ca4d002

Please sign in to comment.
Something went wrong with that request. Please try again.