gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l...@apache.org
Subject cvs commit: gump/project excalibur.xml
Date Wed, 06 Oct 2004 04:13:08 GMT
leif        2004/10/05 21:13:08

  Modified:    project  excalibur.xml
  Log:
  Remove all use of the @@DATE@@ token for product naming as it does not work
  with Maven.
  
  Revision  Changes    Path
  1.15      +50 -115   gump/project/excalibur.xml
  
  Index: excalibur.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/excalibur.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- excalibur.xml	6 Oct 2004 02:34:08 -0000	1.14
  +++ excalibur.xml	6 Oct 2004 04:13:08 -0000	1.15
  @@ -62,9 +62,7 @@
   
           <package>org.apache.avalon.excalibur.component</package>
   
  -        <maven basedir="deprecated/component" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="deprecated/component" goal="jar"/>
   <!--     
           <ant basedir="component" target="jar" buildfile="gump-build.xml">
               <property name="checkstyle.jar" project="checkstyle" reference="jarpath"/>
  @@ -104,7 +102,7 @@
           <work nested="deprecated/component/target/test-classes"/>
   
           <home nested="deprecated/component"/>
  -        <jar name="target/excalibur-component-@@DATE@@.jar" id="component"/>
  +        <jar name="target/excalibur-component-1.3.jar" id="component"/>
           
           <junitreport nested="deprecated/component/target/docs/junitreports"/>
           
  @@ -116,9 +114,7 @@
   
           <package>org.apache.avalon.excalibur.testcase</package>
           
  -        <maven basedir="deprecated/testcase" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="deprecated/testcase" goal="jar"/>
   <!--
           <ant basedir="testcase" target="jar" buildfile="gump-build.xml">
               <property name="checkstyle.jar" project="checkstyle" reference="jarpath"/>
  @@ -146,7 +142,7 @@
           <work nested="deprecated/testcase/target/test-classes"/>
   
           <home nested="deprecated/testcase"/>
  -        <jar name="target/excalibur-testcase-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-testcase-1.3.jar"/>
           
           <nag from="Gump Integration Build &lt;dev@excalibur.apache.org&gt;"
                to="dev@excalibur.apache.org"/>
  @@ -197,9 +193,7 @@
       <project name="excalibur-datasource">
           <package>org.apache.avalon.excalibur.datasource</package>
   
  -        <maven basedir="components/datasource" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="components/datasource" goal="jar"/>
   <!--        
           <ant basedir="datasource" target="jar" buildfile="gump-build.xml">
               <property name="project.version" value="@@DATE@@"/>
  @@ -225,7 +219,7 @@
           <work nested="components/datasource/target/classes"/>
   
           <home nested="components/datasource"/>
  -        <jar name="target/excalibur-datasource-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-datasource-1.2.0.jar"/>
   
           <junitreport nested="components/datasource/target/docs/junitreports"/>
           
  @@ -241,9 +235,7 @@
       </project>
       
       <project name="excalibur-event-api">
  -        <maven basedir="deprecated/event/api" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="deprecated/event/api" goal="jar"/>
           <package>org.apache.excalibur.event</package>
   <!--
           <ant basedir="event/api" target="jar" buildfile="gump-build.xml">
  @@ -280,9 +272,7 @@
       </project>
       
       <project name="excalibur-event-impl">
  -        <maven basedir="deprecated/event/impl" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="deprecated/event/impl" goal="jar"/>
           <package>org.apache.excalibur.event</package>
   <!--
           <ant basedir="event/impl" target="jar" buildfile="gump-build.xml">
  @@ -324,7 +314,7 @@
           
           <work nested="deprecated/event/impl/target/classes" />
           
  -        <jar name="target/excalibur-event-impl-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-event-impl-2.0.jar"/>
   
           <!--junitreport nested="event/target/docs/junitreports"/-->
           
  @@ -333,9 +323,7 @@
       </project>
   
       <project name="excalibur-fortress-container-api">
  -        <maven basedir="fortress/container-api" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="fortress/container-api" goal="jar"/>
           
           <package>org.apache.avalon.fortress</package>
   <!--
  @@ -365,7 +353,7 @@
           <work nested="fortress/container-api/target/test-classes"/>
   
           <home nested="fortress/container-api"/>
  -        <jar name="target/excalibur-fortress-container-api-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-fortress-container-api-1.2.jar"/>
   
           <junitreport nested="fortress/container-api/target/test-reports"/>
           
  @@ -374,9 +362,7 @@
       </project>
       
       <project name="excalibur-fortress-container-impl">
  -        <maven basedir="fortress/container-impl" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="fortress/container-impl" goal="jar"/>
           
           <package>org.apache.avalon.fortress</package>
   <!--        
  @@ -423,7 +409,7 @@
           <work nested="fortress/container-impl/target/test-classes"/>
   
           <home nested="fortress/container-impl"/>
  -        <jar name="target/excalibur-fortress-container-impl-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-fortress-container-impl-1.2.jar"/>
   
           <junitreport nested="fortress/container-impl/target/test-reports"/>
           
  @@ -432,9 +418,7 @@
       </project>
       
       <project name="excalibur-fortress-container-test">
  -        <maven basedir="fortress/container-test" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="fortress/container-test" goal="jar"/>
           
           <package>org.apache.avalon.fortress</package>
   <!--        
  @@ -490,7 +474,7 @@
           <work nested="fortress/container-test/target/test-classes"/>
   
           <home nested="fortress/container-test"/>
  -        <jar name="target/excalibur-fortress-container-test-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-fortress-container-test-1.2.jar"/>
   
           <junitreport nested="fortress/container-test/target/test-reports"/>
           
  @@ -499,9 +483,7 @@
       </project>
       
       <project name="excalibur-fortress-bean">
  -        <maven basedir="fortress/container-test" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="fortress/container-test" goal="jar"/>
           
           <package>org.apache.avalon.fortress</package>
   <!--        
  @@ -550,7 +532,7 @@
           <work nested="fortress/bean/target/test-classes"/>
   
           <home nested="fortress/bean"/>
  -        <jar name="target/excalibur-fortress-tools-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-fortress-tools-1.2.jar"/>
   
           <junitreport nested="fortress/bean/target/test-reports"/>
           
  @@ -559,9 +541,7 @@
       </project>
       
       <project name="excalibur-fortress-meta">
  -        <maven basedir="fortress/meta" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="fortress/meta" goal="jar"/>
           <package>org.apache.avalon.fortress</package>
   <!--        
           <ant basedir="fortress/meta" target="jar" buildfile="gump-build.xml">
  @@ -589,7 +569,7 @@
           <work nested="fortress/meta/target/test-classes"/>
   
           <home nested="fortress/meta"/>
  -        <jar name="target/excalibur-fortress-meta-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-fortress-meta-1.2.jar"/>
   
           <junitreport nested="fortress/meta/target/test-reports"/>
           
  @@ -599,9 +579,7 @@
       
   <!-- Project removed by the Excalibur community.
       <project name="excalibur-i18n">
  -        <maven basedir="deprecated/event" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="deprecated/event" goal="jar"/>
           <package>org.apache.avalon.excalibur.i18n</package>
   
           <ant basedir="i18n" target="dist" buildfile="gump-build.xml">
  @@ -627,16 +605,7 @@
   -->
   
       <project name="excalibur-instrument-api">
  -        <maven basedir="containerkit/instrument/api" goal="jar">
  -          <property name="project.currentVersion"  value="@@DATE@@"/>
  -          <property name="pom.currentVersion"  value="@@DATE@@"/>
  -          <property name="maven.final.name"  value="excalibur-instrument-api-@@DATE@@"/>
  -        </maven>
  -        <!--
  -        <maven basedir="containerkit/instrument/api" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  -        -->
  +        <maven basedir="containerkit/instrument/api" goal="jar"/>
           <package>org.apache.avalon.excalibur.instrument</package>
   
           <!--
  @@ -664,7 +633,7 @@
           <work nested="containerkit/instrument/api/target/test-classes"/>
   
           <home nested="containerkit/instrument/api/"/>
  -        <jar name="target/excalibur-instrument-api-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-instrument-api-1.2-dev.jar"/>
   
           <junitreport nested="containerkit/instrument/api/target/docs/junitreports"/>
           
  @@ -673,9 +642,7 @@
       </project>
   
       <project name="excalibur-instrument-mgr-api">
  -        <maven basedir="containerkit/instrument/mgr-api" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="containerkit/instrument/mgr-api" goal="jar"/>
           <package>org.apache.avalon.excalibur.instrument.manager</package>
   
   <!--
  @@ -708,16 +675,14 @@
           <work nested="containerkit/instrument/mgr-api/target/test-classes"/>
   
           <home nested="containerkit/instrument/mgr-api"/>
  -        <jar name="target/excalibur-instrument-mgr-api-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-instrument-mgr-api-1.2-dev.jar"/>
           
           <nag from="Gump Integration Build &lt;dev@excalibur.apache.org&gt;"
                to="dev@excalibur.apache.org"/>
       </project>
   
       <project name="excalibur-instrument-mgr-impl">
  -        <maven basedir="containerkit/instrument/mgr-impl" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="containerkit/instrument/mgr-impl" goal="jar"/>
           <package>org.apache.avalon.excalibur.instrument.manager.impl</package>
   
   <!--
  @@ -753,16 +718,14 @@
           <work nested="containerkit/instrument/mgr-impl/target/test-classes"/>
   
           <home nested="containerkit/instrument/mgr-impl"/>
  -        <jar name="target/excalibur-instrument-mgr-impl-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-instrument-mgr-impl-1.2-dev.jar"/>
           
           <nag from="Gump Integration Build &lt;dev@excalibur.apache.org&gt;"
                to="dev@excalibur.apache.org"/>
       </project>
   
       <project name="excalibur-instrument-mgr-http">
  -        <maven basedir="containerkit/instrument/mgr-http" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="containerkit/instrument/mgr-http" goal="jar"/>
           <package>org.apache.avalon.excalibur.instrument.manager.http</package>
   
           <!--
  @@ -795,7 +758,7 @@
           <work nested="containerkit/instrument/mgr-http/target/classes"/>
   
           <home nested="containerkit/instrument/mgr-http"/>
  -        <jar name="target/excalibur-instrument-mgr-http-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-instrument-mgr-http-1.2-dev.jar"/>
           
           <nag from="Gump Integration Build &lt;dev@excalibur.apache.org&gt;"
                to="dev@excalibur.apache.org"/>
  @@ -803,9 +766,7 @@
   
       <project name="excalibur-instrument-client">
           <!-- The Instrument client is a standalone application rather than a jar, so
