diff --git a/core/src/main/java/hudson/model/DependencyGraph.java b/core/src/main/java/hudson/model/DependencyGraph.java index bb4f9e7e82..c24ba0f96d 100644 --- a/core/src/main/java/hudson/model/DependencyGraph.java +++ b/core/src/main/java/hudson/model/DependencyGraph.java @@ -66,7 +66,7 @@ import java.util.Stack; * @see Jenkins#getDependencyGraph() * @author Kohsuke Kawaguchi */ -public final class DependencyGraph implements Comparator { +public class DependencyGraph implements Comparator { private Map> forward = new HashMap>(); private Map> backward = new HashMap>(); @@ -79,6 +79,9 @@ public final class DependencyGraph implements Comparator { * Builds the dependency graph. */ public DependencyGraph() { + } + + public void build() { // Set full privileges while computing to avoid missing any projects the current user cannot see. // Use setContext (NOT getContext().setAuthentication()) so we don't affect concurrent threads for same HttpSession. SecurityContext saveCtx = SecurityContextHolder.getContext(); @@ -87,7 +90,7 @@ public final class DependencyGraph implements Comparator { NotSerilizableSecurityContext system = new NotSerilizableSecurityContext(); system.setAuthentication(ACL.SYSTEM); SecurityContextHolder.setContext(system); - for( AbstractProject p : Jenkins.getInstance().getAllItems(AbstractProject.class) ) + for( AbstractProject p : getAllProjects() ) p.buildDependencyGraph(this); forward = finalize(forward); @@ -99,6 +102,10 @@ public final class DependencyGraph implements Comparator { SecurityContextHolder.setContext(saveCtx); } } + + Collection getAllProjects() { + return Jenkins.getInstance().getAllItems(AbstractProject.class); + } /** * Special constructor for creating an empty graph diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index 9c02535a65..1bec37d82e 100644 --- a/core/src/main/java/jenkins/model/Jenkins.java +++ b/core/src/main/java/jenkins/model/Jenkins.java @@ -3297,7 +3297,11 @@ public class Jenkins extends AbstractCIBase implements ModifiableItemGroup4.8.2 test + + org.mockito + mockito-core + 1.8.5 + test + + + org.powermock + powermock-module-junit4 + 1.4.9 + test + + + org.powermock + powermock-api-mockito + 1.4.9 + test + diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModule.java b/maven-plugin/src/main/java/hudson/maven/MavenModule.java index c8731ddfc8..0005b457e2 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModule.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModule.java @@ -24,42 +24,55 @@ package hudson.maven; import hudson.CopyOnWrite; -import hudson.Util; import hudson.Functions; +import hudson.Util; import hudson.maven.reporters.MavenMailer; -import hudson.model.*; +import hudson.model.AbstractProject; +import hudson.model.Action; +import hudson.model.DependencyGraph; +import hudson.model.Descriptor; import hudson.model.Descriptor.FormException; -import jenkins.model.Jenkins; +import hudson.model.Item; +import hudson.model.ItemGroup; +import hudson.model.JDK; +import hudson.model.Job; +import hudson.model.Label; +import hudson.model.Node; +import hudson.model.Resource; +import hudson.model.Saveable; import hudson.tasks.LogRotator; -import hudson.tasks.Publisher; import hudson.tasks.Maven.MavenInstallation; +import hudson.tasks.Publisher; import hudson.util.AlternativeUiTextProvider; import hudson.util.DescribableList; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.servlet.ServletException; + +import jenkins.model.Jenkins; + import org.apache.maven.project.MavenProject; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.export.Exported; -import com.google.common.util.concurrent.MoreExecutors; - -import javax.servlet.ServletException; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.HashSet; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * {@link Job} that builds projects based on Maven2. * * @author Kohsuke Kawaguchi */ -public final class MavenModule extends AbstractMavenProject implements Saveable { +public class MavenModule extends AbstractMavenProject implements Saveable { private DescribableList> reporters = new DescribableList>(this); @@ -79,6 +92,13 @@ public final class MavenModule extends AbstractMavenProject modules = new HashMap(); - for (MavenModule m : Jenkins.getInstance().getAllItems(MavenModule.class)) { + for (MavenModule m : getAllMavenModules()) { if(!m.isBuildable()) continue; ModuleDependency moduleDependency = m.asDependency(); MavenModule old = modules.get(moduleDependency); @@ -419,7 +441,7 @@ public final class MavenModule extends AbstractMavenProject getAllMavenModules() { + return Jenkins.getInstance().getAllItems(MavenModule.class); + } + /** * Check if this module has dependencies recorded without a concrete version - * which shouldn't happen for any module which was at least build once with Jenkins >= 1.207. diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index 9fc76afe20..02decb205e 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -103,7 +103,7 @@ import org.kohsuke.stapler.export.Exported; * * @author Kohsuke Kawaguchi */ -public final class MavenModuleSet extends AbstractMavenProject implements TopLevelItem, ItemGroup, SCMedItem, Saveable, BuildableItemWithBuildWrappers { +public class MavenModuleSet extends AbstractMavenProject implements TopLevelItem, ItemGroup, SCMedItem, Saveable, BuildableItemWithBuildWrappers { /** * All {@link MavenModule}s, keyed by their {@link MavenModule#getModuleName()} module name}s. */ diff --git a/maven-plugin/src/main/java/hudson/maven/ModuleDependency.java b/maven-plugin/src/main/java/hudson/maven/ModuleDependency.java index 050a5909a4..90660fbb61 100644 --- a/maven-plugin/src/main/java/hudson/maven/ModuleDependency.java +++ b/maven-plugin/src/main/java/hudson/maven/ModuleDependency.java @@ -46,19 +46,28 @@ public final class ModuleDependency implements Serializable { /** * @since 1.395 */ - public boolean plugin = false; + public final boolean plugin; public ModuleDependency(String groupId, String artifactId, String version) { + this(groupId, artifactId, version, false); + } + + public ModuleDependency(String groupId, String artifactId, String version, boolean plugin) { this.groupId = groupId.intern(); this.artifactId = artifactId.intern(); if(version==null) this.version = UNKNOWN; else this.version = version.intern(); + this.plugin = plugin; } public ModuleDependency(ModuleName name, String version) { - this(name.groupId,name.artifactId,version); + this(name.groupId,name.artifactId,version,false); + } + + public ModuleDependency(ModuleName name, String version, boolean plugin) { + this(name.groupId,name.artifactId,version,plugin); } public ModuleDependency(org.apache.maven.model.Dependency dep) { @@ -70,26 +79,25 @@ public final class ModuleDependency implements Serializable { } public ModuleDependency(Plugin p) { - this(p.getGroupId(),p.getArtifactId(), Functions.defaulted(p.getVersion(),NONE)); - this.plugin = true; + this(p.getGroupId(),p.getArtifactId(), Functions.defaulted(p.getVersion(),NONE),true); } public ModuleDependency(ReportPlugin p) { - this(p.getGroupId(),p.getArtifactId(),p.getVersion()); - this.plugin = true; + this(p.getGroupId(),p.getArtifactId(),p.getVersion(),true); } public ModuleDependency(Extension ext) { this(ext.getGroupId(),ext.getArtifactId(),ext.getVersion()); } - private ModuleDependency(String groupId, String artifactId) { + private ModuleDependency(String groupId, String artifactId, boolean plugin) { // to be used only by the withUnknownVersion() method // where we know that groupId and artifactId are already interned // and where we want an UNKNOWN version this.groupId = groupId; this.artifactId = artifactId; this.version = UNKNOWN; + this.plugin = plugin; } public ModuleName getName() { @@ -103,7 +111,7 @@ public final class ModuleDependency implements Serializable { if (UNKNOWN.equals(version)) return this; else - return new ModuleDependency(groupId,artifactId); + return new ModuleDependency(groupId,artifactId,plugin); } public boolean equals(Object o) { @@ -131,7 +139,7 @@ public final class ModuleDependency implements Serializable { * Upon reading from the disk, intern strings. */ public ModuleDependency readResolve() { - return new ModuleDependency(groupId,artifactId,version); + return new ModuleDependency(groupId,artifactId,version,plugin); } /** diff --git a/maven-plugin/src/main/java/hudson/maven/PomInfo.java b/maven-plugin/src/main/java/hudson/maven/PomInfo.java index 8a66724d6d..e0c4198541 100644 --- a/maven-plugin/src/main/java/hudson/maven/PomInfo.java +++ b/maven-plugin/src/main/java/hudson/maven/PomInfo.java @@ -48,6 +48,8 @@ import java.util.ArrayList; * @author Kohsuke Kawaguchi */ final class PomInfo implements Serializable { + + public static final String PACKAGING_TYPE_PLUGIN = "maven-plugin"; public final ModuleName name; @@ -107,6 +109,8 @@ final class PomInfo implements Serializable { private final String artifactId; public final Notifier mailNotifier; + + public final String packaging; public PomInfo(MavenProject project, PomInfo parent, String relPath) { this.name = new ModuleName(project); @@ -154,13 +158,14 @@ final class PomInfo implements Serializable { this.groupId = project.getGroupId(); this.artifactId = project.getArtifactId(); + this.packaging = project.getPackaging(); } /** * Creates {@link ModuleDependency} that represents this {@link PomInfo}. */ private ModuleDependency asDependency() { - return new ModuleDependency(name,version); + return new ModuleDependency(name,version,PACKAGING_TYPE_PLUGIN.equals(this.packaging)); } private void addPluginsAsDependencies(List plugins, Set dependencies) {