[jboss-cvs] JBossAS SVN: r107760 - in projects/jboss-jca/trunk: validator and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Aug 24 05:44:58 EDT 2010


Author: jeff.zhang
Date: 2010-08-24 05:44:58 -0400 (Tue, 24 Aug 2010)
New Revision: 107760

Modified:
   projects/jboss-jca/trunk/sjc/build.xml
   projects/jboss-jca/trunk/validator/build.xml
   projects/jboss-jca/trunk/validator/src/main/resources/plugin.xml
   projects/jboss-jca/trunk/validator/src/main/resources/pom.xml
Log:
[JBJCA-298] replace version information for validator maven plugin

Modified: projects/jboss-jca/trunk/sjc/build.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/build.xml	2010-08-24 09:28:48 UTC (rev 107759)
+++ projects/jboss-jca/trunk/sjc/build.xml	2010-08-24 09:44:58 UTC (rev 107760)
@@ -274,7 +274,11 @@
       <fileset dir="../validator/src/main/resources/">
         <include name="**/*.sh"/>
         <include name="**/*.bat"/>
+        <include name="**/pom.xml"/>
       </fileset>
+      <filterset>
+        <filter token="VERSION.IRONJACAMAR" value="${version}"/>
+      </filterset>
     </copy>
 
     <copy todir="${target.dir}/sjc/doc/codegenerator">

Modified: projects/jboss-jca/trunk/validator/build.xml
===================================================================
--- projects/jboss-jca/trunk/validator/build.xml	2010-08-24 09:28:48 UTC (rev 107759)
+++ projects/jboss-jca/trunk/validator/build.xml	2010-08-24 09:44:58 UTC (rev 107760)
@@ -68,6 +68,9 @@
     <copy todir="${build.validator.dir}/jars/validator/META-INF/maven">
       <fileset dir="src/main/resources/"
                includes="plugin.xml"/>
+      <filterset>
+        <filter token="VERSION.IRONJACAMAR" value="${version}"/>
+      </filterset>
     </copy>
 
     <jar destfile="${target.dir}/${name}-validator.jar"

Modified: projects/jboss-jca/trunk/validator/src/main/resources/plugin.xml
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/resources/plugin.xml	2010-08-24 09:28:48 UTC (rev 107759)
+++ projects/jboss-jca/trunk/validator/src/main/resources/plugin.xml	2010-08-24 09:44:58 UTC (rev 107760)
@@ -2,7 +2,7 @@
   <description></description>
   <groupId>org.jboss.ironjacamar</groupId>
   <artifactId>ironjacamar-validator-maven</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>@VERSION.IRONJACAMAR@</version>
   <goalPrefix>ironjacamar</goalPrefix>
   <isolatedRealm>false</isolatedRealm>
   <inheritedByDefault>true</inheritedByDefault>
@@ -49,6 +49,6 @@
   <dependencies>
     <groupId>org.jboss.ironjacamar</groupId>
     <artifactId>ironjacamar-validator</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>@VERSION.IRONJACAMAR@</version>
   </dependencies>
 </plugin>

Modified: projects/jboss-jca/trunk/validator/src/main/resources/pom.xml
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/resources/pom.xml	2010-08-24 09:28:48 UTC (rev 107759)
+++ projects/jboss-jca/trunk/validator/src/main/resources/pom.xml	2010-08-24 09:44:58 UTC (rev 107760)
@@ -27,34 +27,22 @@
   <groupId>org.jboss.ironjacamar</groupId>
   <artifactId>ironjacamar-validator-maven-test</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>@VERSION.IRONJACAMAR@</version>
   <url>http://repository.jboss.org</url>
   <dependencies>
     <dependency>
       <groupId>org.jboss.ironjacamar</groupId>
       <artifactId>ironjacamar-validator-maven</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <version>@VERSION.IRONJACAMAR@</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.ironjacamar</groupId>
       <artifactId>ironjacamar-validator</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <version>@VERSION.IRONJACAMAR@</version>
       <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss</groupId>
-          <artifactId>jbossxb</artifactId>
-        </exclusion>
-      </exclusions>  
     </dependency>
     <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jbossxb</artifactId>
-      <version>2.0.2-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
       <version>2.2.1</version>
@@ -68,7 +56,7 @@
         <groupId>org.jboss.ironjacamar</groupId>
         <artifactId>ironjacamar-validator-maven</artifactId>
         <!-- The version of the plugin you want to use -->
-        <version>1.0.0-SNAPSHOT</version>
+        <version>@VERSION.IRONJACAMAR@</version>
         <executions>
           <execution>
             <goals>



More information about the jboss-cvs-commits mailing list