Author: snjeza
Date: 2011-01-28 10:13:35 -0500 (Fri, 28 Jan 2011)
New Revision: 28701
Modified:
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.hibernate/src/org/jboss/tools/maven/hibernate/configurators/HibernateProjectConfigurator.java
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java
Log:
JBIDE-8252 JBoss Maven Configurators don't check transitive dependencies
Modified:
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.hibernate/src/org/jboss/tools/maven/hibernate/configurators/HibernateProjectConfigurator.java
===================================================================
---
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.hibernate/src/org/jboss/tools/maven/hibernate/configurators/HibernateProjectConfigurator.java 2011-01-28
14:58:43 UTC (rev 28700)
+++
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.hibernate/src/org/jboss/tools/maven/hibernate/configurators/HibernateProjectConfigurator.java 2011-01-28
15:13:35 UTC (rev 28701)
@@ -1,7 +1,10 @@
package org.jboss.tools.maven.hibernate.configurators;
+import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
import org.eclipse.core.resources.IProject;
@@ -67,14 +70,21 @@
}
private boolean isHibernateProject(MavenProject mavenProject) {
- List<Dependency> dependencies = mavenProject.getDependencies();
- for (Dependency dependency:dependencies) {
- String groupId = dependency.getGroupId();
- if (groupId != null && HIBERNATE_GROUP_ID.equals(groupId)) {
- String artifactId = dependency.getArtifactId();
+ List<Artifact> artifacts = new ArrayList<Artifact>();
+ ArtifactFilter filter = new
org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter(
+ Artifact.SCOPE_TEST);
+ for (Artifact artifact : mavenProject.getArtifacts()) {
+ if (filter.include(artifact)) {
+ artifacts.add(artifact);
+ }
+ }
+ for (Artifact artifact:artifacts) {
+ String groupId = artifact.getGroupId();
+ if (HIBERNATE_GROUP_ID.equals(groupId)) {
+ String artifactId = artifact.getArtifactId();
if (artifactId != null &&
artifactId.startsWith(HIBERNATE_ARTIFACT_ID_PREFIX)) {
return true;
- }
+ }
}
}
return false;
Modified:
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java
===================================================================
---
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2011-01-28
14:58:43 UTC (rev 28700)
+++
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2011-01-28
15:13:35 UTC (rev 28701)
@@ -5,6 +5,8 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
import org.eclipse.core.commands.ExecutionException;
@@ -455,21 +457,28 @@
}
private String getSeamVersion(MavenProject mavenProject) {
- List<Dependency> dependencies = mavenProject.getDependencies();
- Dependency seamDependency = null;
- for (Dependency dependency:dependencies) {
- String groupId = dependency.getGroupId();
+ List<Artifact> artifacts = new ArrayList<Artifact>();
+ ArtifactFilter filter = new
org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter(
+ Artifact.SCOPE_TEST);
+ for (Artifact artifact : mavenProject.getArtifacts()) {
+ if (filter.include(artifact)) {
+ artifacts.add(artifact);
+ }
+ }
+ Artifact seamArtifact = null;
+ for (Artifact artifact:artifacts) {
+ String groupId = artifact.getGroupId();
if (groupId != null && ORG_JBOSS_SEAM_GROUP_ID.equals(groupId)) {
- String artifactId = dependency.getArtifactId();
+ String artifactId = artifact.getArtifactId();
if (artifactId != null && JBOSS_SEAM_ARTIFACT_ID.equals(artifactId)) {
- return dependency.getVersion();
+ return artifact.getVersion();
} else if (artifactId != null &&
artifactId.startsWith(JBOSS_SEAM_ARTIFACT_PREFIX)) {
- seamDependency = dependency;
+ seamArtifact = artifact;
}
}
}
- if (seamDependency != null) {
- return seamDependency.getVersion();
+ if (seamArtifact != null) {
+ return seamArtifact.getVersion();
}
return null;
}
Modified:
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java
===================================================================
---
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java 2011-01-28
14:58:43 UTC (rev 28700)
+++
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java 2011-01-28
15:13:35 UTC (rev 28701)
@@ -1,7 +1,10 @@
package org.jboss.tools.maven.ui;
+import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
import org.eclipse.core.runtime.IStatus;
@@ -106,13 +109,20 @@
}
public String getDependencyVersion(MavenProject mavenProject, String gid, String aid) {
- List<Dependency> dependencies = mavenProject.getDependencies();
- for (Dependency dependency:dependencies) {
- String groupId = dependency.getGroupId();
+ List<Artifact> artifacts = new ArrayList<Artifact>();
+ ArtifactFilter filter = new
org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter(
+ Artifact.SCOPE_TEST);
+ for (Artifact artifact : mavenProject.getArtifacts()) {
+ if (filter.include(artifact)) {
+ artifacts.add(artifact);
+ }
+ }
+ for (Artifact artifact:artifacts) {
+ String groupId = artifact.getGroupId();
if (groupId != null && (groupId.equals(gid)) ) {
- String artifactId = dependency.getArtifactId();
+ String artifactId = artifact.getArtifactId();
if (artifactId != null && artifactId.equals(aid)) {
- return dependency.getVersion();
+ return artifact.getVersion();
}
}
}