geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r726395 - in /geronimo/gshell/trunk: ./ gshell-support/ gshell-support/gshell-artifact-ivy/src/main/java/org/apache/geronimo/gshell/artifact/ivy/ gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ ...
Date Sun, 14 Dec 2008 08:57:17 GMT
Author: jdillon
Date: Sun Dec 14 00:57:17 2008
New Revision: 726395

URL: http://svn.apache.org/viewvc?rev=726395&view=rev
Log:
(GSHELL-150) Some initial support for using Maven Mercury to resolve artifacts

Added:
    geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/geronimo/gshell/artifact/mercury/MercuryDependenciesFilter.java
  (contents, props changed)
      - copied, changed from r726036, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/MavenArtifactDependenciesFilter.java
Removed:
    geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/resources/org/
Modified:
    geronimo/gshell/trunk/gshell-support/gshell-artifact-ivy/src/main/java/org/apache/geronimo/gshell/artifact/ivy/ArtifactResolverImpl.java
    geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactResolverImpl.java
    geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/pom.xml
    geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/geronimo/gshell/artifact/mercury/ArtifactResolverImpl.java
    geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/resources/META-INF/gshell/components.xml
    geronimo/gshell/trunk/gshell-support/pom.xml
    geronimo/gshell/trunk/pom.xml

Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact-ivy/src/main/java/org/apache/geronimo/gshell/artifact/ivy/ArtifactResolverImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-ivy/src/main/java/org/apache/geronimo/gshell/artifact/ivy/ArtifactResolverImpl.java?rev=726395&r1=726394&r2=726395&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-ivy/src/main/java/org/apache/geronimo/gshell/artifact/ivy/ArtifactResolverImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-ivy/src/main/java/org/apache/geronimo/gshell/artifact/ivy/ArtifactResolverImpl.java
Sun Dec 14 00:57:17 2008
@@ -56,7 +56,9 @@
     }
 
     public void setTransferListener(final TransferListener listener) {
-        // Ignore for now
+        assert listener != null;
+        
+        // TODO: Figure out how to adapt/install into Ivy
     }
 
     public Result resolve(final Request request) throws Failure {

Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactResolverImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactResolverImpl.java?rev=726395&r1=726394&r2=726395&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactResolverImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactResolverImpl.java
Sun Dec 14 00:57:17 2008
@@ -35,7 +35,7 @@
 import java.util.Set;
 
 /**
- * <a href="http://maven.apache.org">Apache Maven (maven-artifact)</a> based
{@link ArtifactResolver}.
+ * <a href="http://maven.apache.org">Apache Maven (maven-artifact)</a>-based
{@link ArtifactResolver}.
  *
  * @version $Rev$ $Date$
  */

Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/pom.xml?rev=726395&r1=726394&r2=726395&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/pom.xml Sun Dec 14 00:57:17
2008
@@ -51,7 +51,33 @@
         <dependency>
             <groupId>org.apache.maven.mercury</groupId>
             <artifactId>mercury-md-sat</artifactId>
-            <version>1.0.0-alpha-2-SNAPSHOT</version>
+            <version>1.0.0-alpha-2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-cli</groupId>
+                    <artifactId>commons-cli</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.plexus</groupId>
+                    <artifactId>plexus-classworlds</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.xbean</groupId>
+                    <artifactId>xbean-reflect</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.code.google-collections</groupId>
+                    <artifactId>google-collect</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>bouncycastle</groupId>
+                    <artifactId>bcpg-jdk15</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/geronimo/gshell/artifact/mercury/ArtifactResolverImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/geronimo/gshell/artifact/mercury/ArtifactResolverImpl.java?rev=726395&r1=726394&r2=726395&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/geronimo/gshell/artifact/mercury/ArtifactResolverImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/geronimo/gshell/artifact/mercury/ArtifactResolverImpl.java
Sun Dec 14 00:57:17 2008
@@ -20,18 +20,76 @@
 package org.apache.geronimo.gshell.artifact.mercury;
 
 import org.apache.geronimo.gshell.artifact.ArtifactResolver;
+import org.apache.geronimo.gshell.artifact.Artifact;
+import org.apache.geronimo.gshell.artifact.transfer.TransferListener;
+import org.apache.maven.mercury.metadata.DependencyBuilderFactory;
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.DefaultArtifact;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
- * <a href="http://maven.apache.org">Apache Maven (mercury)</a> based {@link
ArtifactResolver}.
+ * <a href="http://maven.apache.org/mercury">Apache Maven Mercury</a>-based {@link
ArtifactResolver}.
  *
  * @version $Rev$ $Date$
  */
 public class ArtifactResolverImpl
     implements ArtifactResolver
 {
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    
+    public void setTransferListener(final TransferListener listener) {
+        assert listener != null;
+
+        // TODO: Figure out how to install into Mercury
+    }
+
     public Result resolve(final Request request) throws Failure {
         assert request != null;
 
-        return null;
+        // TODO: Setup MercuryDependenciesFilter
+        
+        DependencyBuilderFactory factory = new DependencyBuilderFactory();
+
+        // TODO:
+
+        throw new Error("Not implemented");
+    }
+
+    /**
+     * Creates a GShell Artifact from a Mercury Artifact.
+     */
+    private Artifact createArtifact(final org.apache.maven.mercury.artifact.Artifact source)
{
+        assert source != null;
+
+        Artifact artifact = new Artifact();
+        artifact.setGroup(source.getGroupId());
+        artifact.setName(source.getArtifactId());
+        artifact.setVersion(source.getVersion());
+        artifact.setClassifier(source.getClassifier());
+        artifact.setType(source.getType());
+        artifact.setFile(source.getFile());
+
+        return artifact;
+    }
+
+    /**
+     * Creates a Mercury Artifact from a GShell Artifact.
+     */
+    private org.apache.maven.mercury.artifact.Artifact createArtifact(final Artifact source)
{
+        assert source != null;
+
+        ArtifactBasicMetadata md = new ArtifactBasicMetadata();
+        md.setGroupId(source.getGroup());
+        md.setArtifactId(source.getName());
+        md.setVersion(source.getVersion());
+        md.setClassifier(source.getClassifier());
+        md.setType(source.getType());
+
+        org.apache.maven.mercury.artifact.Artifact artifact = new DefaultArtifact(md);
+
+        artifact.setFile(source.getFile());
+
+        return artifact;
     }
 }
\ No newline at end of file

Copied: geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/geronimo/gshell/artifact/mercury/MercuryDependenciesFilter.java
(from r726036, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/MavenArtifactDependenciesFilter.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/geronimo/gshell/artifact/mercury/MercuryDependenciesFilter.java?p2=geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/geronimo/gshell/artifact/mercury/MercuryDependenciesFilter.java&p1=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/MavenArtifactDependenciesFilter.java&r1=726036&r2=726395&rev=726395&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/MavenArtifactDependenciesFilter.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/geronimo/gshell/artifact/mercury/MercuryDependenciesFilter.java
Sun Dec 14 00:57:17 2008
@@ -17,102 +17,85 @@
  * under the License.
  */
 
-package org.apache.geronimo.gshell.artifact.maven;
+package org.apache.geronimo.gshell.artifact.mercury;
 
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.mercury.metadata.MetadataTreeArtifactFilter;
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
 
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
 /**
- * Filters artifacts required for using Maven Artifact for resolution of artifacts.
+ * Filters artifacts required for using Maven Murcury for resolution of artifacts.
  *
  * @version $Rev$ $Date$
  */
-public class MavenArtifactDependenciesFilter
-    implements ArtifactFilter
+public class MercuryDependenciesFilter
+    implements MetadataTreeArtifactFilter
 {
     /*
-    [INFO] org.apache.geronimo.gshell.support:gshell-artifact-maven:jar:1.0-alpha-2-SNAPSHOT
+    [INFO] org.apache.geronimo.gshell.support:gshell-artifact-mercury:jar:1.0-alpha-2-SNAPSHOT
     [INFO] +- org.slf4j:slf4j-api:jar:1.5.6:compile
-    [INFO] +- org.slf4j:slf4j-log4j12:jar:1.5.6:test
-    [INFO] |  \- log4j:log4j:jar:1.2.15:test (version managed from 1.2.14)
-    [INFO] +- org.apache.geronimo.gshell.support:gshell-chronos:jar:1.0-alpha-2-SNAPSHOT:compile
-    [INFO] |  \- org.apache.geronimo.gshell.support:gshell-yarn:jar:1.0-alpha-2-SNAPSHOT:compile
-    [INFO] +- org.apache.geronimo.gshell.support:gshell-io:jar:1.0-alpha-2-SNAPSHOT:compile
-    [INFO] |  \- org.apache.geronimo.gshell.support:gshell-ansi:jar:1.0-alpha-2-SNAPSHOT:compile
-    [INFO] |     +- org.apache.geronimo.gshell.support:gshell-i18n:jar:1.0-alpha-2-SNAPSHOT:compile
-    [INFO] |     \- org.apache.geronimo.gshell.support:gshell-terminal:jar:1.0-alpha-2-SNAPSHOT:compile
-    [INFO] |        \- jline:jline:jar:0.9.94:compile
-    [INFO] +- org.apache.geronimo.gshell.support:gshell-spring:jar:1.0-alpha-2-SNAPSHOT:compile
-    [INFO] |  +- org.slf4j:jcl-over-slf4j:jar:1.5.6:compile
-    [INFO] |  +- org.springframework:spring-core:jar:2.5.5:compile
-    [INFO] |  \- org.springframework:spring-beans:jar:2.5.5:compile
     [INFO] +- org.apache.geronimo.gshell.support:gshell-artifact:jar:1.0-alpha-2-SNAPSHOT:compile
-    [INFO] +- org.apache.geronimo.gshell.support:gshell-plexus:jar:1.0-alpha-2-SNAPSHOT:compile
-    [INFO] |  +- org.codehaus.plexus:plexus-container-default:jar:1.0-beta-2:compile
-    [INFO] |  |  +- org.codehaus.plexus:plexus-classworlds:jar:1.3:compile
-    [INFO] |  |  +- org.apache.xbean:xbean-reflect:jar:3.4:compile
-    [INFO] |  |  \- com.google.code.google-collections:google-collect:jar:snapshot-20080530:compile
-    [INFO] |  +- org.codehaus.plexus:plexus-component-annotations:jar:1.0-beta-2:compile
-    [INFO] |  \- org.codehaus.plexus:plexus-utils:jar:1.5.6:compile
-    [INFO] +- org.apache.maven.artifact:maven-artifact:jar:3.0-alpha-1:compile
-    [INFO] |  \- aspectj:aspectjrt:jar:1.5.3:compile
-    [INFO] +- org.apache.maven:maven-project:jar:2.1.0-r721111:compile
-    [INFO] |  +- org.apache.maven:maven-settings:jar:2.1.0-r721111:compile
-    [INFO] |  +- org.apache.maven:maven-profile:jar:2.1.0-r721111:compile
-    [INFO] |  +- org.apache.maven:maven-model:jar:2.1.0-r721111:compile
-    [INFO] |  +- org.apache.maven:maven-plugin-registry:jar:2.1.0-r721111:compile
-    [INFO] |  \- org.codehaus.plexus:plexus-interpolation:jar:1.5:compile
-    [INFO] +- org.apache.maven.wagon:wagon-provider-api:jar:1.0-beta-4:compile
-    [INFO] +- org.apache.maven.wagon:wagon-file:jar:1.0-beta-4:runtime
-    [INFO] +- org.apache.maven.wagon:wagon-http-lightweight:jar:1.0-beta-4:runtime
-    [INFO] |  \- org.apache.maven.wagon:wagon-http-shared:jar:1.0-beta-4:runtime
-    [INFO] |     +- nekohtml:xercesMinimal:jar:1.9.6.2:runtime
-    [INFO] |     \- nekohtml:nekohtml:jar:1.9.6.2:runtime
-    [INFO] +- org.apache.geronimo.gshell.support:gshell-spring:jar:tests:1.0-alpha-2-SNAPSHOT:test
-    [INFO] \- junit:junit:jar:3.8.2:test
+    [INFO] |  \- org.apache.geronimo.gshell.support:gshell-io:jar:1.0-alpha-2-SNAPSHOT:compile
+    [INFO] |     +- org.apache.geronimo.gshell.support:gshell-yarn:jar:1.0-alpha-2-SNAPSHOT:compile
+    [INFO] |     \- org.apache.geronimo.gshell.support:gshell-ansi:jar:1.0-alpha-2-SNAPSHOT:compile
+    [INFO] |        +- org.apache.geronimo.gshell.support:gshell-i18n:jar:1.0-alpha-2-SNAPSHOT:compile
+    [INFO] |        \- org.apache.geronimo.gshell.support:gshell-terminal:jar:1.0-alpha-2-SNAPSHOT:compile
+    [INFO] |           \- jline:jline:jar:0.9.94:compile
+    [INFO] +- org.apache.maven.mercury:mercury-md-sat:jar:1.0.0-alpha-2:compile
+    [INFO] |  +- org.sat4j:org.sat4j.core:jar:2.0.4:compile
+    [INFO] |  +- org.sat4j:org.sat4j.pb:jar:2.0.4:compile
+    [INFO] |  +- org.apache.maven.mercury:mercury-md-shared:jar:1.0.0-alpha-2:compile
+    [INFO] |  |  +- org.apache.maven.mercury:mercury-artifact:jar:1.0.0-alpha-2:compile
+    [INFO] |  |  +- org.apache.maven.mercury:mercury-util:jar:1.0.0-alpha-2:compile
+    [INFO] |  |  \- org.apache.maven.mercury:mercury-crypto-basic:jar:1.0.0-alpha-2:compile
+    [INFO] |  |     \- org.apache.maven.mercury:mercury-crypto-api:jar:1.0.0-alpha-2:compile
+    [INFO] |  +- org.apache.maven.mercury:mercury-repo-virtual:jar:1.0.0-alpha-2:compile
+    [INFO] |  |  \- org.apache.maven.mercury:mercury-repo-cache-fs:jar:1.0.0-alpha-2:compile
+    [INFO] |  |     \- org.apache.maven.mercury:mercury-repo-api:jar:1.0.0-alpha-2:compile
+    [INFO] |  |        +- org.apache.maven.mercury:mercury-transport-api:jar:1.0.0-alpha-2:compile
+    [INFO] |  |        \- org.apache.maven.mercury:mercury-external:jar:1.0.0-alpha-2:compile
+    [INFO] |  +- org.apache.maven.mercury:mercury-logging:jar:1.0.0-alpha-2:compile
+    [INFO] |  +- org.apache.maven.mercury:mercury-event:jar:1.0.0-alpha-2:compile
+    [INFO] |  \- org.codehaus.plexus:plexus-lang:jar:1.1:compile
+    [INFO] |     +- org.codehaus.plexus:plexus-utils:jar:1.5.5:compile
+    [INFO] |     \- org.codehaus.plexus:plexus-container-default:jar:1.0-beta-3.0.1:compile
+    [INFO] \- junit:junit:jar:3.8.2:test (scope not updated to compile)
     */
-    
+
     private static final String[] EXCLUDES = {
-        "gshell-artifact-maven",
-        "gshell-plexus",
-        "aspectjrt",
-        "maven-artivact",
-        "maven-model",
-        "maven-plugin-registry",
-        "maven-profile",
-        "maven-project",
-        "maven-settings",
-        "plexus-classworlds",
-        "plexus-component-annotations",
-        "plexus-container-default",
-        "plexus-interpolation",
+        "gshell-artifact-mercury",
+        "mercury-md-sat",
+        "org.sat4j.core",
+        "org.sat4j.pb",
+        "mercury-md-shared",
+        "mercury-artifact",
+        "mercury-util",
+        "mercury-crypto-basic",
+        "mercury-crypto-api",
+        "mercury-repo-virtual",
+        "mercury-repo-cache-fs",
+        "mercury-repo-api",
+        "mercury-transport-api",
+        "mercury-external",
+        "mercury-logging",
+        "mercury-event",
+        "plexus-lang",
         "plexus-utils",
-        "wagon-file",
-        "wagon-http-lightweight",
-        "wagon-http-shared",
-        "wagon-provider-api",
-        "xbean-reflect",
-        "google-collect",
-        "xercesMinimal",
-        "nekohtml",
-
+        "plexus-container-default",
     };
 
     private final Set<String> excludes = new HashSet<String>();
 
-    public MavenArtifactDependenciesFilter() {
+    public MercuryDependenciesFilter() {
         excludes.addAll(Arrays.asList(EXCLUDES));
     }
 
-    public boolean include(final Artifact artifact) {
-        assert artifact != null;
-
-        String name = artifact.getArtifactId();
+    public boolean veto(final ArtifactBasicMetadata md) {
+        assert md != null;
 
-        return !excludes.contains(name);
+        return !excludes.contains(md.getArtifactId());
     }
 }
\ No newline at end of file

Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/geronimo/gshell/artifact/mercury/MercuryDependenciesFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/geronimo/gshell/artifact/mercury/MercuryDependenciesFilter.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/geronimo/gshell/artifact/mercury/MercuryDependenciesFilter.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/geronimo/gshell/artifact/mercury/MercuryDependenciesFilter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/resources/META-INF/gshell/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/resources/META-INF/gshell/components.xml?rev=726395&r1=726394&r2=726395&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/resources/META-INF/gshell/components.xml
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/resources/META-INF/gshell/components.xml
Sun Dec 14 00:57:17 2008
@@ -25,6 +25,6 @@
        xsi:schemaLocation="
             http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean id="artifactManager" class="org.apache.geronimo.gshell.artifact.maven.ArtifactManagerFactory"/>
+    <bean id="artifactResolver" class="org.apache.geronimo.gshell.artifact.mercury.ArtifactResolverImpl"/>
     
 </beans>
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/pom.xml?rev=726395&r1=726394&r2=726395&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/pom.xml Sun Dec 14 00:57:17 2008
@@ -58,9 +58,7 @@
         <module>gshell-plexus</module>
         <module>gshell-artifact</module>
         <module>gshell-artifact-maven</module>
-        <!--
         <module>gshell-artifact-mercury</module>
-        -->
         <module>gshell-artifact-ivy</module>
         <module>gshell-marshal</module>
         <module>gshell-xstore</module>

Modified: geronimo/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=726395&r1=726394&r2=726395&view=diff
==============================================================================
--- geronimo/gshell/trunk/pom.xml (original)
+++ geronimo/gshell/trunk/pom.xml Sun Dec 14 00:57:17 2008
@@ -268,13 +268,11 @@
                 <version>1.0-alpha-2-SNAPSHOT</version>
             </dependency>
 
-            <!--
             <dependency>
                 <groupId>org.apache.geronimo.gshell.support</groupId>
                 <artifactId>gshell-artifact-mercury</artifactId>
                 <version>1.0-alpha-2-SNAPSHOT</version>
             </dependency>
-            -->
 
             <dependency>
                 <groupId>org.apache.geronimo.gshell.support</groupId>



Mime
View raw message