geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: rev 54609 - in geronimo/trunk/plugins/maven-xpom-plugin: . src/java/org/apache/geronimo/maven/xpom
Date Mon, 11 Oct 2004 20:58:52 GMT
Author: dblevins
Date: Mon Oct 11 13:58:51 2004
New Revision: 54609

Modified:
   geronimo/trunk/plugins/maven-xpom-plugin/project.xml
   geronimo/trunk/plugins/maven-xpom-plugin/src/java/org/apache/geronimo/maven/xpom/AddDependency.java
Log:
Removed unneeded dependencies and added ability to load jars from target/ directory or maven
repo



Modified: geronimo/trunk/plugins/maven-xpom-plugin/project.xml
==============================================================================
--- geronimo/trunk/plugins/maven-xpom-plugin/project.xml	(original)
+++ geronimo/trunk/plugins/maven-xpom-plugin/project.xml	Mon Oct 11 13:58:51 2004
@@ -35,81 +35,6 @@
     <currentVersion>1.0-SNAPSHOT</currentVersion>
     
     <dependencies>
-        <!--dependency>
-            <groupId>xml-resolver</groupId>
-            <artifactId>xml-resolver</artifactId>
-            <version>1.1</version>
-        </dependency-->
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-deployment</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-system</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-deployment</artifactId>
-            <version>1.1-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.0</version>
-            <url>http://jakarta.apache.org/commons/cli/</url>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.0.3</version>
-            <url>http://jakarta.apache.org/commons/logging/</url>
-        </dependency>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.8</version>
-            <url>http://jakarta.apache.org/log4j</url>
-        </dependency>
-
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j-remote</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-full</artifactId>
-            <version>2.0</version>
-            <url>http://cglib.sourceforge.net</url>
-        </dependency>
-
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
-            <version>1.0-DEV</version>
-        </dependency>
 
       <dependency>
         <groupId>maven</groupId>

Modified: geronimo/trunk/plugins/maven-xpom-plugin/src/java/org/apache/geronimo/maven/xpom/AddDependency.java
==============================================================================
--- geronimo/trunk/plugins/maven-xpom-plugin/src/java/org/apache/geronimo/maven/xpom/AddDependency.java
(original)
+++ geronimo/trunk/plugins/maven-xpom-plugin/src/java/org/apache/geronimo/maven/xpom/AddDependency.java
Mon Oct 11 13:58:51 2004
@@ -133,17 +133,21 @@
 
     public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException
{
         try {
-            Artifact artifact = DefaultArtifactFactory.createArtifact(dependency);
-
-            // Munge the paths
-            File jarFile = new File(dependency.getJar());
-            artifact.setPath(jarFile.getAbsolutePath());
-            dependency.setJar(jarFile.getName());
-
-            // Add artifact and dependency to project
-            Project project = getMavenContext().getProject();
-            project.addDependency(dependency);
-            project.getArtifacts().add(artifact);
+            if (dependency.getJar() != null){
+                Artifact artifact = DefaultArtifactFactory.createArtifact(dependency);
+                // Munge the paths
+                File jarFile = new File(dependency.getJar());
+                artifact.setPath(jarFile.getAbsolutePath());
+                dependency.setJar(jarFile.getName());
+                // Add artifact and dependency to project
+                Project project = getMavenContext().getProject();
+                project.addDependency(dependency);
+                project.getArtifacts().add(artifact);
+            } else {
+                Project project = getMavenContext().getProject();
+                project.addDependency(dependency);
+                project.buildArtifactList();
+            }
         } catch (Exception e) {
             throw new JellyTagException(e);
         }

Mime
View raw message