[openejb-scm] openejb/modules/openejb-builder maven.xml project.xml

[dblevins]

dblevins    2005/09/29 04:02:26

  Modified:    modules/openejb-builder Tag: v2_0_G1M5 maven.xml project.xml
  Log:

  Merging head back into v2_0_G1M5 branch
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.8.2.2   +0 -0      openejb/modules/openejb-builder/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/maven.xml,v
  retrieving revision 1.8.2.1
  retrieving revision 1.8.2.2
  diff -u -r1.8.2.1 -r1.8.2.2
  
  
  
  1.35.2.1  +7 -7      openejb/modules/openejb-builder/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/project.xml,v
  retrieving revision 1.35
  retrieving revision 1.35.2.1
  diff -u -r1.35 -r1.35.2.1
  --- project.xml       11 Sep 2005 01:21:49 -0000      1.35
  +++ project.xml       29 Sep 2005 08:02:26 -0000      1.35.2.1
  @@ -207,6 +207,12 @@
           </dependency>
   
           <dependency>
  +            <groupId>geronimo</groupId>
  +            <artifactId>geronimo-util</artifactId>
  +            <version>${geronimo_version}</version>
  +        </dependency>
  +
  +        <dependency>
               <groupId>geronimo-spec</groupId>
               <artifactId>geronimo-spec-j2ee-deployment</artifactId>
               <version>${geronimo_spec_j2ee_deployment_version}</version>
  @@ -380,12 +386,6 @@
               <groupId>commons-cli</groupId>
               <artifactId>commons-cli</artifactId>
               <version>${commons_cli_version}</version>
  -        </dependency>
  -
  -        <dependency>
  -            <groupId>bouncycastle</groupId>
  -            <artifactId>bcprov</artifactId>
  -            <version>${bouncycastle_version}</version>
           </dependency>
   
           <dependency>