Revision: 83
          http://mvn-infix.svn.sourceforge.net/mvn-infix/?rev=83&view=rev
Author:   bindul
Date:     2010-12-09 00:40:56 +0000 (Thu, 09 Dec 2010)

Log Message:
-----------
Fixed dependency resolution where multiple incompatible versions of 
plexus-component-api was coming in

Modified Paths:
--------------
    infix-parent/trunk/pom.xml
    
shared/infix-plugins-common/trunk/infix-mojo-utils/src/main/java/com/mindtree/techworks/infix/pluginscommon/mojo/resolver/DependencyResolver.java

Modified: infix-parent/trunk/pom.xml
===================================================================
--- infix-parent/trunk/pom.xml  2010-12-06 09:34:28 UTC (rev 82)
+++ infix-parent/trunk/pom.xml  2010-12-09 00:40:56 UTC (rev 83)
@@ -275,6 +275,13 @@
                                                                        
</reportSet>
                                                                </reportSets>
                                                        </plugin>
+                                                       <plugin>
+                                                               
<groupId>org.apache.maven.plugins</groupId>
+                                                               
<artifactId>maven-dependency-plugin</artifactId>
+                                                               <goals>
+                                                                       
<goal>analyze-report</goal>
+                                                               </goals>
+                                                       </plugin>
                                                </reportPlugins>
                                        </configuration>
                                </plugin>
@@ -308,6 +315,7 @@
                                                        <goals>
                                                                
<goal>helpmojo</goal>
                                                        </goals>
+                                                       <!-- Wait for 
http://jira.codehaus.org/browse/MPLUGIN-176 before turning on Java5 -->
                                                </execution>
                                        </executions>
                                </plugin>
@@ -547,6 +555,13 @@
                                <version>1.0-alpha-6</version>
                                <type>jar</type>
                                <scope>compile</scope>
+                               <exclusions>
+                                       <exclusion>
+                                               <!-- plexus-interactivity-api 
1.0-alpha-6 depends on an old non Java5 version of plexus component api -->
+                                               
<groupId>org.codehaus.plexus</groupId>
+                                               
<artifactId>plexus-component-api</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>com.jcraft</groupId>
@@ -565,7 +580,6 @@
                                <artifactId>junit</artifactId>
                                <version>4.8.2</version>
                                <type>jar</type>
-                               <scope>test</scope>
                        </dependency>
                        <dependency>
                                
<groupId>com.mindtree.techworks.infix.plugins-common</groupId>

Modified: 
shared/infix-plugins-common/trunk/infix-mojo-utils/src/main/java/com/mindtree/techworks/infix/pluginscommon/mojo/resolver/DependencyResolver.java
===================================================================
--- 
shared/infix-plugins-common/trunk/infix-mojo-utils/src/main/java/com/mindtree/techworks/infix/pluginscommon/mojo/resolver/DependencyResolver.java
   2010-12-06 09:34:28 UTC (rev 82)
+++ 
shared/infix-plugins-common/trunk/infix-mojo-utils/src/main/java/com/mindtree/techworks/infix/pluginscommon/mojo/resolver/DependencyResolver.java
   2010-12-09 00:40:56 UTC (rev 83)
@@ -126,7 +126,6 @@
        protected File[] resolveDependencies (DependencySet dependencySet, 
MojoInfo mojoInfo) {
                
                MavenProject project = mojoInfo.getProject();
-               @SuppressWarnings ("unchecked")
                Set<Artifact> artifactSet = project.getArtifacts();
                
                ArtifactFilter scopeArtifactFilter = new 
ScopeArtifactFilter(dependencySet.getScope());


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
This SF Dev2Dev email is sponsored by:

WikiLeaks The End of the Free Internet
http://p.sf.net/sfu/therealnews-com
_______________________________________________
mvn-Infix-commits mailing list
mvn-Infix-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mvn-infix-commits

Reply via email to