Author: brett
Date: Sun Oct 2 20:51:48 2005
New Revision: 293225
URL: http://svn.apache.org/viewcvs?rev=293225&view=rev
Log:
PR: MNG-1041
don't use active project if it is not the same dependency
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectHelper.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java?rev=293225&r1=293224&r2=293225&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
Sun Oct 2 20:51:48 2005
@@ -1,5 +1,21 @@
package org.apache.maven.project;
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.model.Resource;
@@ -10,7 +26,6 @@
public class DefaultMavenProjectHelper
implements MavenProjectHelper
{
-
// requirement.
private ArtifactFactory artifactFactory;
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=293225&r1=293224&r2=293225&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Sun Oct 2 20:51:48 2005
@@ -703,7 +703,7 @@
String type = artifact.getType();
// TODO: utilise type handler
- return "jar".equals( type ) || "ejb".equals( type ) ||
"ejb-client".equals( type );
+ return "jar".equals( type ) || "ejb".equals( type ) ||
"ejb-client".equals( type ) || "test-jar".equals( type );
}
// ----------------------------------------------------------------------
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectHelper.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectHelper.java?rev=293225&r1=293224&r2=293225&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectHelper.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectHelper.java
Sun Oct 2 20:51:48 2005
@@ -1,11 +1,26 @@
package org.apache.maven.project;
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import java.io.File;
import java.util.List;
public interface MavenProjectHelper
-{
-
+{
String ROLE = MavenProjectHelper.class.getName();
void attachArtifact( MavenProject project, String artifactType, String
artifactClassifier, File artifactFile );
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=293225&r1=293224&r2=293225&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Sun Oct 2 20:51:48 2005
@@ -318,7 +318,12 @@
MavenProject project = (MavenProject)
projectReferences.get( refId );
if ( project != null && project.getArtifact() != null )
{
- artifact = new ActiveProjectArtifact( project,
artifact );
+ // TODO: if not matching, we should get the correct
artifact from that project (attached)
+ if (
project.getArtifact().getDependencyConflictId().equals(
+ artifact.getDependencyConflictId() ) )
+ {
+ artifact = new ActiveProjectArtifact( project,
artifact );
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
