Conflicts:
	core/src/main/java/hudson/model/AbstractItem.java
	core/src/main/java/hudson/model/AbstractProject.java
	core/src/main/java/hudson/model/Descriptor.java
	core/src/main/java/hudson/model/Hudson.java
	core/src/main/java/hudson/tasks/BuildTrigger.java
	core/src/main/resources/hudson/model/View/newJob.jelly
	core/src/main/resources/hudson/model/View/sidepanel.jelly
	core/src/main/resources/hudson/views/Messages_ja.properties
	maven-plugin/src/main/java/hudson/maven/MavenBuild.java
	maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java
	maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java
This commit is contained in:
Kohsuke Kawaguchi committed 2011-07-05 19:42:20 -07:00
commit 039e43cf48
65 files changed
+477 -97

No files matched your search

@@ -232,6 +232,10 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
private DescribableList<BuildWrapper,Descriptor<BuildWrapper>> buildWrappers =
new DescribableList<BuildWrapper, Descriptor<BuildWrapper>>(this);
/**
* @deprecated
* Use {@link #MavenModuleSet(ItemGroup, String)}
*/
public MavenModuleSet(String name) {
this(Jenkins.getInstance(),name);
}