HV-680 Improved handling iof bv api version to allow for resolved SNP…

…ASHOT dependecies
hibernate · Jan 29, 2013 · 9056aac · 9056aac
1 parent e5c008c
commit 9056aac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/integration/pom.xml b/integration/pom.xml
@@ -157,9 +157,9 @@
                                     <version>${jbossas.version}</version>
                                     <type>zip</type>
                                     <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
                         </configuration>
                     </execution>
                     <execution>
@@ -175,9 +175,10 @@
                                     <artifactId>validation-api</artifactId>
                                     <version>${bv.api.version}</version>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/dependencies</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
+                            <stripVersion>true</stripVersion>
+                            <outputDirectory>${project.build.directory}/dependencies</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
@@ -212,13 +213,13 @@
                                 ant.copy(todir: toDir, filtering: true) {
                                     fileset(dir: fromDir)
                                     filterset() {
-                                        filter(token:'BV-API-VERSION', value:project.properties['bv.api.version'])
+                                       filter(token:'BV-API-VERSION', value:project.properties['bv.api.version'])
                                     }
                                 }
 
                                 def apiDependencyDir = new File(project.basedir, 'target/dependencies')
                                 def apiTargetDir = new File(project.properties['jbossTargetDir'], 'modules/javax/validation/api/main')
-                                log.info('Copying Bean Validation 1.1 jar from ' + apiDependencyDir + ' to ' + toDir)
+                                log.info('Copying Bean Validation ' + project.properties['bv.api.version'] + ' jar from ' + apiDependencyDir + ' to ' + toDir)
                                 ant.copy( todir: apiTargetDir) {
                                     fileset(dir: apiDependencyDir)
                                 }

diff --git a/integration/src/as7config/modules/javax/validation/api/main/module.xml b/integration/src/as7config/modules/javax/validation/api/main/module.xml
@@ -17,8 +17,8 @@
   -->
 <module xmlns="urn:jboss:module:1.1" name="javax.validation.api">
     <resources>
-        <resource-root path="validation-api-@BV-API-VERSION@.jar"/>
-        <!-- Insert resources here -->
+        <!-- Used BV API version @BV-API-VERSION@ -->
+        <resource-root path="validation-api.jar"/>
     </resources>
 
   <dependencies>