mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
Sorry my mistake.
This commit is contained in:
1 parent
535e9686bc
commit
c85e60f14e
88 files changed
+4757
-667
No files matched your search
@@ -23,34 +23,70 @@
|
||||
*/
|
||||
package hudson.maven;
|
||||
|
||||
import hudson.*;
|
||||
import hudson.model.*;
|
||||
import static hudson.Util.fixEmpty;
|
||||
import static hudson.model.ItemGroupMixIn.loadChildren;
|
||||
import hudson.CopyOnWrite;
|
||||
import hudson.Extension;
|
||||
import hudson.FilePath;
|
||||
import hudson.Indenter;
|
||||
import hudson.Util;
|
||||
import hudson.model.AbstractProject;
|
||||
import hudson.model.Action;
|
||||
import hudson.model.BuildableItemWithBuildWrappers;
|
||||
import hudson.model.DependencyGraph;
|
||||
import hudson.model.Descriptor;
|
||||
import hudson.model.Descriptor.FormException;
|
||||
import hudson.model.Executor;
|
||||
import hudson.model.Hudson;
|
||||
import hudson.model.Item;
|
||||
import hudson.model.ItemGroup;
|
||||
import hudson.model.Job;
|
||||
import hudson.model.Queue;
|
||||
import hudson.model.Queue.Task;
|
||||
import hudson.model.ResourceActivity;
|
||||
import hudson.model.SCMedItem;
|
||||
import hudson.model.Saveable;
|
||||
import hudson.model.TopLevelItem;
|
||||
import hudson.search.CollectionSearchIndex;
|
||||
import hudson.search.SearchIndexBuilder;
|
||||
import hudson.tasks.*;
|
||||
import hudson.tasks.BuildStep;
|
||||
import hudson.tasks.BuildStepDescriptor;
|
||||
import hudson.tasks.BuildWrapper;
|
||||
import hudson.tasks.BuildWrappers;
|
||||
import hudson.tasks.Fingerprinter;
|
||||
import hudson.tasks.JavadocArchiver;
|
||||
import hudson.tasks.Mailer;
|
||||
import hudson.tasks.Maven;
|
||||
import hudson.tasks.Maven.MavenInstallation;
|
||||
import hudson.tasks.Publisher;
|
||||
import hudson.tasks.junit.JUnitResultArchiver;
|
||||
import hudson.util.CopyOnWriteMap;
|
||||
import hudson.util.DescribableList;
|
||||
import hudson.util.FormValidation;
|
||||
import hudson.util.Function1;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Properties;
|
||||
import java.util.Set;
|
||||
import java.util.Stack;
|
||||
|
||||
import javax.servlet.ServletException;
|
||||
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.kohsuke.stapler.QueryParameter;
|
||||
import org.kohsuke.stapler.StaplerRequest;
|
||||
import org.kohsuke.stapler.StaplerResponse;
|
||||
import org.kohsuke.stapler.export.Exported;
|
||||
|
||||
import javax.servlet.ServletException;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.*;
|
||||
|
||||
import static hudson.Util.fixEmpty;
|
||||
import static hudson.model.ItemGroupMixIn.loadChildren;
|
||||
|
||||
/**
|
||||
* Group of {@link MavenModule}s.
|
||||
*
|
||||
@@ -144,6 +180,8 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
|
||||
* If true, do not archive artifacts to the master.
|
||||
*/
|
||||
private boolean archivingDisabled = false;
|
||||
|
||||
private String mavenVersionUsed;
|
||||
|
||||
/**
|
||||
* Reporters configured at {@link MavenModuleSet} level. Applies to all {@link MavenModule} builds.
|
||||
@@ -598,6 +636,15 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
|
||||
this.alternateSettings = alternateSettings;
|
||||
save();
|
||||
}
|
||||
|
||||
public String getMavenVersionUsed() {
|
||||
return mavenVersionUsed;
|
||||
}
|
||||
|
||||
public void setMavenVersionUsed( String mavenVersionUsed ) throws IOException {
|
||||
this.mavenVersionUsed = mavenVersionUsed;
|
||||
save();
|
||||
}
|
||||
|
||||
/**
|
||||
* If the list of configured goals contain the "-P" option,
|
||||
@@ -837,4 +884,6 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
|
||||
JUnitResultArchiver.class // done by SurefireArchiver
|
||||
));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user