avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/meta-tools project.xml
Date Sat, 29 Mar 2003 06:56:47 GMT
mcconnell    2003/03/28 22:56:47

  Modified:    merlin   maven.xml
               merlin/assembly project.xml
               merlin/assembly-spi project.xml
               merlin/merlin-cli project.xml
               merlin/merlin-core project.xml
               merlin/merlin-plugin project.xml
               merlin/merlin-smp project.xml
               merlin/merlin-spi project.xml
               merlin/meta project.xml
               merlin/meta-spi project.xml
               merlin/meta-tools project.xml
  Log:
  Updates to project defintions to include SAX dependencies needed when building under a JDK
less than 1.4.
  
  Revision  Changes    Path
  1.4       +2 -0      avalon-sandbox/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- maven.xml	29 Mar 2003 03:25:56 -0000	1.3
  +++ maven.xml	29 Mar 2003 06:56:46 -0000	1.4
  @@ -3,12 +3,14 @@
     <property name="merlin.build.inst" value="inst"/>
     <property name="merlin.build.inst.dir" value="${maven.build.dir}/${merlin.build.inst}"/>
   
  +  <!--
     <property name="ibiblio.rep.remote" 
       value="http://www.ibiblio.org/maven"/>
     <property name="avalon.rep.remote" 
       value="http://www.osm.net/repository"/>
     <property name="maven.repo.remote" 
       value="${avalon.rep.remote},${ibiblio.rep.remote}"/>
  +  -->
   
     <property name="maven.checkstyle.format" value="avalon"/>
     <property name="maven.jar.manifest" value="${basedir}/src/etc/project.mf"/>
  
  
  
  1.2       +15 -1     avalon-sandbox/merlin/assembly/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	13 Mar 2003 01:03:38 -0000	1.1
  +++ project.xml	29 Mar 2003 06:56:46 -0000	1.2
  @@ -81,11 +81,25 @@
         <version>2.0</version>
       </dependency>
   
  -    <!-- commons dependecies -->
  +    <!-- commons dependencies -->
   
       <dependency>
         <id>commons-collections</id>
         <version>2.1</version>
  +    </dependency>
  +
  +    <!-- pre JDK 1.4 dependencies -->
  +
  +    <dependency>
  +      <id>xml-apis</id>
  +      <version>1.0.b2</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +
  +    <dependency>
  +      <id>xerces</id>
  +      <version>2.2.1</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
       </dependency>
   
     </dependencies>
  
  
  
  1.2       +17 -0     avalon-sandbox/merlin/assembly-spi/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly-spi/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	13 Mar 2003 01:04:35 -0000	1.1
  +++ project.xml	29 Mar 2003 06:56:46 -0000	1.2
  @@ -17,16 +17,33 @@
     </description>
     
     <dependencies>
  +
       <dependency>
         <groupId>avalon</groupId>
         <artifactId>avalon-framework</artifactId>
         <version>4.1.4</version>
       </dependency>
  +
       <dependency>
         <groupId>avalon</groupId>
         <artifactId>avalon-meta-spi</artifactId>
         <version>1.0</version>
       </dependency>
  +
  +    <!-- pre JDK 1.4 dependencies -->
  +
  +    <dependency>
  +      <id>xml-apis</id>
  +      <version>1.0.b2</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +
  +    <dependency>
  +      <id>xerces</id>
  +      <version>2.2.1</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +
     </dependencies>
     
   </project>
  
  
  
  1.3       +17 -0     avalon-sandbox/merlin/merlin-cli/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-cli/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	13 Mar 2003 03:50:33 -0000	1.2
  +++ project.xml	29 Mar 2003 06:56:46 -0000	1.3
  @@ -17,15 +17,32 @@
     </description>
     
     <dependencies>
  +
       <dependency>
         <id>commons-cli</id>
         <version>1.0</version>
       </dependency>
  +
       <dependency>
         <groupId>excalibur</groupId>
         <artifactId>excalibur-i18n</artifactId>
         <version>1.0</version>
       </dependency>
  +
  +    <!-- pre JDK 1.4 dependencies -->
  +
  +    <dependency>
  +      <id>xml-apis</id>
  +      <version>1.0.b2</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +
  +    <dependency>
  +      <id>xerces</id>
  +      <version>2.2.1</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +
     </dependencies>
     
     <build>
  
  
  
  1.3       +14 -0     avalon-sandbox/merlin/merlin-core/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	13 Mar 2003 03:50:59 -0000	1.2
  +++ project.xml	29 Mar 2003 06:56:46 -0000	1.3
  @@ -128,6 +128,20 @@
         <version>1.0</version>
       </dependency>
   
  +    <!-- pre JDK 1.4 dependencies -->
  +
  +    <dependency>
  +      <id>xml-apis</id>
  +      <version>1.0.b2</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +
  +    <dependency>
  +      <id>xerces</id>
  +      <version>2.2.1</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +
     </dependencies>
     
     <build>
  
  
  
  1.2       +14 -0     avalon-sandbox/merlin/merlin-plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	29 Mar 2003 03:14:03 -0000	1.1
  +++ project.xml	29 Mar 2003 06:56:46 -0000	1.2
  @@ -59,6 +59,20 @@
         <artifactId>qdox</artifactId>
         <version>1.1</version>
       </dependency>
  +
  +    <!-- pre JDK 1.4 dependencies -->
  +
  +    <dependency>
  +      <id>xml-apis</id>
  +      <version>1.0.b2</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +    <dependency>
  +      <id>xerces</id>
  +      <version>2.2.1</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +
     </dependencies>
     
     <build>
  
  
  
  1.2       +13 -0     avalon-sandbox/merlin/merlin-smp/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	13 Mar 2003 01:05:23 -0000	1.1
  +++ project.xml	29 Mar 2003 06:56:46 -0000	1.2
  @@ -74,6 +74,19 @@
         <version>1.0</version>
       </dependency>
   
  +    <!-- pre JDK 1.4 dependencies -->
  +
  +    <dependency>
  +      <id>xml-apis</id>
  +      <version>1.0.b2</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +    <dependency>
  +      <id>xerces</id>
  +      <version>2.2.1</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +
     </dependencies>
     
     <packageGroups>
  
  
  
  1.3       +14 -0     avalon-sandbox/merlin/merlin-spi/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-spi/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	13 Mar 2003 03:55:04 -0000	1.2
  +++ project.xml	29 Mar 2003 06:56:46 -0000	1.3
  @@ -56,6 +56,20 @@
         <version>1.0</version>
       </dependency>
       
  +    <!-- pre JDK 1.4 dependencies -->
  +
  +    <dependency>
  +      <id>xml-apis</id>
  +      <version>1.0.b2</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +
  +    <dependency>
  +      <id>xerces</id>
  +      <version>2.2.1</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +
     </dependencies>
     
     <build>
  
  
  
  1.2       +14 -0     avalon-sandbox/merlin/meta/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	13 Mar 2003 01:05:57 -0000	1.1
  +++ project.xml	29 Mar 2003 06:56:46 -0000	1.2
  @@ -45,6 +45,20 @@
         <artifactId>excalibur-configuration</artifactId>
         <version>1.0</version>
       </dependency>
  +
  +    <!-- pre JDK 1.4 dependencies -->
  +
  +    <dependency>
  +      <id>xml-apis</id>
  +      <version>1.0.b2</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +    <dependency>
  +      <id>xerces</id>
  +      <version>2.2.1</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +
     </dependencies>
     
     <packageGroups>
  
  
  
  1.2       +15 -0     avalon-sandbox/merlin/meta-spi/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-spi/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	13 Mar 2003 01:06:10 -0000	1.1
  +++ project.xml	29 Mar 2003 06:56:47 -0000	1.2
  @@ -31,6 +31,21 @@
         <artifactId>excalibur-configuration</artifactId>
         <version>1.0</version>
       </dependency>
  +
  +    <!-- pre JDK 1.4 dependencies -->
  +
  +    <dependency>
  +      <id>xml-apis</id>
  +      <version>1.0.b2</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +
  +    <dependency>
  +      <id>xerces</id>
  +      <version>2.2.1</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +
     </dependencies>
     
     <packageGroups>
  
  
  
  1.2       +14 -0     avalon-sandbox/merlin/meta-tools/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	29 Mar 2003 03:12:58 -0000	1.1
  +++ project.xml	29 Mar 2003 06:56:47 -0000	1.2
  @@ -61,6 +61,20 @@
         <artifactId>qdox</artifactId>
         <version>1.1</version>
       </dependency>
  +
  +    <!-- pre JDK 1.4 dependencies -->
  +
  +    <dependency>
  +      <id>xml-apis</id>
  +      <version>1.0.b2</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +    <dependency>
  +      <id>xerces</id>
  +      <version>2.2.1</version>
  +      <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +
     </dependencies>
     
     <build>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message