dion        2003/07/03 23:22:49

  Modified:    src/plugins-build/uberjar/xdocs changes.xml
               src/plugins-build/uberjar project.xml plugin.jelly
  Log:
  use artifacts for path, not dependencies
  
  Revision  Changes    Path
  1.3       +7 -1      maven/src/plugins-build/uberjar/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/uberjar/xdocs/changes.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- changes.xml       3 Jul 2003 09:01:52 -0000       1.2
  +++ changes.xml       4 Jul 2003 06:22:48 -0000       1.3
  @@ -6,7 +6,13 @@
     </properties>
   
     <body>
  -    <release version="0.8" date="in CVS">
  +    <release version="1.1" date="in CVS">
  +      <action dev="dion" type="fix">
  +        Changed copy of dependencies to use artifacts, so that jar overrides would 
work
  +      </action>
  +    </release>
  +    
  +    <release version="0.8" date="Unknown">
         <action dev="werken" type="add">
           The two properties, maven.uberjar.main and
           maven.uberjar.classworlds.conf, can now be specified via a
  
  
  
  1.14      +1 -1      maven/src/plugins-build/uberjar/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/uberjar/project.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- project.xml       9 Jun 2003 08:34:35 -0000       1.13
  +++ project.xml       4 Jul 2003 06:22:49 -0000       1.14
  @@ -14,7 +14,7 @@
     <!-- The version of the project under development, e.g.
          1.1, 1.2, 2.0-dev -->
   
  -  <currentVersion>1.0</currentVersion>
  +  <currentVersion>1.1-SNAPSHOT</currentVersion>
     <!-- a short description of what the project does -->
   
     <shortDescription>Uberjar packages your project as well as its dependencies into 
a single jar file. In addition, bootstrap code is added that enables a main class to 
be invoked by simply typing: java -jar your.jar</shortDescription>
  
  
  
  1.7       +2 -2      maven/src/plugins-build/uberjar/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/uberjar/plugin.jelly,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- plugin.jelly      3 Jul 2003 09:01:53 -0000       1.6
  +++ plugin.jelly      4 Jul 2003 06:22:49 -0000       1.7
  @@ -54,10 +54,10 @@
         todir="${libdir}"/>
   
       <!-- Copy each dep to our working dir -->
  -    <j:forEach var="dep" items="${pom.dependencies}">
  +    <j:forEach var="lib" items="${pom.artifacts}">
         <copy 
           todir="${libdir}"
  -        file="${maven.repo.local}/${dep.artifactDirectory}/jars/${dep.artifact}"/>
  +        file="${lib.path}"/>
       </j:forEach>
   
       <!-- Copy the classworlds.jar -->
  
  
  

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

Reply via email to