henning     2004/10/16 05:13:01

  Modified:    .        Tag: TORQUE_3_1_BRANCH project.xml
               src/generator Tag: TORQUE_3_1_BRANCH project.xml
               src/maven-plugin Tag: TORQUE_3_1_BRANCH project.xml
               xdocs    Tag: TORQUE_3_1_BRANCH changes.xml
  Log:
  Fix up the POM artifact declaration.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.103.2.18 +52 -18    db-torque/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/project.xml,v
  retrieving revision 1.103.2.17
  retrieving revision 1.103.2.18
  diff -u -r1.103.2.17 -r1.103.2.18
  --- project.xml       16 Oct 2004 10:28:27 -0000      1.103.2.17
  +++ project.xml       16 Oct 2004 12:13:01 -0000      1.103.2.18
  @@ -36,93 +36,127 @@
   
     <dependencies>
       <dependency>
  -      <id>avalon-framework</id>
  +      <artifactId>avalon-framework</artifactId>
  +      <groupId>avalon-framework</groupId>
         <version>4.1.4</version>
         <url>http://avalon.apache.org/</url>
       </dependency>
  +
       <dependency>
  -      <id>commons-beanutils</id>
  +      <artifactId>commons-beanutils</artifactId>
  +      <groupId>commons-beanutils</groupId>
         <version>1.6.1</version>
         <url>http://jakarta.apache.org/commons/beanutils/</url>
       </dependency>
  +
       <dependency>
  -      <id>commons-collections</id>
  +      <artifactId>commons-collections</artifactId>
  +      <groupId>commons-collections</groupId>
         <version>3.0</version>
         <url>http://jakarta.apache.org/commons/collections/</url>
       </dependency>
  +
       <dependency>
  -      <id>commons-configuration</id>
  +      <artifactId>commons-configuration</artifactId>
  +      <groupId>commons-configuration</groupId>
         <version>1.0-rc1</version>
         <url>http://jakarta.apache.org/commons/configuration/</url>
       </dependency>
  +
       <dependency>
  -      <id>commons-dbcp</id>
  +      <artifactId>commons-dbcp</artifactId>
  +      <groupId>commons-dbcp</groupId>
         <version>1.2.1</version>
         <url>http://jakarta.apache.org/commons/dbcp/</url>
       </dependency>
  +
       <dependency>
  -      <id>commons-lang</id>
  +      <artifactId>commons-lang</artifactId>
  +      <groupId>commons-lang</groupId>
         <version>2.0</version>
         <url>http://jakarta.apache.org/commons/lang/</url>
       </dependency>
  +
       <dependency>
  -      <id>commons-logging</id>
  +      <artifactId>commons-logging</artifactId>
  +      <groupId>commons-logging</groupId>
         <version>1.0.4</version>
         <url>http://jakarta.apache.org/commons/logging/</url>
       </dependency>
  +
       <dependency>
  -      <id>commons-pool</id>
  +      <artifactId>commons-pool</artifactId>
  +      <groupId>commons-pool</groupId>
         <version>1.2</version>
         <url>http://jakarta.apache.org/commons/pool/</url>
       </dependency>
  +
       <dependency>
  -      <id>jcs</id>
  +      <artifactId>jcs</artifactId>
  +      <groupId>jcs</groupId>
         <version>20030822.182132</version>
         <url>http://jakarta.apache.org/turbine/jcs/</url>
       </dependency>
  +
       <dependency>
  -      <id>jdbc</id>
  +      <artifactId>jdbc</artifactId>
  +      <groupId>jdbc</groupId>
         <version>2.0</version>
         <url>http://java.sun.com/products/jdbc/download.html#spec</url>
       </dependency>
  +
       <dependency>
  -      <id>jndi</id>
  +      <artifactId>jndi</artifactId>
  +      <groupId>jndi</groupId>
         <version>1.2.1</version>
         <url>http://java.sun.com/products/jndi/</url>
       </dependency>
  +
       <dependency>
  -      <id>log4j</id>
  +      <artifactId>log4j</artifactId>
  +      <groupId>log4j</groupId>
         <version>1.2.8</version>
         <url>http://logging.apache.org/log4j/</url>
       </dependency>
  +
       <dependency>
  -      <id>logkit</id>
  +      <artifactId>logkit</artifactId>
  +      <groupId>logkit</groupId>
         <version>1.0.1</version>
         <url>http://avalon.apache.org/products/runtime/system/logging/</url>
       </dependency>
  +
       <dependency>
  -      <id>stratum</id>
  +      <artifactId>stratum</artifactId>
  +      <groupId>stratum</groupId>
         <version>1.0-b5</version>
         <url>http://jakarta.apache.org/turbine/stratum/</url>
       </dependency>
  +
       <dependency>
  -      <id>village</id>
  +      <artifactId>village</artifactId>
  +      <groupId>village</groupId>
         <version>2.0-dev-20030825</version>
         <url>http://share.whichever.com/index.php?SCREEN=village</url>
       </dependency>
  +
       <dependency>
  -      <id>xerces:xercesImpl</id>
  +      <artifactId>xercesImpl</artifactId>
  +      <groupId>xerces</groupId>
         <version>2.4.0</version>
         <url>http://xml.apache.org/xerces2-j/</url>
       </dependency>
  +
       <dependency>
  -      <groupId>xml-apis</groupId>
         <artifactId>xml-apis</artifactId>
  +      <groupId>xml-apis</groupId>
         <version>1.0.b2</version>
         <url>http://xml.apache.org/commons/</url>
       </dependency>
  +
       <dependency>
  -      <id>junit</id>
  +      <artifactId>junit</artifactId>
  +      <groupId>junit</groupId>
         <version>3.8.1</version>
         <url>http://www.junit.org</url>
       </dependency>
  
  
  
  No                   revision
  No                   revision
  1.13.2.5  +21 -9     db-torque/src/generator/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/src/generator/project.xml,v
  retrieving revision 1.13.2.4
  retrieving revision 1.13.2.5
  diff -u -r1.13.2.4 -r1.13.2.5
  --- project.xml       16 Oct 2004 10:28:27 -0000      1.13.2.4
  +++ project.xml       16 Oct 2004 12:13:01 -0000      1.13.2.5
  @@ -34,35 +34,47 @@
   
     <dependencies>
       <dependency>
  -      <id>ant</id>
  +      <artifactId>ant</artifactId>
  +      <groupId>ant</groupId>
         <version>1.5.1</version>
         <url>http://ant.apache.org/</url>
       </dependency>
  +
       <dependency>
  -      <id>commons-collections</id>
  +      <artifactId>commons-collections</artifactId>
  +      <groupId>commons-collections</groupId>
         <version>3.0</version>
  -      <url>http://jakarta.apache.org/commons/collections.html</url>
  +      <url>http://jakarta.apache.org/commons/collections/</url>
       </dependency>
  +
       <dependency>
  -      <id>commons-lang</id>
  +      <artifactId>commons-lang</artifactId>
  +      <groupId>commons-lang</groupId>
         <version>2.0</version>
  -      <url>http://jakarta.apache.org/commons/</url>
  +      <url>http://jakarta.apache.org/commons/lang/</url>
       </dependency>
  +
       <dependency>
  -      <id>commons-logging</id>
  +      <artifactId>commons-logging</artifactId>
  +      <groupId>commons-logging</groupId>
         <version>1.0.4</version>
  -      <url>http://jakarta.apache.org/commons/</url>
  +      <url>http://jakarta.apache.org/commons/logging/</url>
       </dependency>
  +
       <dependency>
  -      <id>velocity</id>
  +      <artifactId>velocity</artifactId>
  +      <groupId>velocity</groupId>
         <version>1.3.1</version>
         <url>http://jakarta.apache.org/velocity/</url>
       </dependency>
  +
       <dependency>
  -      <id>village</id>
  +      <artifactId>village</artifactId>
  +      <groupId>village</groupId>
         <version>2.0-dev-20030825</version>
         <url>http://share.whichever.com/index.php?SCREEN=village</url>
       </dependency>
  +
     </dependencies>
   
     <build>
  
  
  
  No                   revision
  No                   revision
  1.12.2.10 +32 -11    db-torque/src/maven-plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/src/maven-plugin/project.xml,v
  retrieving revision 1.12.2.9
  retrieving revision 1.12.2.10
  diff -u -r1.12.2.9 -r1.12.2.10
  --- project.xml       16 Oct 2004 10:28:26 -0000      1.12.2.9
  +++ project.xml       16 Oct 2004 12:13:01 -0000      1.12.2.10
  @@ -31,64 +31,85 @@
   
     <dependencies>
       <dependency>
  -      <id>commons-collections</id>
  +      <artifactId>commons-collections</artifactId>
  +      <groupId>commons-collections</groupId>
         <version>3.0</version>
         <url>http://jakarta.apache.org/commons/collections/</url>
       </dependency>
  +
       <dependency>
  -      <id>commons-configuration</id>
  +      <artifactId>commons-configuration</artifactId>
  +      <groupId>commons-configuration</groupId>
         <version>1.0-rc1</version>
         <url>http://jakarta.apache.org/commons/configuration/</url>
       </dependency>
  +
       <dependency>
  -      <id>commons-dbcp</id>
  +      <artifactId>commons-dbcp</artifactId>
  +      <groupId>commons-dbcp</groupId>
         <version>1.2.1</version>
         <url>http://jakarta.apache.org/commons/dbcp/</url>
       </dependency>
  +
       <dependency>
  -      <id>commons-lang</id>
  +      <artifactId>commons-lang</artifactId>
  +      <groupId>commons-lang</groupId>
         <version>2.0</version>
         <url>http://jakarta.apache.org/commons/lang/</url>
       </dependency>
  +
       <dependency>
  -      <id>commons-logging</id>
  +      <artifactId>commons-logging</artifactId>
  +      <groupId>commons-logging</groupId>
         <version>1.0.4</version>
         <url>http://jakarta.apache.org/commons/logging/</url>
       </dependency>
  +
       <dependency>
  -      <id>log4j</id>
  +      <artifactId>log4j</artifactId>
  +      <groupId>log4j</groupId>
         <version>1.2.8</version>
         <url>http://logging.apache.org/log4j/</url>
       </dependency>
  +
       <dependency>
  -      <id>stratum</id>
  +      <artifactId>stratum</artifactId>
  +      <groupId>stratum</groupId>
         <version>1.0-b5</version>
         <url>http://jakarta.apache.org/turbine/stratum/</url>
       </dependency>
  +
       <dependency>
         <groupId>torque</groupId>
         <artifactId>torque-gen</artifactId>
         <version>3.1.1-rc3-dev</version>
         <url>http://db.apache.org/torque-31/generator/</url>
       </dependency>
  +
       <dependency>
  -      <id>velocity</id>
  +      <artifactId>velocity</artifactId>
  +      <groupId>velocity</groupId>
         <version>1.3.1</version>
         <url>http://jakarta.apache.org/velocity/</url>
       </dependency>
  +
       <dependency>
  -      <id>village</id>
  +      <artifactId>village</artifactId>
  +      <groupId>village</groupId>
         <version>2.0-dev-20030825</version>
         <url>http://share.whichever.com/index.php?SCREEN=village</url>
       </dependency>
  +
       <dependency>
  -      <id>xerces:xercesImpl</id>
  +      <artifactId>xercesImpl</artifactId>
  +      <groupId>xerces</groupId>
         <version>2.4.0</version>
         <url>http://xml.apache.org/xerces2-j/</url>
       </dependency>
  +
       <dependency>
  -      <groupId>xml-apis</groupId>
         <artifactId>xml-apis</artifactId>
  +      <groupId>xml-apis</groupId>
         <version>1.0.b2</version>
         <url>http://xml.apache.org/commons/</url>
       </dependency>
  
  
  
  No                   revision
  No                   revision
  1.140.2.2 +3 -0      db-torque/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
  retrieving revision 1.140.2.1
  retrieving revision 1.140.2.2
  diff -u -r1.140.2.1 -r1.140.2.2
  --- changes.xml       16 Oct 2004 11:55:01 -0000      1.140.2.1
  +++ changes.xml       16 Oct 2004 12:13:01 -0000      1.140.2.2
  @@ -27,6 +27,9 @@
     <body>
     <release version="3.1.1-RC3" date="in cvs">
       <action type="update" dev="henning">
  +      Update the POMs to reflect the current style of artifact declaration.
  +    </action>
  +    <action type="update" dev="henning">
         Changed the release-changes.xml file into a maven compliant changes.xml
         file. Activated the maven-changes-report.
       </action>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to