[jboss-cvs] JBossAS SVN: r112670 - projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Feb 21 08:09:07 EST 2012


Author: jesper.pedersen
Date: 2012-02-21 08:09:06 -0500 (Tue, 21 Feb 2012)
New Revision: 112670

Modified:
   projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/build.ivy.xml.template
   projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/ivy.xml.template
   projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/pom.xml.template
Log:
Backport code generator enhancements

Modified: projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/build.ivy.xml.template
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/build.ivy.xml.template	2012-02-21 11:24:13 UTC (rev 112669)
+++ projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/build.ivy.xml.template	2012-02-21 13:09:06 UTC (rev 112670)
@@ -42,7 +42,7 @@
   <!-- ================================= 
        Ivy              
        ================================= -->
-  <property name="ivy.version" value="2.2.0-rc1"/>
+  <property name="ivy.version" value="2.2.0"/>
   <property name="ivy.dir" value="${user.home}/.ivy2/cache/org.apache.ivy/jars"/>
   <property name="ivy.jar.name" value="ivy-${ivy.version}.jar"/>
   

Modified: projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/ivy.xml.template
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/ivy.xml.template	2012-02-21 11:24:13 UTC (rev 112669)
+++ projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/ivy.xml.template	2012-02-21 13:09:06 UTC (rev 112670)
@@ -23,6 +23,7 @@
     <dependency org="org.jboss.ironjacamar" name="ironjacamar-core-api" rev="${version.ironjacamar}" conf="test"/>
     <dependency org="org.jboss.ironjacamar" name="ironjacamar-core-impl" rev="${version.ironjacamar}" conf="test"/>
     <dependency org="org.jboss.ironjacamar" name="ironjacamar-depchain" rev="${version.ironjacamar}" conf="test"/>
+    <dependency org="org.jboss.ironjacamar" name="ironjacamar-deployers-common" rev="${version.ironjacamar}" conf="test"/>
     <dependency org="org.jboss.ironjacamar" name="ironjacamar-deployers-fungal" rev="${version.ironjacamar}" conf="test"/>
     <dependency org="org.jboss.ironjacamar" name="ironjacamar-embedded-arquillian" rev="${version.ironjacamar}" conf="test"/>
     <dependency org="org.jboss.ironjacamar" name="ironjacamar-embedded" rev="${version.ironjacamar}" conf="test"/>

Modified: projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/pom.xml.template
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/pom.xml.template	2012-02-21 11:24:13 UTC (rev 112669)
+++ projects/jboss-jca/branches/Branch_1_0/codegenerator/src/main/resources/pom.xml.template	2012-02-21 13:09:06 UTC (rev 112670)
@@ -8,83 +8,87 @@
   <packaging>jar</packaging>
   <version>0.1</version>
   <url>http://repository.jboss.org</url>
+  <properties>
+    <version.org.jboss.ironjacamar>@VERSION.IRONJACAMAR@</version.org.jboss.ironjacamar>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.jboss.ironjacamar</groupId>
       <artifactId>ironjacamar-spec-api</artifactId>
-      <version>@VERSION.IRONJACAMAR@</version>
+      <version>${version.org.jboss.ironjacamar}</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.ironjacamar</groupId>
       <artifactId>ironjacamar-common-api</artifactId>
-      <version>@VERSION.IRONJACAMAR@</version>
+      <version>${version.org.jboss.ironjacamar}</version>
       <scope>test</scope>
     </dependency>    
     <dependency>
       <groupId>org.jboss.ironjacamar</groupId>
       <artifactId>ironjacamar-common-spi</artifactId>
-      <version>@VERSION.IRONJACAMAR@</version>
+      <version>${version.org.jboss.ironjacamar}</version>
       <scope>test</scope>
     </dependency>   
     <dependency>
       <groupId>org.jboss.ironjacamar</groupId>
       <artifactId>ironjacamar-common-impl</artifactId>
-      <version>@VERSION.IRONJACAMAR@</version>
+      <version>${version.org.jboss.ironjacamar}</version>
       <scope>test</scope>
     </dependency>    
     <dependency>
       <groupId>org.jboss.ironjacamar</groupId>
       <artifactId>ironjacamar-common-impl-papaki</artifactId>
-      <version>@VERSION.IRONJACAMAR@</version>
+      <version>${version.org.jboss.ironjacamar}</version>
       <scope>test</scope>
     </dependency>    
     <dependency>
       <groupId>org.jboss.ironjacamar</groupId>
       <artifactId>ironjacamar-core-api</artifactId>
-      <version>@VERSION.IRONJACAMAR@</version>
+      <version>${version.org.jboss.ironjacamar}</version>
       <scope>test</scope>
     </dependency>    
     <dependency>
       <groupId>org.jboss.ironjacamar</groupId>
       <artifactId>ironjacamar-core-impl</artifactId>
-      <version>@VERSION.IRONJACAMAR@</version>
+      <version>${version.org.jboss.ironjacamar}</version>
       <scope>test</scope>
     </dependency>    
     <dependency>
       <groupId>org.jboss.ironjacamar</groupId>
       <artifactId>ironjacamar-depchain</artifactId>
-      <version>@VERSION.IRONJACAMAR@</version>
+      <version>${version.org.jboss.ironjacamar}</version>
       <scope>test</scope>
       <type>pom</type>
     </dependency>   
     <dependency>
       <groupId>org.jboss.ironjacamar</groupId>
       <artifactId>ironjacamar-deployers-common</artifactId>
-      <version>@VERSION.IRONJACAMAR@</version>
+      <version>${version.org.jboss.ironjacamar}</version>
       <scope>test</scope>
     </dependency>    
     <dependency>
       <groupId>org.jboss.ironjacamar</groupId>
       <artifactId>ironjacamar-deployers-fungal</artifactId>
-      <version>@VERSION.IRONJACAMAR@</version>
+      <version>${version.org.jboss.ironjacamar}</version>
       <scope>test</scope>
     </dependency>    
     <dependency>
       <groupId>org.jboss.ironjacamar</groupId>
       <artifactId>ironjacamar-embedded-arquillian</artifactId>
-      <version>@VERSION.IRONJACAMAR@</version>
+      <version>${version.org.jboss.ironjacamar}</version>
       <scope>test</scope>
     </dependency>    
     <dependency>
       <groupId>org.jboss.ironjacamar</groupId>
       <artifactId>ironjacamar-embedded</artifactId>
-      <version>@VERSION.IRONJACAMAR@</version>
+      <version>${version.org.jboss.ironjacamar}</version>
       <scope>test</scope>
     </dependency>    
     <dependency>
       <groupId>org.jboss.ironjacamar</groupId>
       <artifactId>ironjacamar-validator</artifactId>
-      <version>@VERSION.IRONJACAMAR@</version>
+      <version>${version.org.jboss.ironjacamar}</version>
       <scope>test</scope>
     </dependency>
 
@@ -101,7 +105,7 @@
       <dependency>
         <groupId>org.jboss.ironjacamar</groupId>
         <artifactId>ironjacamar-depchain</artifactId>
-        <version>@VERSION.IRONJACAMAR@</version>
+        <version>${version.org.jboss.ironjacamar}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -124,6 +128,10 @@
   </build> 
   <repositories>
     <repository>
+      <id>jboss</id>
+      <url>http://repository.jboss.org/nexus/content/groups/public</url>
+    </repository>
+    <repository>
       <id>fungal</id>
       <url>http://jesperpedersen.github.com/fungal/maven2</url>
     </repository>



More information about the jboss-cvs-commits mailing list