avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/merlin/web/http/impl project.xml
Date Sat, 03 Jan 2004 13:10:49 GMT
mcconnell    2004/01/03 05:10:49

  Modified:    merlin/activation/api Tag: Ver_3_4 project.xml
               merlin/activation/impl Tag: Ver_3_4 project.xml
               merlin/activation/spi Tag: Ver_3_4 project.xml
               merlin/composition/api Tag: Ver_3_4 project.xml
               merlin/composition/impl Tag: Ver_3_4 project.xml
               merlin/composition/spi Tag: Ver_3_4 project.xml
               merlin/kernel/api Tag: Ver_3_4 project.xml
               merlin/kernel/cli Tag: Ver_3_4 project.xml
               merlin/kernel/impl Tag: Ver_3_4 project.xml
               merlin/kernel/plugin Tag: Ver_3_4 project.xml
               merlin/kernel/servlet Tag: Ver_3_4 project.xml
               merlin/kernel/unit Tag: Ver_3_4 project.xml
               merlin   Tag: Ver_3_4 maven.xml platform.xml project.xml
               merlin/web/http/api Tag: Ver_3_4 project.xml
               merlin/web/http/impl Tag: Ver_3_4 project.xml
  Log:
  Bump activation and composition to 2.0-DEV, and merlin (and related subsystems) to 3.4-DEV.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.6.2.1   +2 -2      avalon/merlin/activation/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/api/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- project.xml	29 Dec 2003 22:56:18 -0000	1.6
  +++ project.xml	3 Jan 2004 13:10:48 -0000	1.6.2.1
  @@ -8,7 +8,7 @@
     <id>avalon-activation-api</id>
     <name>Avalon Activation API</name>
     <package>org.apache.avalon.activation</package>
  -  <currentVersion>1.2.2</currentVersion>
  +  <currentVersion>2.0-DEV</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Activation API</shortDescription>
  @@ -32,7 +32,7 @@
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.2.2</version>
  +      <version>2.0-DEV</version>
       </dependency>
   
     </dependencies>
  
  
  
  No                   revision
  No                   revision
  1.13.2.1  +6 -6      avalon/merlin/activation/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
  retrieving revision 1.13
  retrieving revision 1.13.2.1
  diff -u -r1.13 -r1.13.2.1
  --- project.xml	1 Jan 2004 23:34:45 -0000	1.13
  +++ project.xml	3 Jan 2004 13:10:48 -0000	1.13.2.1
  @@ -8,7 +8,7 @@
     <id>avalon-activation-impl</id>
     <name>Avalon Activation Framework</name>
     <package>org.apache.avalon.activation</package>
  -  <currentVersion>1.2.4</currentVersion>
  +  <currentVersion>2.0-DEV</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Runtime activation framework.</shortDescription>
  @@ -54,28 +54,28 @@
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-api</artifactId>
  -      <version>1.2.2</version>
  +      <version>2.0-DEV</version>
       </dependency>
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-spi</artifactId>
  -      <version>1.2.2</version>
  +      <version>2.0-DEV</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.2.2</version>
  +      <version>2.0-DEV</version>
       </dependency>
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-spi</artifactId>
  -      <version>1.2.1</version>
  +      <version>2.0-DEV</version>
       </dependency>
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-impl</artifactId>
  -      <version>1.2.4</version>
  +      <version>2.0-DEV</version>
       </dependency>
   
       <dependency>
  
  
  
  No                   revision
  No                   revision
  1.10.2.1  +3 -3      avalon/merlin/activation/spi/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/spi/project.xml,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- project.xml	29 Dec 2003 22:56:18 -0000	1.10
  +++ project.xml	3 Jan 2004 13:10:48 -0000	1.10.2.1
  @@ -8,7 +8,7 @@
     <id>avalon-activation-spi</id>
     <name>Avalon Activation SPI</name>
     <package>org.apache.avalon.activation</package>
  -  <currentVersion>1.2.2</currentVersion>
  +  <currentVersion>2.0-DEV</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Activation Service Provider Interface</shortDescription>
  @@ -47,13 +47,13 @@
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.2.2</version>
  +      <version>2.0-DEV</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-api</artifactId>
  -      <version>1.2.2</version>
  +      <version>2.0-DEV</version>
       </dependency>
   
       <dependency>
  
  
  
  No                   revision
  No                   revision
  1.9.2.1   +1 -1      avalon/merlin/composition/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/api/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- project.xml	29 Dec 2003 22:56:18 -0000	1.9
  +++ project.xml	3 Jan 2004 13:10:48 -0000	1.9.2.1
  @@ -8,7 +8,7 @@
     <id>avalon-composition-api</id>
     <name>Avalon Composition API</name>
     <package>org.apache.avalon.assembly</package>
  -  <currentVersion>1.2.2</currentVersion>
  +  <currentVersion>2.0-DEV</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Composition SPI</shortDescription>
  
  
  
  No                   revision
  No                   revision
  1.12.2.1  +3 -3      avalon/merlin/composition/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/project.xml,v
  retrieving revision 1.12
  retrieving revision 1.12.2.1
  diff -u -r1.12 -r1.12.2.1
  --- project.xml	1 Jan 2004 23:34:45 -0000	1.12
  +++ project.xml	3 Jan 2004 13:10:48 -0000	1.12.2.1
  @@ -8,7 +8,7 @@
     <id>avalon-composition-impl</id>
     <name>Avalon Composition Framework</name>
     <package>org.apache.avalon.composition</package>
  -  <currentVersion>1.2.4</currentVersion>
  +  <currentVersion>2.0-DEV</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Composition Framework.</shortDescription>
  @@ -68,12 +68,12 @@
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.2.2</version>
  +      <version>2.0-DEV</version>
       </dependency>
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-spi</artifactId>
  -      <version>1.2.1</version>
  +      <version>2.0-DEV</version>
       </dependency>
   
       <dependency>
  
  
  
  No                   revision
  No                   revision
  1.10.2.1  +2 -2      avalon/merlin/composition/spi/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/spi/project.xml,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- project.xml	29 Dec 2003 22:56:18 -0000	1.10
  +++ project.xml	3 Jan 2004 13:10:48 -0000	1.10.2.1
  @@ -8,7 +8,7 @@
     <id>avalon-composition-spi</id>
     <name>Avalon Composition SPI</name>
     <package>org.apache.avalon.assembly</package>
  -  <currentVersion>1.2.1</currentVersion>
  +  <currentVersion>2.0-DEV</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Composition SPI</shortDescription>
  @@ -34,7 +34,7 @@
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.2.2</version>
  +      <version>2.0-DEV</version>
       </dependency>
   
     </dependencies>
  
  
  
  No                   revision
  No                   revision
  1.3.2.1   +3 -3      avalon/merlin/kernel/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/api/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- project.xml	29 Dec 2003 22:56:18 -0000	1.3
  +++ project.xml	3 Jan 2004 13:10:48 -0000	1.3.2.1
  @@ -9,7 +9,7 @@
     <name>Merlin API</name>
     <package>org.apache.avalon.merlin</package>
   
  -  <currentVersion>3.2</currentVersion>
  +  <currentVersion>3.4-DEV</currentVersion>
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Merlin API</shortDescription>
   
  @@ -31,12 +31,12 @@
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.2.2</version>
  +      <version>2.0-DEV</version>
       </dependency>
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-api</artifactId>
  -      <version>1.2.2</version>
  +      <version>2.0-DEV</version>
       </dependency>
     </dependencies>
     
  
  
  
  No                   revision
  No                   revision
  1.4.2.1   +1 -1      avalon/merlin/kernel/cli/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/cli/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- project.xml	1 Jan 2004 23:34:45 -0000	1.4
  +++ project.xml	3 Jan 2004 13:10:48 -0000	1.4.2.1
  @@ -7,7 +7,7 @@
     <groupId>merlin</groupId>
     <id>merlin-cli</id>
     <name>Merlin CLI</name>
  -  <currentVersion>3.2.2</currentVersion>
  +  <currentVersion>3.4-DEV</currentVersion>
   
     <package>org.apache.avalon.merlin.cli</package>
   
  
  
  
  No                   revision
  No                   revision
  1.16.2.1  +8 -8      avalon/merlin/kernel/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
  retrieving revision 1.16
  retrieving revision 1.16.2.1
  diff -u -r1.16 -r1.16.2.1
  --- project.xml	1 Jan 2004 23:34:45 -0000	1.16
  +++ project.xml	3 Jan 2004 13:10:48 -0000	1.16.2.1
  @@ -9,7 +9,7 @@
     <name>Merlin Implementation</name>
     <package>org.apache.avalon.merlin</package>
   
  -  <currentVersion>3.2.2</currentVersion>
  +  <currentVersion>3.4-DEV</currentVersion>
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Merlin Implementation.</shortDescription>
   
  @@ -24,7 +24,7 @@
       <dependency>
         <groupId>merlin</groupId>
         <artifactId>merlin-api</artifactId>
  -      <version>3.2</version>
  +      <version>3.4-DEV</version>
         <properties>
           <avalon.classloader>api</avalon.classloader>
         </properties>
  @@ -35,7 +35,7 @@
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-api</artifactId>
  -      <version>1.2.2</version>
  +      <version>2.0-DEV</version>
         <properties>
           <avalon.classloader>api</avalon.classloader>
         </properties>
  @@ -43,7 +43,7 @@
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-spi</artifactId>
  -      <version>1.2.2</version>
  +      <version>2.0-DEV</version>
         <properties>
           <avalon.classloader>spi</avalon.classloader>
         </properties>
  @@ -51,7 +51,7 @@
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-impl</artifactId>
  -      <version>1.2.4</version>
  +      <version>2.0-DEV</version>
       </dependency>
   
       <dependency>
  @@ -74,7 +74,7 @@
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.2.2</version>
  +      <version>2.0-DEV</version>
         <properties>
           <avalon.classloader>api</avalon.classloader>
         </properties>
  @@ -82,7 +82,7 @@
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-spi</artifactId>
  -      <version>1.2.1</version>
  +      <version>2.0-DEV</version>
         <properties>
           <avalon.classloader>spi</avalon.classloader>
         </properties>
  @@ -90,7 +90,7 @@
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-impl</artifactId>
  -      <version>1.2.4</version>
  +      <version>2.0-DEV</version>
       </dependency>
   
       <dependency>
  
  
  
  No                   revision
  No                   revision
  1.16.2.1  +1 -1      avalon/merlin/kernel/plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/plugin/project.xml,v
  retrieving revision 1.16
  retrieving revision 1.16.2.1
  diff -u -r1.16 -r1.16.2.1
  --- project.xml	1 Jan 2004 23:34:45 -0000	1.16
  +++ project.xml	3 Jan 2004 13:10:48 -0000	1.16.2.1
  @@ -10,7 +10,7 @@
     <description>Merlin Plugin for Maven</description>
     <shortDescription>Merlin Plugin for Maven</shortDescription>
     <package>org.apache.avalon.merlin</package>
  -  <currentVersion>3.2.3</currentVersion>
  +  <currentVersion>3.4-DEV</currentVersion>
   
     <dependencies>
       <dependency>
  
  
  
  No                   revision
  No                   revision
  1.3.2.1   +4 -4      avalon/merlin/kernel/servlet/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/servlet/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- project.xml	1 Jan 2004 23:34:45 -0000	1.3
  +++ project.xml	3 Jan 2004 13:10:48 -0000	1.3.2.1
  @@ -9,7 +9,7 @@
     <name>Merlin Servlet</name>
     <package>org.apache.avalon.merlin.servlet</package>
   
  -  <currentVersion>3.2.2</currentVersion>
  +  <currentVersion>3.4-DEV</currentVersion>
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Merlin Servlet</shortDescription>
   
  @@ -48,7 +48,7 @@
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.2.2</version>
  +      <version>2.0-DEV</version>
         <type>jar</type>
         <properties>
           <war.bundle>true</war.bundle>
  @@ -57,7 +57,7 @@
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-api</artifactId>
  -      <version>1.2.2</version>
  +      <version>2.0-DEV</version>
         <type>jar</type>
         <properties>
           <war.bundle>true</war.bundle>
  @@ -66,7 +66,7 @@
       <dependency>
         <groupId>merlin</groupId>
         <artifactId>merlin-api</artifactId>
  -      <version>3.2</version>
  +      <version>3.4-DEV</version>
         <type>jar</type>
         <properties>
           <war.bundle>true</war.bundle>
  
  
  
  No                   revision
  No                   revision
  1.21.2.1  +1 -1      avalon/merlin/kernel/unit/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/unit/project.xml,v
  retrieving revision 1.21
  retrieving revision 1.21.2.1
  diff -u -r1.21 -r1.21.2.1
  --- project.xml	1 Jan 2004 23:34:45 -0000	1.21
  +++ project.xml	3 Jan 2004 13:10:48 -0000	1.21.2.1
  @@ -7,7 +7,7 @@
     <groupId>merlin</groupId>
     <id>merlin-unit</id>
     <name>Merlin Unit Test</name>
  -  <currentVersion>3.2.8</currentVersion>
  +  <currentVersion>3.4-DEV</currentVersion>
   
     <package>org.apache.avalon.merlin</package>
   
  
  
  
  No                   revision
  No                   revision
  1.31.2.1  +10 -6     avalon/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/maven.xml,v
  retrieving revision 1.31
  retrieving revision 1.31.2.1
  diff -u -r1.31 -r1.31.2.1
  --- maven.xml	1 Jan 2004 23:34:45 -0000	1.31
  +++ maven.xml	3 Jan 2004 13:10:48 -0000	1.31.2.1
  @@ -2,10 +2,10 @@
   
     <maven:snapshot project="${pom}"/>
   
  -  <ant:property name="merlin.cli.jar" value="merlin-cli-3.2.2.jar"/>
  +  <ant:property name="merlin.cli.jar" value="merlin-cli-3.4-DEV.jar"/>
     <ant:property name="avalon.plugin.jar" value="avalon-plugin-1.0.jar"/>
     <ant:property name="meta.plugin.jar" value="avalon-meta-plugin-1.3.1.jar"/>
  -  <ant:property name="merlin.plugin.jar" value="merlin-plugin-3.2.3.jar"/>
  +  <ant:property name="merlin.plugin.jar" value="merlin-plugin-3.4-DEV.jar"/>
   
     <ant:property file="project.properties"/>
     <ant:property name="maven.docs.src" value="${basedir}/platform/xdocs"/>
  @@ -73,14 +73,18 @@
   
     <goal name="merlin:build" description="Build Merlin.">
       <maven:reactor basedir="${basedir}"
  -      includes="**/project.xml"
  -      excludes="target/**,platform/**,kernel/plugin/**,project.xml,merlin-extensions/**,kernel/cli/**,kernel/unit/**,kernel/servlet/**"
  +      includes="extension/**/project.xml,activation/**/project.xml,composition/**/project.xml,kernel/api/project.xml,kernel/impl/project.xml"
         goals="jar:install"
         banner="Installing:"
         ignoreFailures="false" />
       <maven:reactor basedir="${basedir}"
  -      includes="kernel/unit/project.xml,kernel/cli/project.xml,kernel/plugin/project.xml,kernel/servlet/project.xml"
  -      goals=""
  +      includes="kernel/unit/project.xml,kernel/cli/project.xml,kernel/servlet/project.xml"
  +      goals="jar:install"
  +      banner="Installing:"
  +      ignoreFailures="false" />
  +    <maven:reactor basedir="${basedir}"
  +      includes="kernel/plugin/project.xml"
  +      goals="plugin:install"
         banner="Installing:"
         ignoreFailures="false" />
     </goal>
  
  
  
  1.20.2.1  +8 -8      avalon/merlin/platform.xml
  
  Index: platform.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform.xml,v
  retrieving revision 1.20
  retrieving revision 1.20.2.1
  diff -u -r1.20 -r1.20.2.1
  --- platform.xml	1 Jan 2004 23:45:41 -0000	1.20
  +++ platform.xml	3 Jan 2004 13:10:48 -0000	1.20.2.1
  @@ -28,12 +28,12 @@
       <dependency>
         <groupId>merlin</groupId>
         <artifactId>merlin-api</artifactId>
  -      <version>3.2</version>
  +      <version>3.4-DEV</version>
       </dependency>
       <dependency>
         <groupId>merlin</groupId>
         <artifactId>merlin-impl</artifactId>
  -      <version>3.2.2</version>
  +      <version>3.4-DEV</version>
       </dependency>
   
       <!-- avalon dependecies -->
  @@ -125,33 +125,33 @@
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-api</artifactId>
  -      <version>1.2.2</version>
  +      <version>2.0-DEV</version>
       </dependency>
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-spi</artifactId>
  -      <version>1.2.2</version>
  +      <version>2.0-DEV</version>
       </dependency>
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-impl</artifactId>
  -      <version>1.2.4</version>
  +      <version>2.0-DEV</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.2.2</version>
  +      <version>2.0-DEV</version>
       </dependency>
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-spi</artifactId>
  -      <version>1.2.1</version>
  +      <version>2.0-DEV</version>
       </dependency>
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-impl</artifactId>
  -      <version>1.2.4</version>
  +      <version>2.0-DEV</version>
       </dependency>
   
       <dependency>
  
  
  
  1.18.2.1  +1 -1      avalon/merlin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/project.xml,v
  retrieving revision 1.18
  retrieving revision 1.18.2.1
  diff -u -r1.18 -r1.18.2.1
  --- project.xml	1 Jan 2004 23:34:45 -0000	1.18
  +++ project.xml	3 Jan 2004 13:10:48 -0000	1.18.2.1
  @@ -6,7 +6,7 @@
     <groupId>merlin</groupId>
     <id>merlin</id>
     <name>Avalon Merlin</name>
  -  <currentVersion>3.2.3</currentVersion>
  +  <currentVersion>3.4-DEV</currentVersion>
   
     <organization>
       <name>Apache Software Foundation</name>
  
  
  
  No                   revision
  No                   revision
  1.1.1.1.2.1 +1 -1      avalon/merlin/web/http/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/web/http/api/project.xml,v
  retrieving revision 1.1.1.1
  retrieving revision 1.1.1.1.2.1
  diff -u -r1.1.1.1 -r1.1.1.1.2.1
  --- project.xml	10 Dec 2003 06:43:16 -0000	1.1.1.1
  +++ project.xml	3 Jan 2004 13:10:49 -0000	1.1.1.1.2.1
  @@ -7,7 +7,7 @@
       <groupId>avalon-http</groupId>
       <id>avalon-http-api</id>
       <name>Avalon HTTP API</name>
  -    <currentVersion>1.3</currentVersion>
  +    <currentVersion>1.4-DEV</currentVersion>
       <package>org.apache.avalon.merlin.http</package>
       <inceptionYear>2003</inceptionYear>
       <shortDescription>Avalon HTTP Facility API</shortDescription>
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +3 -3      avalon/merlin/web/http/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/web/http/impl/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- project.xml	10 Nov 2003 22:39:17 -0000	1.1
  +++ project.xml	3 Jan 2004 13:10:49 -0000	1.1.2.1
  @@ -7,7 +7,7 @@
       <groupId>avalon-http</groupId>
       <id>avalon-http-impl</id>
       <name>Avalon HTTP Web Server Component</name>
  -    <currentVersion>1.3</currentVersion>
  +    <currentVersion>1.4-DEV</currentVersion>
       <package>org.apache.avalon.merlin.http</package>
       <inceptionYear>2003</inceptionYear>
       <shortDescription>Avalon-Jetty Web Server</shortDescription>
  @@ -28,13 +28,13 @@
           <dependency>
               <groupId>avalon-http</groupId>
               <artifactId>avalon-http-api</artifactId>
  -            <version>1.3</version>
  +            <version>1.4-DEV</version>
           </dependency>
           
           <dependency>
               <groupId>jetty</groupId>
               <artifactId>org.mortbay.jetty</artifactId>
  -            <version>4.2.14</version>
  +            <version>4.2.15</version>
           </dependency>
           
           <dependency>
  
  
  

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


Mime
View raw message