You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2002/12/09 01:02:45 UTC

cvs commit: jakarta-turbine-maven/src/test/touchstone-build project.properties project.xml

jvanzyl     2002/12/08 16:02:45

  Modified:    src/test/touchstone-build project.properties project.xml
  Log:
  o Adding tests for maven jar override facility using a specified version.
  
  Revision  Changes    Path
  1.4       +8 -0      jakarta-turbine-maven/src/test/touchstone-build/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/test/touchstone-build/project.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.properties	15 Nov 2002 15:11:25 -0000	1.3
  +++ project.properties	9 Dec 2002 00:02:45 -0000	1.4
  @@ -2,9 +2,17 @@
   # M A V E N  J A R  O V E R R I D E
   # ------------------------------------------------------------------------
   maven.jar.override = on
  +
  +# ------------------------------------------------------------------------
  +# Jars set explicity by path.
  +# ------------------------------------------------------------------------
   maven.jar.a = ${basedir}/lib/a.jar
   maven.jar.b = ${basedir}/lib/b.jar
   
  +# ------------------------------------------------------------------------
  +# Jars set explicity by version.
  +# ------------------------------------------------------------------------
  +maven.jar.classworlds = 1.0-beta-1
   # ------------------------------------------------------------------------
   # 
   # ------------------------------------------------------------------------
  
  
  
  1.9       +26 -2     jakarta-turbine-maven/src/test/touchstone-build/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/test/touchstone-build/project.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- project.xml	8 Dec 2002 03:14:56 -0000	1.8
  +++ project.xml	9 Dec 2002 00:02:45 -0000	1.9
  @@ -40,10 +40,15 @@
     <contributors/>
   
     <dependencies>
  -  
  +
  +    <dependency>
  +      <id>ant+optional</id>
  +      <version>1.5.1</version>
  +    </dependency>
  +
       <!-- 
         |
  -      | These dependencies are retrieve using the maven JAR override
  +      | These dependencies are retrieved using the maven JAR override
         | feature specifying a path to the override JAR.
         |
       -->
  @@ -57,6 +62,25 @@
         <id>b</id>
         <version>1.0</version>
       </dependency>
  +  
  +    <!-- 
  +      |
  +      | These dependencies are retrieved using the maven JAR override
  +      | feature specifying a specific version of the JAR.
  +      |
  +    -->
  +
  +    <dependency>
  +      <id>classworlds</id>
  +      <!-- 
  +        |
  +        | In our project.properties file we are asking for version 1.0-beta-1
  +        | so any value of the version stated here should be ignored.
  +        |
  +      -->
  +      <version>SHOULD-NOT-BE-CONSULTED</version>
  +    </dependency>
  +
     </dependencies>
   
     <build>