gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject cvs commit: gump/project excalibur.xml
Date Thu, 14 Oct 2004 02:45:26 GMT
niclas      2004/10/13 19:45:26

  Modified:    project  excalibur.xml
  Log:
  Setting the Maven Jar override properties properly, I think.
  
  Revision  Changes    Path
  1.31      +35 -232   gump/project/excalibur.xml
  
  Index: excalibur.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/excalibur.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- excalibur.xml	13 Oct 2004 12:31:16 -0000	1.30
  +++ excalibur.xml	14 Oct 2004 02:45:26 -0000	1.31
  @@ -63,13 +63,7 @@
           <package>org.apache.avalon.excalibur.component</package>
   
           <maven basedir="deprecated/component" goal="jar"/>
  -<!--     
  -        <ant basedir="component" target="jar" buildfile="gump-build.xml">
  -            <property name="checkstyle.jar" project="checkstyle" reference="jarpath"/>
  -            <property name="servlet.jar" project="jakarta-servletapi" reference="jarpath"/>
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  --->
  +        
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-legacy" runtime="true"/>
           <depend project="avalon-framework-impl" runtime="true"/>
  @@ -85,9 +79,7 @@
   
           <!-- test-time dependencies -->
           <depend project="junit"/>
  -<!--  Remove for time being and see what happens...
  -        <depend property="excalibur-i18n.jar" project="excalibur-i18n"/>
  --->        
  +        
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xalan2"/>
  @@ -116,12 +108,7 @@
           <package>org.apache.avalon.excalibur.testcase</package>
           
           <maven basedir="deprecated/testcase" goal="jar"/>
  -<!--
  -        <ant basedir="testcase" target="jar" buildfile="gump-build.xml">
  -            <property name="checkstyle.jar" project="checkstyle" reference="jarpath"/>
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  --->
  +        
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-legacy" runtime="true"/>
           <depend project="avalon-framework-impl" runtime="true"/>
  @@ -195,11 +182,6 @@
           <package>org.apache.avalon.excalibur.datasource</package>
   
           <maven basedir="components/datasource" goal="jar"/>
  -<!--        
  -        <ant basedir="datasource" target="jar" buildfile="gump-build.xml">
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  --->
   
           <depend project="ant" inherit="runtime"/>
           <depend project="avalon-framework-api"/>
  @@ -240,18 +222,7 @@
       <project name="excalibur-event-api">
           <maven basedir="deprecated/event/api" goal="jar"/>
           <package>org.apache.excalibur.event</package>
  -<!--
  -        <ant basedir="event/api" target="jar" buildfile="gump-build.xml">
  -
  -            <property name="checkstyle.jar" project="checkstyle" reference="jarpath"/>
  -
  -            <property name="package-version" value="@@DATE@@"/>
  -            <property name="junit.failonerror" value="true"/>
  -            <property name="do.checkstyle" value="true"/>
  -            <property name="skip.dependencies" value="true"/>
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  --->
  +        
           <!-- runtime dependencies -->
           <depend project="avalon-framework-api" runtime="true"/>
   
  @@ -277,18 +248,7 @@
       <project name="excalibur-event-impl">
           <maven basedir="deprecated/event/impl" goal="jar"/>
           <package>org.apache.excalibur.event</package>
  -<!--
  -        <ant basedir="event/impl" target="jar" buildfile="gump-build.xml">
  -
  -            <property name="checkstyle.jar" project="checkstyle" reference="jarpath"/>
  -
  -            <property name="package-version" value="@@DATE@@"/>
  -            <property name="junit.failonerror" value="true"/>
  -            <property name="do.checkstyle" value="true"/>
  -            <property name="skip.dependencies" value="true"/>
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  --->
  +        
           <!-- runtime dependencies -->
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-legacy" runtime="true"/>
  @@ -296,13 +256,13 @@
           <depend project="excalibur-event-api" runtime="true" />
   
           <depend project="commons-collections" runtime="true"/>
  -        <depend property="util.concurrent.jar" project="concurrent" runtime="true"/>
  +        <depend project="concurrent" runtime="true"/>
   
           <!-- test-time dependencies -->
           <depend project="junit"/>
           <depend project="excalibur-pool"/>
           <depend project="excalibur-instrument-api"/>
  -        <depend property="logkit.jar" project="avalon-logkit"/>
  +        <depend project="avalon-logkit"/>
   
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
  @@ -329,11 +289,6 @@
           <maven basedir="fortress/container-api" goal="jar"/>
           
           <package>org.apache.avalon.fortress</package>
  -<!--
  -        <ant basedir="fortress/container-api" target="jar" buildfile="gump-build.xml">
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  --->
   
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
  @@ -371,11 +326,7 @@
           <maven basedir="fortress/container-impl" goal="jar"/>
           
           <package>org.apache.avalon.fortress</package>
  -<!--        
  -        <ant basedir="fortress/container-impl" target="jar" buildfile="gump-build.xml">
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  --->
  +        
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  @@ -427,11 +378,7 @@
           <maven basedir="fortress/container-test" goal="jar"/>
           
           <package>org.apache.avalon.fortress</package>
  -<!--        
  -        <ant basedir="fortress/container-test" target="jar" buildfile="gump-build.xml">
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  --->        
  +        
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  @@ -492,11 +439,7 @@
           <maven basedir="fortress/container-test" goal="jar"/>
           
           <package>org.apache.avalon.fortress</package>
  -<!--        
  -        <ant basedir="fortress/bean" target="jar" buildfile="gump-build.xml">
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  --->
  +        
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  @@ -549,11 +492,7 @@
       <project name="excalibur-fortress-meta">
           <maven basedir="fortress/meta" goal="jar"/>
           <package>org.apache.avalon.fortress</package>
  -<!--        
  -        <ant basedir="fortress/meta" target="jar" buildfile="gump-build.xml">
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  --->
  +        
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  @@ -614,15 +553,6 @@
           <maven basedir="containerkit/instrument/api" goal="jar"/>
           <package>org.apache.excalibur.instrument</package>
   
  -        <!--
  -        <ant basedir="instrument" target="jar" buildfile="gump-build.xml">
  -            <depend property="avalon-framework.jar" project="avalon-framework-api"/>
  -            <property name="checkstyle.jar" project="checkstyle" reference="jarpath"/>
  -            <depend property="junit.jar" project="junit"/>
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  -        -->
  -        
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
  @@ -654,17 +584,6 @@
           <maven basedir="containerkit/instrument/mgr-api" goal="jar"/>
           <package>org.apache.excalibur.instrument.manager</package>
   
  -<!--
  -        <ant basedir="instrument-manager/spi" target="jar" buildfile="gump-build.xml">
  -
  -            <property name="checkstyle.jar" project="checkstyle" reference="jarpath"/>
  -            
  -            <depend property="junit.jar" project="junit"/>
  -            <property name="project.version" value="@@DATE@@"/>
  -            <property name="src.exclude.pattern" value="**/package.html"/>
  -        </ant>
  --->
  -
           <!-- runtime dependencies -->
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="excalibur-instrument-api" runtime="true"/>
  @@ -696,17 +615,6 @@
           <maven basedir="containerkit/instrument/mgr-impl" goal="jar"/>
           <package>org.apache.excalibur.instrument.manager.impl</package>
   
  -<!--
  -        <ant basedir="instrument-manager/impl" target="jar" buildfile="gump-build.xml">
  -            
  -            <property name="checkstyle.jar" project="checkstyle" reference="jarpath"/>
  -            
  -            <depend property="junit.jar" project="junit"/>
  -            <property name="project.version" value="@@DATE@@"/>
  -            <property name="src.exclude.pattern" value="**/package.html"/>
  -        </ant>
  --->
  -
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-legacy" runtime="true"/>
           <depend project="avalon-framework-impl" runtime="true"/>
  @@ -741,16 +649,6 @@
           <maven basedir="containerkit/instrument/mgr-http" goal="jar"/>
           <package>org.apache.excalibur.instrument.manager.http</package>
   
  -        <!--
  -        <ant basedir="containerkit/instrument/mgr-http" target="jar" buildfile="gump-build.xml">
  -
  -            <property name="checkstyle.jar" project="checkstyle" reference="jarpath"/>
  -
  -            <property name="project.version" value="@@DATE@@"/>
  -            <property name="src.exclude.pattern" value="**/package.html"/>
  -        </ant>
  -        -->
  -        
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-legacy" runtime="true"/>
           <depend project="avalon-framework-impl" runtime="true"/>
  @@ -782,14 +680,6 @@
           <maven basedir="containerkit/instrument/client" goal="dev"/>
           <package>org.apache.excalibur.instrument.client</package>
   
  -        <!--
  -        <ant basedir="instrument-client" target="jar" buildfile="gump-build.xml">
  -            <property name="checkstyle.jar" project="checkstyle" reference="jarpath"/>
  -
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  -        -->
  -        
           <!-- runtime dependencies -->
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-legacy" runtime="true"/>
  @@ -841,18 +731,14 @@
       <project name="excalibur-lifecycle-api">
           <maven basedir="containerkit/lifecycle/api" goal="jar"/>
           <package>org.apache.avalon.lifecycle</package>
  -<!--
  -        <ant basedir="lifecycle/api" target="jar" buildfile="gump-build.xml">
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  --->
  +        
           <!-- runtime dependencies -->
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-legacy" runtime="true"/>
           <depend project="avalon-framework-impl" runtime="true"/>
   
           <!-- test-time dependencies -->
  -        <depend property="junit.jar" project="junit"/>
  +        <depend project="junit"/>
   
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
  @@ -882,11 +768,7 @@
       <project name="excalibur-lifecycle-impl">
           <maven basedir="containerkit/lifecycle/impl" goal="jar"/>
           <package>org.apache.avalon.lifecycle</package>
  -<!--
  -        <ant basedir="lifecycle/impl" target="jar" buildfile="gump-build.xml">
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  --->
  +        
           <!-- runtime dependencies -->
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-legacy" runtime="true"/>
  @@ -894,7 +776,7 @@
           <depend project="excalibur-lifecycle-api" runtime="true"/>
   
           <!-- test-time dependencies -->
  -        <depend property="junit.jar" project="junit"/>
  +        <depend project="junit"/>
   
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
  @@ -925,22 +807,13 @@
       <project name="excalibur-logger">
           <maven basedir="containerkit/logger" goal="jar"/>
           <package>org.apache.avalon.excalibur.logger</package>
  -<!--
  -        <ant basedir="logger" target="jar" buildfile="gump-build.xml">
  -            <property name="package-version" value="@@DATE@@"/>
  -            <property name="junit.failonerror" value="true"/>
  -            <property name="do.checkstyle" value="true"/>
  -            <property name="skip.dependencies" value="true"/>
  -            <property name="project.version" value="@@DATE@@"/>
  -            <property name="do.not.test" value="true"/>
  -        </ant>
  --->        
  +        
           <option project="checkstyle" inherit="runtime"/>
           
           <depend project="ant" inherit="runtime"/>
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-impl" runtime="true"/>
  -        <depend property="logkit.jar" project="avalon-logkit" runtime="true"/>
  +        <depend project="avalon-logkit" runtime="true"/>
           <depend project="jakarta-servletapi-4" runtime="true"/>
           
           <depend project="logging-log4j" runtime="true"/>
  @@ -967,12 +840,7 @@
       <project name="excalibur-monitor">
           <maven basedir="components/monitor" goal="jar"/>
           <package>org.apache.excalibur.monitor</package>
  -<!--
  -        <ant basedir="monitor" target="jar" buildfile="gump-build.xml">
  -            <property name="project.version" value="@@DATE@@"/>
  -            <property name="maven.build.dir" value="target"/>
  -        </ant>
  --->
  +        
           <depend project="ant" inherit="runtime"/>
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-legacy" runtime="true"/>
  @@ -1020,15 +888,7 @@
       <project name="excalibur-pool-api" >
           <maven basedir="components/pool/api" goal="jar"/>
           <package>org.apache.avalon.excalibur.pool</package>
  -<!--
  -        <ant basedir="pool/api" target="jar" buildfile="gump-build.xml">
  -            <property name="package-version" value="@@DATE@@"/>
  -            <property name="junit.failonerror" value="true"/>
  -            <property name="do.checkstyle" value="true"/>
  -            <property name="project.version" value="@@DATE@@"/>
  -            <property name="do.not.test" value="true"/>
  -        </ant>
  --->
  +        
           <depend project="ant" inherit="runtime"/>
           <option project="checkstyle" inherit="runtime"/>
   
  @@ -1053,21 +913,12 @@
       <project name="excalibur-pool-impl" >
           <maven basedir="components/pool/impl" goal="jar"/>
           <package>org.apache.avalon.excalibur.pool</package>
  -<!--
  -        <ant basedir="pool/impl" target="jar" buildfile="gump-build.xml">
  -            <property name="package-version" value="@@DATE@@"/>
  -            <property name="junit.failonerror" value="true"/>
  -            <property name="do.checkstyle" value="true"/>
  -            <property name="skip.dependencies" value="true"/>
  -            <property name="project.version" value="@@DATE@@"/>
  -            <property name="do.not.test" value="true"/>
  -        </ant>
  --->
  +        
           <depend project="excalibur-pool-api" runtime="true"/>
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-legacy" runtime="true"/>
           <depend project="avalon-framework-impl" runtime="true"/>
  -        <depend property="commons-collections" project="commons-collections"/>
  +        <depend project="commons-collections"/>
           
           <depend project="ant" inherit="runtime"/>
           <option project="checkstyle" inherit="runtime"/>
  @@ -1091,22 +942,13 @@
       <project name="excalibur-pool-instrumented" >
           <maven basedir="components/pool/instrumented" goal="jar"/>
           <package>org.apache.avalon.excalibur.pool</package>
  -<!--
  -        <ant basedir="pool/instrumented" target="jar" buildfile="gump-build.xml">
  -            <property name="package-version" value="@@DATE@@"/>
  -            <property name="junit.failonerror" value="true"/>
  -            <property name="do.checkstyle" value="true"/>
  -            <property name="skip.dependencies" value="true"/>
  -            <property name="project.version" value="@@DATE@@"/>
  -            <property name="do.not.test" value="true"/>
  -        </ant>
  --->
  +        
           <depend project="excalibur-pool-api" runtime="true"/>
           <depend project="excalibur-pool-impl" runtime="true"/>
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-legacy" runtime="true"/>
           <depend project="avalon-framework-impl" runtime="true"/>
  -        <depend property="commons-collections" project="commons-collections"/>
  +        <depend project="commons-collections"/>
           <depend project="excalibur-instrument-api" runtime="true"/>
           
           <depend project="ant" inherit="runtime"/>
  @@ -1131,11 +973,7 @@
       <project name="excalibur-sourceresolve">
           <maven basedir="components/sourceresolve" goal="jar"/>
           <package>org.apache.excalibur.source</package>
  -<!--
  -        <ant basedir="sourceresolve" target="jar" buildfile="gump-build.xml">
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  --->
  +        
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-impl" runtime="true"/>
           <depend project="commons-httpclient" runtime="true"/>
  @@ -1170,14 +1008,7 @@
       <project name="excalibur-store">
           <maven basedir="components/store" goal="jar"/>
           <package>org.apache.excalibur.store</package>
  -<!--
  -        <ant basedir="store" target="jar" buildfile="gump-build.xml">
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  --->
  -<!--
  -        <depend property="qdox.jar" project="phoenix-qdox"/>
  --->
  +
           <depend project="qdox" runtime="true"/>
           <depend project="ant" inherit="runtime"/>
           <option project="checkstyle" inherit="runtime"/>
  @@ -1217,15 +1048,7 @@
       <project name="excalibur-thread-api">
           <maven basedir="components/thread/api" goal="jar"/>
           <package>org.apache.avalon.excalibur.thread</package>
  -<!--
  -        <ant basedir="thread/api" target="jar" buildfile="gump-build.xml">
  -            <property name="package-version" value="@@DATE@@"/>
  -            <property name="junit.failonerror" value="true"/>
  -            <property name="do.checkstyle" value="true"/>
  -            <property name="skip.dependencies" value="true"/>
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  --->
  +        
           <option project="checkstyle" inherit="runtime"/>
           
           <depend project="ant" inherit="runtime"/>
  @@ -1253,15 +1076,7 @@
       <project name="excalibur-thread-impl">
           <maven basedir="components/thread/impl" goal="jar"/>
           <package>org.apache.avalon.excalibur.thread</package>
  -<!--
  -        <ant basedir="thread/impl" target="jar" buildfile="gump-build.xml">
  -            <property name="package-version" value="@@DATE@@"/>
  -            <property name="junit.failonerror" value="true"/>
  -            <property name="do.checkstyle" value="true"/>
  -            <property name="skip.dependencies" value="true"/>
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  --->
  +        
           <depend project="avalon-framework-api"/>
           <depend project="avalon-framework-legacy"/>
           <depend project="avalon-framework-impl"/>
  @@ -1291,15 +1106,7 @@
       <project name="excalibur-thread-instrumented">
           <maven basedir="components/thread/instrumented" goal="jar"/>
           <package>org.apache.avalon.excalibur.thread</package>
  -<!--
  -        <ant basedir="thread/instrumented" target="jar" buildfile="gump-build.xml">
  -            <property name="package-version" value="@@DATE@@"/>
  -            <property name="junit.failonerror" value="true"/>
  -            <property name="do.checkstyle" value="true"/>
  -            <property name="skip.dependencies" value="true"/>
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  --->
  +        
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-legacy" runtime="true"/>
           <depend project="avalon-framework-impl" runtime="true"/>
  @@ -1335,11 +1142,7 @@
       <project name="excalibur-xmlutil">
           <maven basedir="components/xmlutil" goal="jar"/>
           <package>org.apache.avalon.excalibur.xml</package>
  -<!--
  -        <ant basedir="xmlutil" target="jar" buildfile="gump-build.xml">
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  --->        
  +        
           <depend project="ant" inherit="runtime"/>
           <depend project="avalon-framework-api"/>
           <depend project="avalon-framework-impl"/>
  @@ -1356,18 +1159,18 @@
           <depend project="excalibur-sourceresolve"/>
           <depend project="excalibur-store"/>
           <depend project="excalibur-testcase"/>
  -        <depend property="jaxen.jar" project="jaxen"/>
  -        <depend property="jtidy.jar" project="jtidy"/>
  +        <depend project="jaxen"/>
  +        <depend project="jtidy"/>
           <depend project="junit"/>
           <depend project="qdox"/>
           <depend project="saxon7"/>
           <depend project="saxon7-sql"/>
           <depend project="saxon7-jdom"/>
  -        <depend property="saxon.jar" project="saxon6"/>
  +        <depend property="mavev.jar.saxon" project="saxon6"/>
           <depend project="saxpath"/>
  -        <depend property="xml-resolver.jar" project="xml-commons-resolver"/>
  -        <depend property="xerces.jar" project="xml-xerces"/>
  -        <depend property="xalan.jar" project="xml-xalan2"/>
  +        <depend property="maven.jar.xml-resolver" project="xml-commons-resolver"/>
  +        <depend property="maven.jar.xerces" project="xml-xerces"/>
  +        <depend property="maven.jar.xalan" project="xml-xalan2"/>
           
           <option project="checkstyle" inherit="runtime"/>
           
  
  
  

Mime
View raw message