maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r710190 - in /maven/components/branches/sisbell-maven-3.0-mercury/maven-mercury/src: main/java/org/apache/maven/mercury/ test/java/org/apache/maven/mercury/
Date Mon, 03 Nov 2008 22:24:09 GMT
Author: sisbell
Date: Mon Nov  3 14:24:09 2008
New Revision: 710190

URL: http://svn.apache.org/viewvc?rev=710190&view=rev
Log:
Reverting out adding exclusions to dependency processor. Need to cleanup the ProjectUri first,
specifying all exclusions as collections.

Modified:
    maven/components/branches/sisbell-maven-3.0-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
    maven/components/branches/sisbell-maven-3.0-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
    maven/components/branches/sisbell-maven-3.0-mercury/maven-mercury/src/test/java/org/apache/maven/mercury/MavenDependencyProcessorTest.java

Modified: maven/components/branches/sisbell-maven-3.0-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-3.0-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java?rev=710190&r1=710189&r2=710190&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-3.0-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
(original)
+++ maven/components/branches/sisbell-maven-3.0-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
Mon Nov  3 14:24:09 2008
@@ -1,12 +1,7 @@
 package org.apache.maven.mercury;
 
-import java.io.File;
 import java.io.IOException;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
 import java.util.*;
-import java.net.URL;
-import java.text.SimpleDateFormat;
 
 import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
 import org.apache.maven.mercury.builder.api.DependencyProcessor;
@@ -21,7 +16,7 @@
 public final class MavenDependencyProcessor implements DependencyProcessor {
 
     public MavenDependencyProcessor() {
-        
+
     }
 
     public List<ArtifactBasicMetadata> getDependencies(ArtifactBasicMetadata bmd, MetadataReader
mdReader, Map system, Map user)
@@ -33,7 +28,7 @@
         if (mdReader == null) {
             throw new IllegalArgumentException("mdReader: null");
         }
-        
+
         List<InterpolatorProperty> interpolatorProperties = new ArrayList<InterpolatorProperty>();
         if(system != null) {
             interpolatorProperties.addAll( InterpolatorProperty.toInterpolatorProperties(
system,
@@ -49,7 +44,7 @@
 //            MavenDomainModel superPom =
 //                    new MavenDomainModel(MavenDependencyProcessor.class.getResourceAsStream(
"pom-4.0.0.xml" ));
 //            domainModels.add(superPom);
-                                             
+
             MavenDomainModel domainModel = new MavenDomainModel(mdReader.readMetadata(bmd));
             domainModels.add(domainModel);
 

Modified: maven/components/branches/sisbell-maven-3.0-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-3.0-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java?rev=710190&r1=710189&r2=710190&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-3.0-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
(original)
+++ maven/components/branches/sisbell-maven-3.0-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
Mon Nov  3 14:24:09 2008
@@ -196,7 +196,7 @@
         if(metadata.getScope() == null) {
             metadata.setScope("runtime");
         }
-
+        /*
         ModelDataSource dataSource = new DefaultModelDataSource();
         dataSource.init(container.getProperties(), Arrays.asList(new ArtifactModelContainerFactory(),
new IdModelContainerFactory()) );
         List<ArtifactBasicMetadata> exclusions = new ArrayList<ArtifactBasicMetadata>();
@@ -215,7 +215,7 @@
 
         }
         metadata.setExclusions(exclusions);
-
+        */
         return metadata;
     }
 }

Modified: maven/components/branches/sisbell-maven-3.0-mercury/maven-mercury/src/test/java/org/apache/maven/mercury/MavenDependencyProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-3.0-mercury/maven-mercury/src/test/java/org/apache/maven/mercury/MavenDependencyProcessorTest.java?rev=710190&r1=710189&r2=710190&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-3.0-mercury/maven-mercury/src/test/java/org/apache/maven/mercury/MavenDependencyProcessorTest.java
(original)
+++ maven/components/branches/sisbell-maven-3.0-mercury/maven-mercury/src/test/java/org/apache/maven/mercury/MavenDependencyProcessorTest.java
Mon Nov  3 14:24:09 2008
@@ -38,7 +38,7 @@
         assertEquals("Dependencies incorrect", 2, dependencies.size());
 
     }
-
+    /*
     @org.junit.Test
     public void testSimplePomWithExclusions() throws MetadataReaderException {
         Stack<File> files = new Stack<File>();
@@ -53,7 +53,7 @@
         assertEquals("Exclusions incorrect", 2, dependency.getExclusions().size());
 
     }
-
+   */
     @org.junit.Test
     public void testSinglePomWithProfile() throws MetadataReaderException {
         Stack<File> files = new Stack<File>();



Mime
View raw message