build the dev target. -->
  -        <maven basedir="containerkit/instrument/client" goal="dev">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="containerkit/instrument/client" goal="dev"/>
           <package>org.apache.avalon.excalibur.instrument.client</package>
   
           <!--
  @@ -833,7 +794,7 @@
           <mkdir dir="containerkit/instrument/client/target/classes"/>
           <work nested="containerkit/instrument/client/target/classes"/>
           <home nested="containerkit/instrument/client"/>
  -        <jar name="target/excalibur-instrument-client-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-instrument-client-1.2-dev.jar"/>
           <junitreport nested="containerkit/instrument/client/target/docs/junitreports"/>
           
           <nag from="Gump Integration Build &lt;dev@excalibur.apache.org&gt;"
  @@ -860,9 +821,7 @@
       </project>
   
       <project name="excalibur-lifecycle-api">
  -        <maven basedir="containerkit/lifecycle/api" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="containerkit/lifecycle/api" goal="jar"/>
           <package>org.apache.avalon.lifecycle</package>
   <!--
           <ant basedir="lifecycle/api" target="jar" buildfile="gump-build.xml">
  @@ -902,9 +861,7 @@
       </project>
   
       <project name="excalibur-lifecycle-impl">
  -        <maven basedir="containerkit/lifecycle/impl" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="containerkit/lifecycle/impl" goal="jar"/>
           <package>org.apache.avalon.lifecycle</package>
   <!--
           <ant basedir="lifecycle/impl" target="jar" buildfile="gump-build.xml">
  @@ -945,9 +902,7 @@
       </project>
       
       <project name="excalibur-logger">
  -        <maven basedir="containerkit/logger" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="containerkit/logger" goal="jar"/>
           <package>org.apache.avalon.excalibur.logger</package>
   <!--
           <ant basedir="logger" target="jar" buildfile="gump-build.xml">
  @@ -980,16 +935,14 @@
           <work nested="containerkit/logger/target/classes"/>
   
           <home nested="containerkit/logger"/>
  -        <jar name="target/excalibur-logger-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-logger-1.2.jar"/>
           
           <nag from="Gump Integration Build &lt;dev@excalibur.apache.org&gt;"
                to="dev@excalibur.apache.org"/>
       </project>
       
       <project name="excalibur-monitor">
  -        <maven basedir="components/monitor" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="components/monitor" goal="jar"/>
           <package>org.apache.excalibur.monitor</package>
   <!--
           <ant basedir="monitor" target="jar" buildfile="gump-build.xml">
  @@ -1025,7 +978,7 @@
           <work nested="components/monitor/target/classes"/>
           <work nested="components/monitor/target/test-classes"/>
   
  -        <jar name="target/excalibur-monitor-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-monitor-1.2.jar"/>
   
           <junitreport nested="components/monitor/target/docs/junitreports"/>
           
  @@ -1040,9 +993,7 @@
       </project>
       
       <project name="excalibur-pool-api" >
  -        <maven basedir="components/pool/api" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="components/pool/api" goal="jar"/>
           <package>org.apache.avalon.excalibur.pool</package>
   <!--
           <ant basedir="pool/api" target="jar" buildfile="gump-build.xml">
  @@ -1075,9 +1026,7 @@
       </project>
   
       <project name="excalibur-pool-impl" >
  -        <maven basedir="components/pool/impl" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="components/pool/impl" goal="jar"/>
           <package>org.apache.avalon.excalibur.pool</package>
   <!--
           <ant basedir="pool/impl" target="jar" buildfile="gump-build.xml">
  @@ -1115,9 +1064,7 @@
       </project>
   
       <project name="excalibur-pool-instrumented" >
  -        <maven basedir="components/pool/instrumented" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="components/pool/instrumented" goal="jar"/>
           <package>org.apache.avalon.excalibur.pool</package>
   <!--
           <ant basedir="pool/instrumented" target="jar" buildfile="gump-build.xml">
  @@ -1150,16 +1097,14 @@
           <mkdir dir="components/pool/instrumented/target/classes"/>
   
           <home nested="components/pool/instrumented"/>
  -        <jar name="target/excalibur-pool-instrumented-2.0.jar"/>
  +        <jar name="target/excalibur-pool-instrumented-2.0.0.jar"/>
           
           <nag from="Gump Integration Build &lt;dev@excalibur.apache.org&gt;"
                to="dev@excalibur.apache.org"/>
       </project>
   
       <project name="excalibur-sourceresolve">
  -        <maven basedir="components/sourceresolve" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="components/sourceresolve" goal="jar"/>
           <package>org.apache.excalibur.source</package>
   <!--
           <ant basedir="sourceresolve" target="jar" buildfile="gump-build.xml">
  @@ -1181,7 +1126,7 @@
           <work nested="components/sourceresolve/target/test-classes"/>
   
           <home nested="components/sourceresolve"/>
  -        <jar name="target/excalibur-sourceresolve-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-sourceresolve-1.2.jar"/>
   
           <junitreport nested="components/sourceresolve/target/docs/junitreports"/>
           
  @@ -1190,9 +1135,7 @@
       </project>
   
       <project name="excalibur-store">
  -        <maven basedir="components/store" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="components/store" goal="jar"/>
           <package>org.apache.excalibur.store</package>
   <!--
           <ant basedir="store" target="jar" buildfile="gump-build.xml">
  @@ -1217,7 +1160,7 @@
           <mkdir dir="components/store/target/test-classes"/>
           <work nested="components/store/target/test-classes"/>
           <home nested="components/store"/>
  -        <jar name="target/excalibur-store-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-store-1.2.jar"/>
   
           <junitreport nested="components/store/target/docs/junitreports"/>
           
  @@ -1232,9 +1175,7 @@
       </project>
       
       <project name="excalibur-thread-api">
  -        <maven basedir="components/thread/api" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="components/thread/api" goal="jar"/>
           <package>org.apache.avalon.excalibur.thread</package>
   <!--
           <ant basedir="thread/api" target="jar" buildfile="gump-build.xml">
  @@ -1270,9 +1211,7 @@
       </project>
   
       <project name="excalibur-thread-impl">
  -        <maven basedir="components/thread/impl" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="components/thread/impl" goal="jar"/>
           <package>org.apache.avalon.excalibur.thread</package>
   <!--
           <ant basedir="thread/impl" target="jar" buildfile="gump-build.xml">
  @@ -1310,9 +1249,7 @@
       </project>
   
       <project name="excalibur-thread-instrumented">
  -        <maven basedir="components/thread/instrumented" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="components/thread/instrumented" goal="jar"/>
           <package>org.apache.avalon.excalibur.thread</package>
   <!--
           <ant basedir="thread/instrumented" target="jar" buildfile="gump-build.xml">
  @@ -1349,16 +1286,14 @@
           <mkdir dir="components/thread/instrumented/target/classes"/>
   
           <home nested="components/thread/instrumented"/>
  -        <jar name="target/excalibur-thread-instrumented-2.0.jar"/>
  +        <jar name="target/excalibur-thread-instrumented-2.0.0.jar"/>
           
           <nag from="Gump Integration Build &lt;dev@excalibur.apache.org&gt;"
                to="dev@excalibur.apache.org"/>
       </project>
   
       <project name="excalibur-xmlutil">
  -        <maven basedir="components/xmlutil" goal="jar">
  -          <property name="component.version"  value="@@DATE@@"/>
  -        </maven>
  +        <maven basedir="components/xmlutil" goal="jar"/>
           <package>org.apache.avalon.excalibur.xml</package>
   <!--
           <ant basedir="xmlutil" target="jar" buildfile="gump-build.xml">
  @@ -1406,7 +1341,7 @@
   
           <home nested="components/xmlutil"/>
           
  -        <jar name="target/excalibur-xmlutil-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-xmlutil-1.2.jar"/>
   
           <junitreport nested="components/xmlutil/target/docs/junitreports"/>
           
  
  
  

Mime
View raw message