geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject cvs commit: incubator-geronimo/modules/maven-xmlbeans-plugin maven.xml
Date Tue, 03 Feb 2004 06:47:56 GMT
djencks     2004/02/02 22:47:56

  Modified:    modules/deployment project.xml
               modules/maven-xmlbeans-plugin maven.xml
  Log:
  Make deployment module depend on fake maven-xmlbeans-plugin-DEV.jar so the plugin will be
built before it is used
  
  Revision  Changes    Path
  1.6       +13 -11    incubator-geronimo/modules/deployment/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/deployment/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	26 Jan 2004 06:50:46 -0000	1.5
  +++ project.xml	3 Feb 2004 06:47:56 -0000	1.6
  @@ -25,12 +25,23 @@
       <!-- ============ -->
   
       <dependencies>
  +
  +        <!-- the maven-xmlbeans-plugin dependency is here
  +        to force it to be built (and installed) before it is needed-->
  +
  +        <dependency>
  +            <groupId>geronimo</groupId>
  +            <artifactId>geronimo-maven-xmlbeans-plugin</artifactId>
  +            <version>DEV</version>
  +            <properties>
  +            </properties>
  +        </dependency>
  +
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-kernel</artifactId>
               <version>DEV</version>
               <properties>
  -                <module>true</module>
               </properties>
           </dependency>
   
  @@ -39,7 +50,6 @@
               <artifactId>geronimo-common</artifactId>
               <version>DEV</version>
               <properties>
  -                <module>true</module>
               </properties>
           </dependency>
   
  @@ -48,8 +58,6 @@
               <version>2.0-RC2</version>
               <url>http://cglib.sf.net/</url>
               <properties>
  -                <runtime>true</runtime>
  -                <destinations>bootlib</destinations>
               </properties>
           </dependency>
   
  @@ -57,8 +65,6 @@
               <id>mx4j</id>
               <version>SNAPSHOT</version>
               <properties>
  -                <runtime>true</runtime>
  -                <destinations>bootlib</destinations>
               </properties>
           </dependency>
   
  @@ -67,8 +73,6 @@
               <version>1.0.3</version>
               <url>http://jakarta.apache.org/commons/logging/</url>
               <properties>
  -                <runtime>true</runtime>
  -                <destinations>bootlib</destinations>
               </properties>
           </dependency>
   
  @@ -77,7 +81,6 @@
               <artifactId>geronimo-spec-j2ee-deployment</artifactId>
               <version>DEV</version>
               <properties>
  -                <module>true</module>
               </properties>
           </dependency>
   
  @@ -87,7 +90,6 @@
               <version>1.1</version>
               <url>http://xml.apache.org/commons</url>
               <properties>
  -                <runtime>true</runtime>
               </properties>
           </dependency>
   
  
  
  
  1.2       +7 -1      incubator-geronimo/modules/maven-xmlbeans-plugin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/maven-xmlbeans-plugin/maven.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- maven.xml	2 Feb 2004 22:04:21 -0000	1.1
  +++ maven.xml	3 Feb 2004 06:47:56 -0000	1.2
  @@ -27,6 +27,12 @@
   
       <goal name="default">
           <attainGoal name="plugin:install"/>
  +        <!-- install a marker file for use by dependencies-->
  +        <ant:property name="jardir__" value="${maven.repo.local}/${pom.artifactDirectory}/jars"/>
  +        <ant:mkdir dir="${jardir__}"/>
  +        <ant:touch
  +            file="${jardir__}/${pom.artifactId}-${pom.currentVersion}.jar"
  +            />
       </goal>
   
       <goal name="build">
  
  
  

Mime
View raw message