diff --git a/core/pom.xml b/core/pom.xml index 41c8573c83..6cb094fa7f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -302,48 +302,6 @@ THE SOFTWARE. remoting ${project.version} - - org.apache.maven - maven-embedder - ${maven.version} - - - - org.apache.maven - maven-core - 2.0.9 - - - jtidy - jtidy - - - commons-cli - commons-cli - - - xml-apis - xml-apis - - - org.jvnet.hudson jtidy @@ -356,19 +314,6 @@ THE SOFTWARE. - - - org.jvnet.hudson - wagon-webdav - 1.0-beta-2-hudson-1 - - - jdom - jdom - - - - org.jvnet.hudson.svnkit svnkit @@ -379,11 +324,6 @@ THE SOFTWARE. trilead-putty-extension 1.0 - - ${groupId} - maven-agent - ${project.version} - org.kohsuke.stapler stapler-jelly diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index 4375798691..54b95aa796 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -25,6 +25,7 @@ package hudson; import hudson.PluginWrapper.Dependency; import hudson.util.IOException2; +import hudson.model.Hudson; import java.io.BufferedReader; import java.io.File; @@ -156,6 +157,15 @@ public class ClassicPluginStrategy implements PluginStrategy { } } + // native m2 support moved to a plugin starting 1.295, so plugins built before that + // needs to have an implicit dependency to the maven-plugin, or NoClassDefError will ensue. + String hudsonVersion = manifest.getMainAttributes().getValue("Hudson-Version"); + String shortName = manifest.getMainAttributes().getValue("Short-Name"); + if (!"maven-plugin".equals(shortName) && + (hudsonVersion == null || hudsonVersion.compareTo("1.295") <= 0)) { + optionalDependencies.add(new PluginWrapper.Dependency("maven-plugin:" + Hudson.VERSION)); + } + ClassLoader dependencyLoader = new DependencyClassLoader(getClass() .getClassLoader(), dependencies); ClassLoader classLoader = new URLClassLoader(paths.toArray(new URL[paths.size()]), diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index 20802057e0..6f1fecb04b 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -23,7 +23,6 @@ */ package hudson; -import hudson.maven.ExecutedMojo; import hudson.model.AbstractProject; import hudson.model.Action; import hudson.model.Descriptor; @@ -665,10 +664,6 @@ public class Functions { return ASTSizeFunction.sizeOf(o,Introspector.getUberspect()); } - public static ExecutedMojo.Cache createExecutedMojoCache() { - return new ExecutedMojo.Cache(); - } - /** * Computes the relative path from the current page to the given item. */ diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index bee86f610c..54b5a62d63 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -39,6 +39,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.Arrays; import java.util.logging.Level; import java.util.logging.Logger; @@ -50,7 +51,6 @@ import org.apache.commons.io.FileUtils; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.QueryParameter; -import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.WebApp; /** @@ -123,8 +123,21 @@ public final class PluginManager extends AbstractModelObject { } strategy = createPluginStrategy(); - - for( File arc : archives ) { + + // load plugins from a system property, for use in the "mvn hudson-dev:run" + List archivesList = new ArrayList(Arrays.asList(archives)); + String hplProperty = System.getProperty("hudson.bundled.plugins"); + if (hplProperty != null) { + for (String hplLocation: hplProperty.split(",")) { + File hpl = new File(hplLocation.trim()); + if (hpl.exists()) + archivesList.add(hpl); + else + LOGGER.warning("bundled plugin " + hplLocation + " does not exist"); + } + } + + for( File arc : archivesList ) { try { PluginWrapper p = strategy.createPluginWrapper(arc); plugins.add(p); @@ -155,12 +168,26 @@ public final class PluginManager extends AbstractModelObject { * If the war file has any "/WEB-INF/plugins/*.hpi", extract them into the plugin directory. */ private void loadBundledPlugins() { + // this is used in tests, when we want to override the default bundled plugins with .hpl versions + if (System.getProperty("hudson.bundled.plugins") != null) { + return; + } Set paths = context.getResourcePaths("/WEB-INF/plugins"); if(paths==null) return; // crap for( String path : (Set) paths) { String fileName = path.substring(path.lastIndexOf('/')+1); try { - FileUtils.copyURLToFile(context.getResource(path),new File(rootDir,fileName)); + URL url = context.getResource(path); + long lastModified = url.openConnection().getLastModified(); + File file = new File(rootDir, fileName); + if (file.exists() && file.lastModified() != lastModified) { + FileUtils.copyURLToFile(url, file); + file.setLastModified(url.openConnection().getLastModified()); + // lastModified is set for two reasons: + // - to avoid unpacking as much as possible, but still do it on both upgrade and downgrade + // - to make sure the value is not changed after each restart, so we can avoid + // unpacking the plugin itself in ClassicPluginStrategy.explode + } } catch (IOException e) { LOGGER.log(Level.SEVERE, "Failed to extract the bundled plugin "+fileName,e); } diff --git a/core/src/main/java/hudson/matrix/MatrixRun.java b/core/src/main/java/hudson/matrix/MatrixRun.java index 4177ce5a8b..78a664b8ac 100644 --- a/core/src/main/java/hudson/matrix/MatrixRun.java +++ b/core/src/main/java/hudson/matrix/MatrixRun.java @@ -24,7 +24,6 @@ package hudson.matrix; import hudson.model.Build; -import hudson.maven.*; import java.io.File; import java.io.IOException; @@ -111,7 +110,7 @@ public class MatrixRun extends Build { public String getWhyKeepLog() { MatrixBuild pb = getParentBuild(); if(pb!=null && pb.getWhyKeepLog()!=null) - return hudson.maven.Messages.MavenBuild_KeptBecauseOfParent(pb); + return Messages.MatrixRun_KeptBecauseOfParent(pb); return super.getWhyKeepLog(); } diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java index f6763691dd..be2363795b 100644 --- a/core/src/main/java/hudson/model/AbstractBuild.java +++ b/core/src/main/java/hudson/model/AbstractBuild.java @@ -28,7 +28,6 @@ import hudson.Functions; import hudson.Launcher; import hudson.Util; import hudson.matrix.MatrixConfiguration; -import hudson.maven.MavenBuild; import hudson.model.Fingerprint.BuildPtr; import hudson.model.Fingerprint.RangeSet; import hudson.model.listeners.SCMListener; diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 0e996abc33..e443bdd08d 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -28,7 +28,6 @@ import hudson.FeedAdapter; import hudson.FilePath; import hudson.Launcher; import hudson.Util; -import hudson.maven.MavenModule; import hudson.model.Cause.LegacyCodeCause; import hudson.model.Cause.UserCause; import hudson.model.Cause.RemoteCause; @@ -87,7 +86,7 @@ import java.util.logging.Logger; /** * Base implementation of {@link Job}s that build software. * - * For now this is primarily the common part of {@link Project} and {@link MavenModule}. + * For now this is primarily the common part of {@link Project} and MavenModule. * * @author Kohsuke Kawaguchi * @see AbstractBuild diff --git a/core/src/main/java/hudson/model/Fingerprint.java b/core/src/main/java/hudson/model/Fingerprint.java index 1ba77e1e79..90d9d83e4d 100644 --- a/core/src/main/java/hudson/model/Fingerprint.java +++ b/core/src/main/java/hudson/model/Fingerprint.java @@ -33,8 +33,6 @@ import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import hudson.Util; import hudson.XmlFile; import hudson.BulkChange; -import hudson.maven.MavenModule; -import hudson.maven.MavenModuleSet; import hudson.util.HexBinaryConverter; import hudson.util.Iterators; import hudson.util.XStream2; @@ -145,8 +143,8 @@ public class Fingerprint implements ModelObject, Saveable { * or one of its subordinates. * *

- * This is useful to check if an artifact in {@link MavenModule} - * belongs to {@link MavenModuleSet}. + * This is useful to check if an artifact in MavenModule + * belongs to MavenModuleSet. */ public boolean belongsTo(Job job) { Item p = Hudson.getInstance().getItemByFullName(name); diff --git a/core/src/main/java/hudson/model/Items.java b/core/src/main/java/hudson/model/Items.java index a9a2cfdcec..e5ce11e20a 100644 --- a/core/src/main/java/hudson/model/Items.java +++ b/core/src/main/java/hudson/model/Items.java @@ -31,9 +31,6 @@ import hudson.scm.RepositoryBrowser; import hudson.matrix.MatrixProject; import hudson.matrix.MatrixConfiguration; import hudson.matrix.Axis; -import hudson.maven.MavenModule; -import hudson.maven.MavenModuleSet; -import hudson.maven.ModuleDependency; import hudson.util.XStream2; import hudson.util.DescriptorList; @@ -135,10 +132,6 @@ public class Items { static { XSTREAM.alias("project",FreeStyleProject.class); - XSTREAM.alias("maven2", MavenModule.class); - XSTREAM.alias("dependency", ModuleDependency.class); - XSTREAM.alias("maven2-module-set", MavenModule.class); // this was a bug, but now we need to keep it for compatibility - XSTREAM.alias("maven2-moduleset", MavenModuleSet.class); XSTREAM.alias("matrix-project",MatrixProject.class); XSTREAM.alias("axis", Axis.class); XSTREAM.alias("matrix-config",MatrixConfiguration.class); diff --git a/core/src/main/java/hudson/slaves/ComputerListener.java b/core/src/main/java/hudson/slaves/ComputerListener.java index d33414f098..cf7a96810b 100644 --- a/core/src/main/java/hudson/slaves/ComputerListener.java +++ b/core/src/main/java/hudson/slaves/ComputerListener.java @@ -26,9 +26,12 @@ package hudson.slaves; import hudson.model.Computer; import hudson.model.Hudson; import hudson.model.TaskListener; +import hudson.model.Node; import hudson.ExtensionPoint; import hudson.Extension; import hudson.ExtensionList; +import hudson.FilePath; +import hudson.remoting.Channel; import java.io.IOException; @@ -39,6 +42,43 @@ import java.io.IOException; * @since 1.246 */ public abstract class ComputerListener implements ExtensionPoint { + /** + * Called before a {@link Computer} is marked online. + * + *

+ * This enables you to do some work on all the slaves + * as they get connected. Unlike {@link #onOnline(Computer, TaskListener)}, + * a failure to carry out this function normally will prevent + * a computer from marked as online. + * + * @param channel + * This is the channel object to talk to the slave. + * (This is the same object returned by {@link Computer#getChannel()} once + * it's connected. + * @param root + * The directory where this slave stores files. + * The same as {@link Node#getRootPath()}, except that method returns + * null until the slave is connected. So this parameter is passed explicitly instead. + * @param listener + * This is connected to the launch log of the computer. + * Since this method is called synchronously from the thread + * that launches a computer, if this method performs a time-consuming + * operation, this listener should be notified of the progress. + * This is also a good listener for reporting problems. + * + * @throws IOException + * Exceptions will be recorded to the listener, and + * the computer will not become online. + * @throws InterruptedException + * Exceptions will be recorded to the listener, and + * the computer will not become online. + * + * @since 1.295 + * @see #onOnline(Computer, TaskListener) + */ + public void preOnline(Computer c, Channel channel, FilePath root, TaskListener listener) throws IOException, InterruptedException { + } + /** * Called right after a {@link Computer} comes online. * @@ -67,6 +107,8 @@ public abstract class ComputerListener implements ExtensionPoint { * @throws InterruptedException * Exceptions will be recorded to the listener. Note that * throwing an exception doesn't put the computer offline. + * + * @see #preOnline(Computer, TaskListener) */ public void onOnline(Computer c, TaskListener listener) throws IOException, InterruptedException { // compatibility diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java index 43fb931c9b..cbc4420445 100644 --- a/core/src/main/java/hudson/slaves/SlaveComputer.java +++ b/core/src/main/java/hudson/slaves/SlaveComputer.java @@ -25,7 +25,6 @@ package hudson.slaves; import hudson.model.*; import hudson.remoting.Channel; -import hudson.remoting.Which; import hudson.remoting.VirtualChannel; import hudson.remoting.Callable; import hudson.util.StreamTaskListener; @@ -35,8 +34,6 @@ import hudson.util.Futures; import hudson.FilePath; import hudson.lifecycle.WindowsSlaveInstaller; import hudson.Util; -import hudson.maven.agent.Main; -import hudson.maven.agent.PluginManagerInterceptor; import java.io.File; import java.io.OutputStream; @@ -291,16 +288,12 @@ public class SlaveComputer extends Computer { String remoteFs = getNode().getRemoteFS(); if(_isUnix && !remoteFs.contains("/") && remoteFs.contains("\\")) log.println("WARNING: "+remoteFs+" looks suspiciously like Windows path. Maybe you meant "+remoteFs.replace('\\','/')+"?"); - - {// send jars that we need for our operations - // TODO: maybe I should generalize this kind of "post initialization" processing - FilePath dst = new FilePath(channel, remoteFs); - copyJar(log, dst, Main.class, "maven-agent"); - copyJar(log, dst, PluginManagerInterceptor.class, "maven-interceptor"); - } + FilePath root = new FilePath(channel,getNode().getRemoteFS()); channel.call(new SlaveInitializer()); channel.call(new WindowsSlaveInstaller(remoteFs)); + for (ComputerListener cl : ComputerListener.all()) + cl.preOnline(this,channel,root,taskListener); // update the data structure atomically to prevent others from seeing a channel that's not properly initialized yet synchronized(channelLock) { @@ -324,26 +317,6 @@ public class SlaveComputer extends Computer { Hudson.getInstance().getQueue().scheduleMaintenance(); } - /** - * Copies a jar file from the master to slave. - */ - private void copyJar(PrintWriter log, FilePath dst, Class representative, String seedName) throws IOException, InterruptedException { - // in normal execution environment, the master should be loading 'representative' from this jar, so - // in that way we can find it. - File jar = Which.jarFile(representative); - - if(jar.isDirectory()) { - // but during the development and unit test environment, we may be picking the class up from the classes dir, - // in which case we need to find this in a tricker way. - String dir = Hudson.getInstance().servletContext.getRealPath("/WEB-INF/lib"); - FilePath[] paths = new FilePath(new File(dir)).list(seedName + "-*.jar"); - jar = new File(paths[0].getRemote()); - } - - new FilePath(jar).copyTo(dst.child(seedName +".jar")); - log.println("Copied "+seedName+".jar"); - } - @Override public VirtualChannel getChannel() { return channel; @@ -364,7 +337,7 @@ public class SlaveComputer extends Computer { }); } - public void doDoDisconnect(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException { + public void doDoDisconnect(StaplerResponse rsp) throws IOException, ServletException { checkPermission(Hudson.ADMINISTER); disconnect(); rsp.sendRedirect("."); @@ -442,7 +415,7 @@ public class SlaveComputer extends Computer { logger.log(Level.SEVERE, "Failed to terminate channel to " + getDisplayName(), e); } } - for (ComputerListener cl : Hudson.getInstance().getComputerListeners()) + for (ComputerListener cl : ComputerListener.all()) cl.onOffline(this); } diff --git a/core/src/main/java/hudson/tasks/ArtifactArchiver.java b/core/src/main/java/hudson/tasks/ArtifactArchiver.java index 73d5a6ebb9..0b16b339f5 100644 --- a/core/src/main/java/hudson/tasks/ArtifactArchiver.java +++ b/core/src/main/java/hudson/tasks/ArtifactArchiver.java @@ -27,21 +27,17 @@ import hudson.FilePath; import hudson.Launcher; import hudson.Util; import hudson.Extension; -import hudson.maven.AbstractMavenProject; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.BuildListener; import hudson.model.Result; import hudson.model.Hudson; -import hudson.util.FormFieldValidator; import hudson.util.FormValidation; import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.AncestorInPath; import org.kohsuke.stapler.QueryParameter; -import javax.servlet.ServletException; import java.io.File; import java.io.IOException; @@ -182,9 +178,7 @@ public class ArtifactArchiver extends Recorder { } public boolean isApplicable(Class jobType) { - // for Maven, this happens automatically. - // TODO: we should still consider enabling this for additional controls? - return !AbstractMavenProject.class.isAssignableFrom(jobType); + return true; } } } diff --git a/core/src/main/java/hudson/tasks/BuildWrappers.java b/core/src/main/java/hudson/tasks/BuildWrappers.java index cfb405df88..6455525afc 100644 --- a/core/src/main/java/hudson/tasks/BuildWrappers.java +++ b/core/src/main/java/hudson/tasks/BuildWrappers.java @@ -29,7 +29,6 @@ import hudson.model.Hudson; import hudson.model.AbstractProject.AbstractProjectDescriptor; import hudson.Extension; import hudson.util.DescriptorList; -import hudson.maven.MavenReporter; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java index 70d3f9243e..8203807eac 100644 --- a/core/src/main/java/hudson/tasks/Fingerprinter.java +++ b/core/src/main/java/hudson/tasks/Fingerprinter.java @@ -23,12 +23,11 @@ */ package hudson.tasks; +import hudson.Extension; import hudson.FilePath; import hudson.FilePath.FileCallable; import hudson.Launcher; import hudson.Util; -import hudson.Extension; -import hudson.maven.AbstractMavenProject; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.Action; @@ -40,17 +39,14 @@ import hudson.model.FingerprintMap; import hudson.model.Hudson; import hudson.model.Result; import hudson.remoting.VirtualChannel; -import hudson.util.FormFieldValidator; -import hudson.util.IOException2; import hudson.util.FormValidation; +import hudson.util.IOException2; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.types.FileSet; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.AncestorInPath; import org.kohsuke.stapler.QueryParameter; +import org.kohsuke.stapler.StaplerRequest; -import javax.servlet.ServletException; import java.io.File; import java.io.IOException; import java.io.Serializable; @@ -222,8 +218,7 @@ public class Fingerprinter extends Recorder implements Serializable { } public boolean isApplicable(Class jobType) { - // for Maven, fingerprinting kicks in automatically. - return !AbstractMavenProject.class.isAssignableFrom(jobType); + return true; } } diff --git a/core/src/main/java/hudson/tasks/JavadocArchiver.java b/core/src/main/java/hudson/tasks/JavadocArchiver.java index 0737327a0c..cc4a326d12 100644 --- a/core/src/main/java/hudson/tasks/JavadocArchiver.java +++ b/core/src/main/java/hudson/tasks/JavadocArchiver.java @@ -27,7 +27,6 @@ import hudson.FilePath; import hudson.Launcher; import hudson.Util; import hudson.Extension; -import hudson.maven.AbstractMavenProject; import hudson.model.*; import hudson.util.FormValidation; @@ -208,8 +207,7 @@ public class JavadocArchiver extends Recorder { } public boolean isApplicable(Class jobType) { - // for Maven, javadoc archiving kicks in automatically - return !AbstractMavenProject.class.isAssignableFrom(jobType); + return true; } } } diff --git a/core/src/main/java/hudson/tasks/Mailer.java b/core/src/main/java/hudson/tasks/Mailer.java index b1eaac65e9..edbdc1555f 100644 --- a/core/src/main/java/hudson/tasks/Mailer.java +++ b/core/src/main/java/hudson/tasks/Mailer.java @@ -26,7 +26,6 @@ package hudson.tasks; import hudson.Launcher; import hudson.Functions; import hudson.Extension; -import hudson.maven.AbstractMavenProject; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.BuildListener; @@ -403,8 +402,7 @@ public class Mailer extends Notifier { } public boolean isApplicable(Class jobType) { - // for historical reasons, Maven uses MavenMailer - return !AbstractMavenProject.class.isAssignableFrom(jobType); + return true; } } diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java index 0c3d82eb07..51b4bee630 100644 --- a/core/src/main/java/hudson/tasks/Maven.java +++ b/core/src/main/java/hudson/tasks/Maven.java @@ -31,9 +31,6 @@ import hudson.Util; import hudson.CopyOnWrite; import hudson.Launcher.LocalLauncher; import hudson.FilePath.FileCallable; -import hudson.maven.MavenEmbedder; -import hudson.maven.MavenUtil; -import hudson.maven.RedeployPublisher; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.BuildListener; @@ -53,7 +50,6 @@ import hudson.util.StreamTaskListener; import hudson.util.VariableResolver; import hudson.util.FormValidation; import net.sf.json.JSONObject; -import org.apache.maven.embedder.MavenEmbedderException; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.QueryParameter; @@ -407,11 +403,6 @@ public class Maven extends Builder { } } - public MavenEmbedder createEmbedder(BuildListener listener, String profiles, Properties systemProperties) - throws MavenEmbedderException, IOException { - return MavenUtil.createEmbedder(listener,getHomeDir(),profiles,systemProperties); - } - private static final long serialVersionUID = 1L; public MavenInstallation forEnvironment(EnvVars environment) { @@ -447,7 +438,7 @@ public class Maven extends Builder { * that has "contextual" {@link MavenInstallation} associated with it. * *

- * Code like {@link RedeployPublisher} uses this interface in an attempt + * Code like RedeployPublisher uses this interface in an attempt * to use the consistent Maven installation attached to the project. * * @since 1.235 diff --git a/core/src/main/java/hudson/tasks/Publisher.java b/core/src/main/java/hudson/tasks/Publisher.java index ab65e8aa7a..569855192b 100644 --- a/core/src/main/java/hudson/tasks/Publisher.java +++ b/core/src/main/java/hudson/tasks/Publisher.java @@ -25,7 +25,7 @@ package hudson.tasks; import hudson.DescriptorExtensionList; import hudson.Extension; -import hudson.maven.MavenReporter; +import hudson.Launcher; import hudson.model.Action; import hudson.model.Build; import hudson.model.BuildListener; @@ -33,6 +33,7 @@ import hudson.model.Describable; import hudson.model.Project; import hudson.model.Descriptor; import hudson.model.Hudson; +import hudson.model.AbstractBuild; import java.util.List; import java.util.ArrayList; @@ -51,7 +52,7 @@ import java.util.Comparator; * project type, not just the freestyle project type (in particular, * the native maven2 job type.) This is convenient default for * {@link Publisher}s in particular initially, but we encourage advanced - * plugins to consider writing {@link MavenReporter}, as it offers the + * plugins to consider writing MavenReporter, as it offers the * potential of reducing the amount of configuration needed to run the plugin. * * For those plugins that don't want {@link Publisher} to show up in @@ -104,7 +105,7 @@ public abstract class Publisher extends BuildStepCompatibilityLayer implements B * this is problematic. One of such cases is when a publisher needs to * trigger other builds, whcih in turn need to see this build as a * completed build. Those plugins that need to do this can return true - * from this method, so that the {@link #perform(AbstractBuild, Launcher, BuildListener)} + * from this method, so that the {@link #perform(AbstractBuild, Launcher, BuildListener)} * method is called after the build is marked as completed. * *

diff --git a/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java b/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java index cfebbe5cf6..355f52e817 100644 --- a/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java +++ b/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java @@ -31,7 +31,6 @@ import hudson.Util; import hudson.matrix.MatrixAggregatable; import hudson.matrix.MatrixAggregator; import hudson.matrix.MatrixBuild; -import hudson.maven.AbstractMavenProject; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.Action; @@ -127,7 +126,8 @@ public class JUnitResultArchiver extends Recorder implements Serializable, Matri return testResults; } - public Action getProjectAction(hudson.model.Project project) { + @Override + public Action getProjectAction(AbstractProject project) { return new TestResultProjectAction(project); } @@ -156,8 +156,7 @@ public class JUnitResultArchiver extends Recorder implements Serializable, Matri } public boolean isApplicable(Class jobType) { - // for Maven we have SurefireArchiver that automatically kicks in. - return !AbstractMavenProject.class.isAssignableFrom(jobType); + return true; } } } diff --git a/core/src/main/java/hudson/tasks/test/AggregatedTestResultAction.java b/core/src/main/java/hudson/tasks/test/AggregatedTestResultAction.java index 3f82932970..97113bb6ea 100644 --- a/core/src/main/java/hudson/tasks/test/AggregatedTestResultAction.java +++ b/core/src/main/java/hudson/tasks/test/AggregatedTestResultAction.java @@ -23,7 +23,6 @@ */ package hudson.tasks.test; -import hudson.maven.MavenBuild; import hudson.model.AbstractBuild; import hudson.tasks.junit.CaseResult; import hudson.tasks.junit.TestResult; @@ -64,7 +63,7 @@ public abstract class AggregatedTestResultAction extends AbstractTestResultActio } /** - * {@link MavenBuild}s whose test results are used for aggregation. + * child builds whose test results are used for aggregation. */ public final List children = new ArrayList(); diff --git a/core/src/main/resources/hudson/matrix/Messages.properties b/core/src/main/resources/hudson/matrix/Messages.properties index e525844ef3..88a5285b44 100644 --- a/core/src/main/resources/hudson/matrix/Messages.properties +++ b/core/src/main/resources/hudson/matrix/Messages.properties @@ -27,4 +27,6 @@ MatrixBuild.AppearsCancelled={0} appears to be cancelled MatrixBuild.Cancelled=Cancelled {0} MatrixBuild.Interrupting=Interrupting {0} -MatrixConfiguration.Pronoun=Configuration \ No newline at end of file +MatrixConfiguration.Pronoun=Configuration + +MatrixRun.KeptBecauseOfParent=Kept because {0} is kept diff --git a/core/src/main/resources/hudson/matrix/Messages_de.properties b/core/src/main/resources/hudson/matrix/Messages_de.properties index 4dab029b64..d323f6b346 100644 --- a/core/src/main/resources/hudson/matrix/Messages_de.properties +++ b/core/src/main/resources/hudson/matrix/Messages_de.properties @@ -27,4 +27,6 @@ MatrixBuild.AppearsCancelled={0} scheint abgebrochen worden zu sein MatrixBuild.Cancelled={0} abgebrochen MatrixBuild.Interrupting=Unterbreche {0} -MatrixConfiguration.Pronoun=Einstellungen \ No newline at end of file +MatrixConfiguration.Pronoun=Einstellungen + +MatrixRun.KeptBecauseOfParent=Zurückbehalten, weil {0} zurückbehalten wurde. diff --git a/core/src/main/resources/hudson/matrix/Messages_ja.properties b/core/src/main/resources/hudson/matrix/Messages_ja.properties index 3acf321f46..1863342d8e 100644 --- a/core/src/main/resources/hudson/matrix/Messages_ja.properties +++ b/core/src/main/resources/hudson/matrix/Messages_ja.properties @@ -27,4 +27,5 @@ MatrixBuild.AppearsCancelled={0}\u306F\u4E2D\u6B62\u3055\u308C\u305F\u3088\u3046 MatrixBuild.Cancelled={0}\u306E\u4E2D\u6B62 MatrixBuild.Interrupting={0}\u3078\u306E\u5272\u308A\u8FBC\u307F -MatrixConfiguration.Pronoun=\u8A2D\u5B9A \ No newline at end of file +MatrixConfiguration.Pronoun=\u8A2D\u5B9A +MatrixRun.KeptBecauseOfParent={0}\u304C\u4FDD\u7559\u4E2D\u306E\u305F\u3081\u4FDD\u7559\u3057\u307E\u3059 diff --git a/core/src/main/resources/hudson/matrix/Messages_nl.properties b/core/src/main/resources/hudson/matrix/Messages_nl.properties index 376c2701d8..4f91ee2e7f 100644 --- a/core/src/main/resources/hudson/matrix/Messages_nl.properties +++ b/core/src/main/resources/hudson/matrix/Messages_nl.properties @@ -28,3 +28,4 @@ MatrixBuild.Cancelled= {0} werd geannuleerd MatrixBuild.Interrupting= {0} wordt onderbroken MatrixConfiguration.Pronoun=Configuratie +MatrixRun.KeptBecauseOfParent=Bijgehouden omdat {0} werd bijgehouden diff --git a/core/src/main/resources/hudson/matrix/Messages_tr.properties b/core/src/main/resources/hudson/matrix/Messages_tr.properties index c0c4ceb7a8..a6c368bc62 100644 --- a/core/src/main/resources/hudson/matrix/Messages_tr.properties +++ b/core/src/main/resources/hudson/matrix/Messages_tr.properties @@ -27,4 +27,5 @@ MatrixBuild.AppearsCancelled={0} iptal edilmi\u015f g MatrixBuild.Cancelled={0} iptal edildi MatrixBuild.Interrupting={0} i\u015flemi kesiliyor -MatrixConfiguration.Pronoun=Konfig\u00fcrasyon \ No newline at end of file +MatrixConfiguration.Pronoun=Konfig\u00fcrasyon +MatrixRun.KeptBecauseOfParent={0} tutuldu\u011fu i\u00e7in tutulmu\u015ftur diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml new file mode 100644 index 0000000000..fe4b0526ce --- /dev/null +++ b/maven-plugin/pom.xml @@ -0,0 +1,161 @@ + + + + 4.0.0 + + org.jvnet.hudson.main + pom + 1.294-SNAPSHOT + + + maven-plugin + hpi + Maven Integration plugin + This plug-in provides deep integration of Hudson and Maven. This functionality used to be part of the Hudson core. + Now it is a plug-in that is installed by default, but can be disabled. + + + + org.jvnet.hudson.main + hudson-core + ${project.version} + provided + + + javax.servlet + servlet-api + 2.4 + provided + + + + ${groupId} + maven-agent + ${project.version} + + + org.apache.maven + maven-embedder + ${maven.version} + + + + org.apache.maven + maven-core + 2.0.9 + + + jtidy + jtidy + + + commons-cli + commons-cli + + + xml-apis + xml-apis + + + + + + + org.jvnet.hudson + wagon-webdav + 1.0-beta-2-hudson-1 + + + jdom + jdom + + + + + + + + ${project.artifactId} + package + + + org.jvnet.hudson.tools + maven-hpi-plugin + 1.31 + true + + + org.kohsuke.stapler + maven-stapler-plugin + 1.11 + true + + + org.jvnet.localizer + maven-localizer-plugin + 1.8 + + + + generate + + + Messages.properties + target/generated-sources/localizer + + + + + + + maven-javadoc-plugin + 2.2 + + + + diff --git a/core/src/main/java/hudson/maven/AbstractMavenProject.java b/maven-plugin/src/main/java/hudson/maven/AbstractMavenProject.java similarity index 100% rename from core/src/main/java/hudson/maven/AbstractMavenProject.java rename to maven-plugin/src/main/java/hudson/maven/AbstractMavenProject.java diff --git a/core/src/main/java/hudson/maven/AggregatableAction.java b/maven-plugin/src/main/java/hudson/maven/AggregatableAction.java similarity index 100% rename from core/src/main/java/hudson/maven/AggregatableAction.java rename to maven-plugin/src/main/java/hudson/maven/AggregatableAction.java diff --git a/core/src/main/java/hudson/maven/EmbedderLoggerImpl.java b/maven-plugin/src/main/java/hudson/maven/EmbedderLoggerImpl.java similarity index 100% rename from core/src/main/java/hudson/maven/EmbedderLoggerImpl.java rename to maven-plugin/src/main/java/hudson/maven/EmbedderLoggerImpl.java diff --git a/core/src/main/java/hudson/maven/ExecutedMojo.java b/maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java similarity index 100% rename from core/src/main/java/hudson/maven/ExecutedMojo.java rename to maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java diff --git a/core/src/main/java/hudson/maven/FilteredChangeLogSet.java b/maven-plugin/src/main/java/hudson/maven/FilteredChangeLogSet.java similarity index 100% rename from core/src/main/java/hudson/maven/FilteredChangeLogSet.java rename to maven-plugin/src/main/java/hudson/maven/FilteredChangeLogSet.java diff --git a/core/src/main/java/hudson/maven/MavenAggregatedReport.java b/maven-plugin/src/main/java/hudson/maven/MavenAggregatedReport.java similarity index 100% rename from core/src/main/java/hudson/maven/MavenAggregatedReport.java rename to maven-plugin/src/main/java/hudson/maven/MavenAggregatedReport.java diff --git a/core/src/main/java/hudson/maven/MavenBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java similarity index 99% rename from core/src/main/java/hudson/maven/MavenBuild.java rename to maven-plugin/src/main/java/hudson/maven/MavenBuild.java index e498ce4bfe..f7915c4211 100644 --- a/core/src/main/java/hudson/maven/MavenBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java @@ -203,6 +203,12 @@ public class MavenBuild extends AbstractBuild { return super.getWhyKeepLog(); } + + // used by executedMojos.jelly + public static ExecutedMojo.Cache createExecutedMojoCache() { + return new ExecutedMojo.Cache(); + } + /** * Runs Maven and builds the project. */ diff --git a/core/src/main/java/hudson/maven/MavenBuildProxy.java b/maven-plugin/src/main/java/hudson/maven/MavenBuildProxy.java similarity index 100% rename from core/src/main/java/hudson/maven/MavenBuildProxy.java rename to maven-plugin/src/main/java/hudson/maven/MavenBuildProxy.java diff --git a/core/src/main/java/hudson/maven/MavenBuildProxy2.java b/maven-plugin/src/main/java/hudson/maven/MavenBuildProxy2.java similarity index 100% rename from core/src/main/java/hudson/maven/MavenBuildProxy2.java rename to maven-plugin/src/main/java/hudson/maven/MavenBuildProxy2.java diff --git a/core/src/main/java/hudson/maven/MavenBuilder.java b/maven-plugin/src/main/java/hudson/maven/MavenBuilder.java similarity index 100% rename from core/src/main/java/hudson/maven/MavenBuilder.java rename to maven-plugin/src/main/java/hudson/maven/MavenBuilder.java diff --git a/maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java b/maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java new file mode 100644 index 0000000000..8dd34df4f1 --- /dev/null +++ b/maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java @@ -0,0 +1,74 @@ +/* + * The MIT License + * + * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Stephen Connolly + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package hudson.maven; + +import hudson.Extension; +import hudson.FilePath; +import hudson.maven.agent.Main; +import hudson.maven.agent.PluginManagerInterceptor; +import hudson.model.Computer; +import hudson.model.Hudson; +import hudson.model.TaskListener; +import hudson.remoting.Channel; +import hudson.remoting.Which; +import hudson.slaves.ComputerListener; + +import java.io.File; +import java.io.IOException; +import java.io.PrintStream; + +/** + * When a slave is connected, copy maven-agent.jar and maven-intercepter.jar + * + * @author Kohsuke Kawaguchi + */ +@Extension +public class MavenComputerListener extends ComputerListener { + @Override + public void preOnline(Computer c, Channel channel,FilePath root, TaskListener listener) throws IOException, InterruptedException { + PrintStream logger = listener.getLogger(); + copyJar(logger, root, Main.class, "maven-agent"); + copyJar(logger, root, PluginManagerInterceptor.class, "maven-interceptor"); + } + + /** + * Copies a jar file from the master to slave. + */ + private void copyJar(PrintStream log, FilePath dst, Class representative, String seedName) throws IOException, InterruptedException { + // in normal execution environment, the master should be loading 'representative' from this jar, so + // in that way we can find it. + File jar = Which.jarFile(representative); + + if(jar.isDirectory()) { + // but during the development and unit test environment, we may be picking the class up from the classes dir, + // in which case we need to find this in a tricker way. + String dir = Hudson.getInstance().servletContext.getRealPath("/WEB-INF/lib"); + FilePath[] paths = new FilePath(new File(dir)).list(seedName + "-*.jar"); + jar = new File(paths[0].getRemote()); + } + + new FilePath(jar).copyTo(dst.child(seedName +".jar")); + log.println("Copied "+seedName+".jar"); + } +} diff --git a/core/src/main/java/hudson/maven/MavenEmbedder.java b/maven-plugin/src/main/java/hudson/maven/MavenEmbedder.java similarity index 100% rename from core/src/main/java/hudson/maven/MavenEmbedder.java rename to maven-plugin/src/main/java/hudson/maven/MavenEmbedder.java diff --git a/core/src/main/java/hudson/maven/MavenModule.java b/maven-plugin/src/main/java/hudson/maven/MavenModule.java similarity index 100% rename from core/src/main/java/hudson/maven/MavenModule.java rename to maven-plugin/src/main/java/hudson/maven/MavenModule.java diff --git a/core/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java similarity index 97% rename from core/src/main/java/hudson/maven/MavenModuleSet.java rename to maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index 995dd86e32..c0e3e58968 100644 --- a/core/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -33,6 +33,7 @@ import hudson.search.CollectionSearchIndex; import hudson.search.SearchIndexBuilder; import hudson.tasks.Maven.MavenInstallation; import hudson.tasks.*; +import hudson.tasks.junit.JUnitResultArchiver; import hudson.util.CopyOnWriteMap; import hudson.util.DescribableList; import hudson.util.Function1; @@ -663,5 +664,18 @@ public final class MavenModuleSet extends AbstractMavenProject NOT_APPLICABLE_TYPES = new HashSet(Arrays.asList( + ArtifactArchiver.class, // this happens automatically + Fingerprinter.class, // this kicks in automatically + JavadocArchiver.class, // this kicks in automatically + Mailer.class, // for historical reasons, Maven uses MavenMailer + JUnitResultArchiver.class // done by SurefireArchiver + )); } } diff --git a/core/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java similarity index 99% rename from core/src/main/java/hudson/maven/MavenModuleSetBuild.java rename to maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index 81e9b3dd19..ad4a9dc3ba 100644 --- a/core/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -726,7 +726,8 @@ public final class MavenModuleSetBuild extends AbstractBuild relPath = new HashMap(); MavenUtil.resolveModules(embedder,mp,getRootPath(),relPath,listener); diff --git a/core/src/main/java/hudson/maven/MavenProbeAction.java b/maven-plugin/src/main/java/hudson/maven/MavenProbeAction.java similarity index 100% rename from core/src/main/java/hudson/maven/MavenProbeAction.java rename to maven-plugin/src/main/java/hudson/maven/MavenProbeAction.java diff --git a/core/src/main/java/hudson/maven/MavenProcessFactory.java b/maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java similarity index 100% rename from core/src/main/java/hudson/maven/MavenProcessFactory.java rename to maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java diff --git a/core/src/main/java/hudson/maven/MavenRedeployer.java b/maven-plugin/src/main/java/hudson/maven/MavenRedeployer.java similarity index 100% rename from core/src/main/java/hudson/maven/MavenRedeployer.java rename to maven-plugin/src/main/java/hudson/maven/MavenRedeployer.java diff --git a/core/src/main/java/hudson/maven/MavenReportInfo.java b/maven-plugin/src/main/java/hudson/maven/MavenReportInfo.java similarity index 100% rename from core/src/main/java/hudson/maven/MavenReportInfo.java rename to maven-plugin/src/main/java/hudson/maven/MavenReportInfo.java diff --git a/core/src/main/java/hudson/maven/MavenReporter.java b/maven-plugin/src/main/java/hudson/maven/MavenReporter.java similarity index 100% rename from core/src/main/java/hudson/maven/MavenReporter.java rename to maven-plugin/src/main/java/hudson/maven/MavenReporter.java diff --git a/core/src/main/java/hudson/maven/MavenReporterDescriptor.java b/maven-plugin/src/main/java/hudson/maven/MavenReporterDescriptor.java similarity index 100% rename from core/src/main/java/hudson/maven/MavenReporterDescriptor.java rename to maven-plugin/src/main/java/hudson/maven/MavenReporterDescriptor.java diff --git a/core/src/main/java/hudson/maven/MavenReporters.java b/maven-plugin/src/main/java/hudson/maven/MavenReporters.java similarity index 100% rename from core/src/main/java/hudson/maven/MavenReporters.java rename to maven-plugin/src/main/java/hudson/maven/MavenReporters.java diff --git a/core/src/main/java/hudson/maven/MavenUtil.java b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java similarity index 100% rename from core/src/main/java/hudson/maven/MavenUtil.java rename to maven-plugin/src/main/java/hudson/maven/MavenUtil.java diff --git a/core/src/main/java/hudson/maven/ModuleDependency.java b/maven-plugin/src/main/java/hudson/maven/ModuleDependency.java similarity index 100% rename from core/src/main/java/hudson/maven/ModuleDependency.java rename to maven-plugin/src/main/java/hudson/maven/ModuleDependency.java diff --git a/core/src/main/java/hudson/maven/ModuleName.java b/maven-plugin/src/main/java/hudson/maven/ModuleName.java similarity index 100% rename from core/src/main/java/hudson/maven/ModuleName.java rename to maven-plugin/src/main/java/hudson/maven/ModuleName.java diff --git a/core/src/main/java/hudson/maven/MojoInfo.java b/maven-plugin/src/main/java/hudson/maven/MojoInfo.java similarity index 100% rename from core/src/main/java/hudson/maven/MojoInfo.java rename to maven-plugin/src/main/java/hudson/maven/MojoInfo.java diff --git a/maven-plugin/src/main/java/hudson/maven/PluginImpl.java b/maven-plugin/src/main/java/hudson/maven/PluginImpl.java new file mode 100644 index 0000000000..d08b8c1697 --- /dev/null +++ b/maven-plugin/src/main/java/hudson/maven/PluginImpl.java @@ -0,0 +1,43 @@ +/* + * The MIT License + * + * Copyright (c) 2004-2009, Sun Microsystems, Inc., Tom Huybrechts + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package hudson.maven; + +import hudson.Plugin; +import hudson.model.Items; + +/** + * @author huybrechts + */ +public class PluginImpl extends Plugin { + @Override + public void start() throws Exception { + super.start(); + + Items.XSTREAM.alias("maven2", MavenModule.class); + Items.XSTREAM.alias("dependency", ModuleDependency.class); + Items.XSTREAM.alias("maven2-module-set", MavenModule.class); // this was a bug, but now we need to keep it for compatibility + Items.XSTREAM.alias("maven2-moduleset", MavenModuleSet.class); + } + +} diff --git a/core/src/main/java/hudson/maven/PluginName.java b/maven-plugin/src/main/java/hudson/maven/PluginName.java similarity index 100% rename from core/src/main/java/hudson/maven/PluginName.java rename to maven-plugin/src/main/java/hudson/maven/PluginName.java diff --git a/core/src/main/java/hudson/maven/PomInfo.java b/maven-plugin/src/main/java/hudson/maven/PomInfo.java similarity index 100% rename from core/src/main/java/hudson/maven/PomInfo.java rename to maven-plugin/src/main/java/hudson/maven/PomInfo.java diff --git a/core/src/main/java/hudson/maven/ProcessCache.java b/maven-plugin/src/main/java/hudson/maven/ProcessCache.java similarity index 100% rename from core/src/main/java/hudson/maven/ProcessCache.java rename to maven-plugin/src/main/java/hudson/maven/ProcessCache.java diff --git a/core/src/main/java/hudson/maven/RedeployPublisher.java b/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java similarity index 100% rename from core/src/main/java/hudson/maven/RedeployPublisher.java rename to maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java diff --git a/core/src/main/java/hudson/maven/SplittableBuildListener.java b/maven-plugin/src/main/java/hudson/maven/SplittableBuildListener.java similarity index 100% rename from core/src/main/java/hudson/maven/SplittableBuildListener.java rename to maven-plugin/src/main/java/hudson/maven/SplittableBuildListener.java diff --git a/core/src/main/java/hudson/maven/TransferListenerImpl.java b/maven-plugin/src/main/java/hudson/maven/TransferListenerImpl.java similarity index 100% rename from core/src/main/java/hudson/maven/TransferListenerImpl.java rename to maven-plugin/src/main/java/hudson/maven/TransferListenerImpl.java diff --git a/core/src/main/java/hudson/maven/package.html b/maven-plugin/src/main/java/hudson/maven/package.html similarity index 100% rename from core/src/main/java/hudson/maven/package.html rename to maven-plugin/src/main/java/hudson/maven/package.html diff --git a/core/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java b/maven-plugin/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java similarity index 100% rename from core/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java rename to maven-plugin/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java diff --git a/core/src/main/java/hudson/maven/reporters/MavenAbstractArtifactRecord.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenAbstractArtifactRecord.java similarity index 100% rename from core/src/main/java/hudson/maven/reporters/MavenAbstractArtifactRecord.java rename to maven-plugin/src/main/java/hudson/maven/reporters/MavenAbstractArtifactRecord.java diff --git a/core/src/main/java/hudson/maven/reporters/MavenAggregatedArtifactRecord.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenAggregatedArtifactRecord.java similarity index 100% rename from core/src/main/java/hudson/maven/reporters/MavenAggregatedArtifactRecord.java rename to maven-plugin/src/main/java/hudson/maven/reporters/MavenAggregatedArtifactRecord.java diff --git a/core/src/main/java/hudson/maven/reporters/MavenArtifact.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java similarity index 100% rename from core/src/main/java/hudson/maven/reporters/MavenArtifact.java rename to maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java diff --git a/core/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java similarity index 100% rename from core/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java rename to maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java diff --git a/core/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java similarity index 100% rename from core/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java rename to maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java diff --git a/core/src/main/java/hudson/maven/reporters/MavenFingerprinter.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenFingerprinter.java similarity index 100% rename from core/src/main/java/hudson/maven/reporters/MavenFingerprinter.java rename to maven-plugin/src/main/java/hudson/maven/reporters/MavenFingerprinter.java diff --git a/core/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java similarity index 100% rename from core/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java rename to maven-plugin/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java diff --git a/core/src/main/java/hudson/maven/reporters/MavenMailer.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenMailer.java similarity index 100% rename from core/src/main/java/hudson/maven/reporters/MavenMailer.java rename to maven-plugin/src/main/java/hudson/maven/reporters/MavenMailer.java diff --git a/core/src/main/java/hudson/maven/reporters/MavenSiteArchiver.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenSiteArchiver.java similarity index 100% rename from core/src/main/java/hudson/maven/reporters/MavenSiteArchiver.java rename to maven-plugin/src/main/java/hudson/maven/reporters/MavenSiteArchiver.java diff --git a/core/src/main/java/hudson/maven/reporters/ReportAction.java b/maven-plugin/src/main/java/hudson/maven/reporters/ReportAction.java similarity index 100% rename from core/src/main/java/hudson/maven/reporters/ReportAction.java rename to maven-plugin/src/main/java/hudson/maven/reporters/ReportAction.java diff --git a/core/src/main/java/hudson/maven/reporters/ReportCollector.java b/maven-plugin/src/main/java/hudson/maven/reporters/ReportCollector.java similarity index 100% rename from core/src/main/java/hudson/maven/reporters/ReportCollector.java rename to maven-plugin/src/main/java/hudson/maven/reporters/ReportCollector.java diff --git a/core/src/main/java/hudson/maven/reporters/SurefireAggregatedReport.java b/maven-plugin/src/main/java/hudson/maven/reporters/SurefireAggregatedReport.java similarity index 100% rename from core/src/main/java/hudson/maven/reporters/SurefireAggregatedReport.java rename to maven-plugin/src/main/java/hudson/maven/reporters/SurefireAggregatedReport.java diff --git a/core/src/main/java/hudson/maven/reporters/SurefireArchiver.java b/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java similarity index 100% rename from core/src/main/java/hudson/maven/reporters/SurefireArchiver.java rename to maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java diff --git a/core/src/main/java/hudson/maven/reporters/SurefireReport.java b/maven-plugin/src/main/java/hudson/maven/reporters/SurefireReport.java similarity index 100% rename from core/src/main/java/hudson/maven/reporters/SurefireReport.java rename to maven-plugin/src/main/java/hudson/maven/reporters/SurefireReport.java diff --git a/core/src/main/resources/hudson/maven/FilteredChangeLogSet/digest.jelly b/maven-plugin/src/main/resources/hudson/maven/FilteredChangeLogSet/digest.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/FilteredChangeLogSet/digest.jelly rename to maven-plugin/src/main/resources/hudson/maven/FilteredChangeLogSet/digest.jelly diff --git a/core/src/main/resources/hudson/maven/FilteredChangeLogSet/index.jelly b/maven-plugin/src/main/resources/hudson/maven/FilteredChangeLogSet/index.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/FilteredChangeLogSet/index.jelly rename to maven-plugin/src/main/resources/hudson/maven/FilteredChangeLogSet/index.jelly diff --git a/core/src/main/resources/hudson/maven/MavenBuild/actions.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenBuild/actions.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions.jelly diff --git a/core/src/main/resources/hudson/maven/MavenBuild/actions_de.properties b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenBuild/actions_de.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions_de.properties diff --git a/core/src/main/resources/hudson/maven/MavenBuild/actions_fr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenBuild/actions_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions_fr.properties diff --git a/core/src/main/resources/hudson/maven/MavenBuild/actions_ja.properties b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenBuild/actions_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions_ja.properties diff --git a/core/src/main/resources/hudson/maven/MavenBuild/actions_nl.properties b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenBuild/actions_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions_nl.properties diff --git a/core/src/main/resources/hudson/maven/MavenBuild/actions_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenBuild/actions_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/MavenBuild/actions_ru.properties b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions_ru.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenBuild/actions_ru.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions_ru.properties diff --git a/core/src/main/resources/hudson/maven/MavenBuild/actions_tr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenBuild/actions_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions_tr.properties diff --git a/core/src/main/resources/hudson/maven/MavenBuild/executedMojos.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos.jelly similarity index 97% rename from core/src/main/resources/hudson/maven/MavenBuild/executedMojos.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos.jelly index 70ee80eb93..77399f9e10 100644 --- a/core/src/main/resources/hudson/maven/MavenBuild/executedMojos.jelly +++ b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos.jelly @@ -40,7 +40,7 @@ THE SOFTWARE. - + diff --git a/core/src/main/resources/hudson/maven/MavenBuild/executedMojos_de.properties b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenBuild/executedMojos_de.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos_de.properties diff --git a/core/src/main/resources/hudson/maven/MavenBuild/executedMojos_fr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenBuild/executedMojos_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos_fr.properties diff --git a/core/src/main/resources/hudson/maven/MavenBuild/executedMojos_ja.properties b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenBuild/executedMojos_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos_ja.properties diff --git a/core/src/main/resources/hudson/maven/MavenBuild/executedMojos_nl.properties b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenBuild/executedMojos_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos_nl.properties diff --git a/core/src/main/resources/hudson/maven/MavenBuild/executedMojos_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenBuild/executedMojos_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/MavenBuild/executedMojos_ru.properties b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos_ru.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenBuild/executedMojos_ru.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos_ru.properties diff --git a/core/src/main/resources/hudson/maven/MavenBuild/executedMojos_tr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenBuild/executedMojos_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos_tr.properties diff --git a/core/src/main/resources/hudson/maven/MavenModule/configure-entries.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModule/configure-entries.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries.jelly diff --git a/core/src/main/resources/hudson/maven/MavenModule/configure-entries_de.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModule/configure-entries_de.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries_de.properties diff --git a/core/src/main/resources/hudson/maven/MavenModule/configure-entries_fr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModule/configure-entries_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries_fr.properties diff --git a/core/src/main/resources/hudson/maven/MavenModule/configure-entries_ja.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModule/configure-entries_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries_ja.properties diff --git a/core/src/main/resources/hudson/maven/MavenModule/configure-entries_nl.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModule/configure-entries_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries_nl.properties diff --git a/core/src/main/resources/hudson/maven/MavenModule/configure-entries_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModule/configure-entries_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/MavenModule/configure-entries_ru.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries_ru.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModule/configure-entries_ru.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries_ru.properties diff --git a/core/src/main/resources/hudson/maven/MavenModule/configure-entries_tr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModule/configure-entries_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries_tr.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/actions.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/actions.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions.jelly diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/actions_de.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/actions_de.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions_de.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/actions_fr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/actions_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions_fr.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/actions_ja.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/actions_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions_ja.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/actions_nl.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/actions_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions_nl.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/actions_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/actions_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/actions_ru.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions_ru.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/actions_ru.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions_ru.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/actions_tr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/actions_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions_tr.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/ajaxBuildQueue.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/ajaxBuildQueue.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/ajaxBuildQueue.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/ajaxBuildQueue.jelly diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_de.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_de.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_de.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_fr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_fr.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_ja.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_ja.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_nl.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_nl.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_ru.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_ru.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_ru.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_ru.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_tr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_tr.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules.jelly diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_de.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_de.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_de.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_fr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_fr.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_ja.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_ja.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_nl.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_nl.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_ru.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_ru.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_ru.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_ru.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_tr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules_tr.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/disabled.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/disabled.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled.jelly diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/disabled.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/disabled.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/disabled_de.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/disabled_de.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled_de.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/disabled_fr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/disabled_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled_fr.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/disabled_ja.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/disabled_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled_ja.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/disabled_nl.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/disabled_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled_nl.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/disabled_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/disabled_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/disabled_ru.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled_ru.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/disabled_ru.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled_ru.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/disabled_tr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/disabled_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/disabled_tr.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/help-goals.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/help-goals.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/help-goals.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/help-goals.jelly diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/index.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/index.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index.jelly diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/index.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/index.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/index_de.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/index_de.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_de.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/index_fr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/index_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_fr.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/index_ja.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/index_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_ja.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/index_nl.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/index_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_nl.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/index_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/index_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/index_ru.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_ru.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/index_ru.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_ru.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/index_tr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/index_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_tr.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/modules.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/modules.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/modules.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/modules.jelly diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/modules.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/modules.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/modules.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/modules.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/modules_de.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/modules_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/modules_de.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/modules_de.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/modules_fr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/modules_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/modules_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/modules_fr.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/modules_ja.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/modules_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/modules_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/modules_ja.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/modules_nl.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/modules_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/modules_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/modules_nl.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/modules_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/modules_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/modules_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/modules_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/modules_ru.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/modules_ru.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/modules_ru.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/modules_ru.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/modules_tr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/modules_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/modules_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/modules_tr.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail.jelly diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_de.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_de.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_de.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_fr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_fr.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_ja.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_ja.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_nl.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_nl.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_ru.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_ru.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_ru.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_ru.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_tr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_tr.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSet/sidepanel2.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/sidepanel2.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSet/sidepanel2.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/sidepanel2.jelly diff --git a/core/src/main/resources/hudson/maven/MavenModuleSetBuild/main.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSetBuild/main.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSetBuild/main.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSetBuild/main.jelly diff --git a/core/src/main/resources/hudson/maven/MavenModuleSetBuild/main_fr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSetBuild/main_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSetBuild/main_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSetBuild/main_fr.properties diff --git a/core/src/main/resources/hudson/maven/MavenModuleSetBuild/main_ja.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSetBuild/main_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenModuleSetBuild/main_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenModuleSetBuild/main_ja.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/_script.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/_script.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/_script.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/_script.jelly diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/envVars.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/envVars.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars.jelly diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/envVars_de.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/envVars_de.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars_de.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/envVars_fr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/envVars_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars_fr.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/envVars_ja.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/envVars_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars_ja.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/envVars_nl.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/envVars_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars_nl.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/envVars_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/envVars_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/envVars_ru.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars_ru.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/envVars_ru.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars_ru.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/envVars_tr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/envVars_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars_tr.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/index.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/index.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index.jelly diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/index.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/index.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/index_de.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/index_de.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index_de.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/index_fr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/index_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index_fr.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/index_ja.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/index_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index_ja.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/index_nl.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/index_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index_nl.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/index_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/index_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/index_ru.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index_ru.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/index_ru.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index_ru.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/index_tr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/index_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index_tr.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/sidepanel.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/sidepanel.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel.jelly diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_de.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_de.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_de.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_fr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_fr.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_ja.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_ja.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_nl.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_nl.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_ru.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_ru.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_ru.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_ru.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_tr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel_tr.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/systemProperties.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/systemProperties.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties.jelly diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_de.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_de.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_de.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_fr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_fr.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_ja.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_ja.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_nl.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_nl.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_ru.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_ru.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_ru.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_ru.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_tr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties_tr.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/threads.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/threads.jelly rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads.jelly diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/threads_de.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/threads_de.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads_de.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/threads_fr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/threads_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads_fr.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/threads_ja.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/threads_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads_ja.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/threads_nl.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/threads_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads_nl.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/threads_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/threads_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/threads_ru.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads_ru.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/threads_ru.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads_ru.properties diff --git a/core/src/main/resources/hudson/maven/MavenProbeAction/threads_tr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/MavenProbeAction/threads_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/threads_tr.properties diff --git a/core/src/main/resources/hudson/maven/Messages.properties b/maven-plugin/src/main/resources/hudson/maven/Messages.properties similarity index 100% rename from core/src/main/resources/hudson/maven/Messages.properties rename to maven-plugin/src/main/resources/hudson/maven/Messages.properties diff --git a/core/src/main/resources/hudson/maven/Messages_de.properties b/maven-plugin/src/main/resources/hudson/maven/Messages_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/Messages_de.properties rename to maven-plugin/src/main/resources/hudson/maven/Messages_de.properties diff --git a/core/src/main/resources/hudson/maven/Messages_fr.properties b/maven-plugin/src/main/resources/hudson/maven/Messages_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/Messages_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/Messages_fr.properties diff --git a/core/src/main/resources/hudson/maven/Messages_ja.properties b/maven-plugin/src/main/resources/hudson/maven/Messages_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/Messages_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/Messages_ja.properties diff --git a/core/src/main/resources/hudson/maven/Messages_nl.properties b/maven-plugin/src/main/resources/hudson/maven/Messages_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/Messages_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/Messages_nl.properties diff --git a/core/src/main/resources/hudson/maven/Messages_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/Messages_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/Messages_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/Messages_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/Messages_ru.properties b/maven-plugin/src/main/resources/hudson/maven/Messages_ru.properties similarity index 100% rename from core/src/main/resources/hudson/maven/Messages_ru.properties rename to maven-plugin/src/main/resources/hudson/maven/Messages_ru.properties diff --git a/core/src/main/resources/hudson/maven/Messages_tr.properties b/maven-plugin/src/main/resources/hudson/maven/Messages_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/Messages_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/Messages_tr.properties diff --git a/core/src/main/resources/hudson/maven/RedeployPublisher/config.jelly b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/RedeployPublisher/config.jelly rename to maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config.jelly diff --git a/core/src/main/resources/hudson/maven/RedeployPublisher/config_de.properties b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/RedeployPublisher/config_de.properties rename to maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_de.properties diff --git a/core/src/main/resources/hudson/maven/RedeployPublisher/config_fr.properties b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/RedeployPublisher/config_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_fr.properties diff --git a/core/src/main/resources/hudson/maven/RedeployPublisher/config_ja.properties b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/RedeployPublisher/config_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_ja.properties diff --git a/core/src/main/resources/hudson/maven/RedeployPublisher/config_nl.properties b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/RedeployPublisher/config_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_nl.properties diff --git a/core/src/main/resources/hudson/maven/RedeployPublisher/config_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/RedeployPublisher/config_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/RedeployPublisher/config_ru.properties b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_ru.properties similarity index 100% rename from core/src/main/resources/hudson/maven/RedeployPublisher/config_ru.properties rename to maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_ru.properties diff --git a/core/src/main/resources/hudson/maven/RedeployPublisher/config_tr.properties b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/RedeployPublisher/config_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_tr.properties diff --git a/core/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge.jelly b/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge.jelly rename to maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge.jelly diff --git a/core/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge_fr.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge_fr.properties diff --git a/core/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge_ja.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge_ja.properties diff --git a/core/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge_tr.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge_tr.properties diff --git a/core/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index.jelly b/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index.jelly rename to maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index.jelly diff --git a/core/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index_fr.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index_fr.properties diff --git a/core/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index_ja.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index_ja.properties diff --git a/core/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index_tr.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index_tr.properties diff --git a/core/src/main/resources/hudson/maven/reporters/Messages.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/Messages.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/Messages.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/Messages.properties diff --git a/core/src/main/resources/hudson/maven/reporters/Messages_de.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/Messages_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/Messages_de.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/Messages_de.properties diff --git a/core/src/main/resources/hudson/maven/reporters/Messages_fr.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/Messages_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/Messages_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/Messages_fr.properties diff --git a/core/src/main/resources/hudson/maven/reporters/Messages_ja.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/Messages_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/Messages_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/Messages_ja.properties diff --git a/core/src/main/resources/hudson/maven/reporters/Messages_nl.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/Messages_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/Messages_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/Messages_nl.properties diff --git a/core/src/main/resources/hudson/maven/reporters/Messages_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/Messages_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/Messages_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/Messages_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/reporters/Messages_tr.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/Messages_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/Messages_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/Messages_tr.properties diff --git a/core/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index.jelly b/maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index.jelly similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index.jelly rename to maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index.jelly diff --git a/core/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_de.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_de.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_de.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_de.properties diff --git a/core/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_fr.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_fr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_fr.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_fr.properties diff --git a/core/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_ja.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_ja.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_ja.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_ja.properties diff --git a/core/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_nl.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_nl.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_nl.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_nl.properties diff --git a/core/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_pt_BR.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_pt_BR.properties diff --git a/core/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_ru.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_ru.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_ru.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_ru.properties diff --git a/core/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_tr.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_tr.properties similarity index 100% rename from core/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_tr.properties rename to maven-plugin/src/main/resources/hudson/maven/reporters/SurefireAggregatedReport/index_tr.properties diff --git a/pom.xml b/pom.xml index 35cd5c1271..1924f87229 100644 --- a/pom.xml +++ b/pom.xml @@ -42,6 +42,7 @@ THE SOFTWARE. remoting core + maven-plugin maven-agent maven-interceptor war diff --git a/remoting/src/main/java/hudson/remoting/Which.java b/remoting/src/main/java/hudson/remoting/Which.java index 6969a211b5..cb88583a89 100644 --- a/remoting/src/main/java/hudson/remoting/Which.java +++ b/remoting/src/main/java/hudson/remoting/Which.java @@ -132,6 +132,10 @@ public class Which { throw new IllegalArgumentException(originalURL + " - " + resURL); } + public static File jarFile(URL resource) throws IOException { + return fromJarUrlToFile(resource.toExternalForm()); + } + private static File fromJarUrlToFile(String resURL) throws MalformedURLException { resURL = resURL.substring(resURL.indexOf(':')+1, resURL.lastIndexOf('!')); // cut off "scheme:" and the file name portion return new File(decode(new URL(resURL).getPath())); diff --git a/test/pom.xml b/test/pom.xml index 69c8bad318..de966296d3 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -43,7 +43,7 @@ THE SOFTWARE. maven-surefire-plugin - never + once @@ -85,6 +85,16 @@ THE SOFTWARE. ${project.version} war-for-test + + ${project.groupId} + maven-plugin + ${project.version} + + + ${project.groupId} + maven-plugin + ${project.version} + org.mortbay.jetty jetty diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index eae0243534..2e07631398 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -30,6 +30,7 @@ import hudson.WebAppMain; import hudson.EnvVars; import hudson.ExtensionList; import hudson.DescriptorExtensionList; +import hudson.remoting.Which; import hudson.Launcher.LocalLauncher; import hudson.matrix.MatrixProject; import hudson.matrix.MatrixBuild; @@ -93,6 +94,9 @@ import junit.framework.TestCase; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.resolver.ArtifactResolutionException; +import org.apache.maven.artifact.resolver.ArtifactNotFoundException; +import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException; import org.jvnet.hudson.test.HudsonHomeLoader.CopyExisting; import org.jvnet.hudson.test.recipes.Recipe; import org.jvnet.hudson.test.recipes.Recipe.Runner; @@ -113,6 +117,7 @@ import org.w3c.css.sac.CSSException; import org.w3c.css.sac.CSSParseException; import org.w3c.css.sac.ErrorHandler; import org.xml.sax.SAXException; +import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import com.gargoylesoftware.htmlunit.AjaxController; import com.gargoylesoftware.htmlunit.BrowserVersion; @@ -184,6 +189,7 @@ public abstract class HudsonTestCase extends TestCase { env.pin(); recipe(); AbstractProject.WORKSPACE.toString(); + hudson = newHudson(); hudson.setNoUsageStatistics(true); // collecting usage stats from tests are pointless. hudson.servletContext.setAttribute("app",hudson); @@ -606,6 +612,11 @@ public abstract class HudsonTestCase extends TestCase { // make dependency plugins available // TODO: probably better to read POM, but where to read from? // TODO: this doesn't handle transitive dependencies + + // Tom: plugins are now searched on the classpath first. They should be available on + // the compile or test classpath. As a backup, we do a best-effort lookup in the Maven repository + // For transitive dependencies, we could evaluate Plugin-Dependencies transitively. + String dependencies = m.getMainAttributes().getValue("Plugin-Dependencies"); if(dependencies!=null) { MavenEmbedder embedder = new MavenEmbedder(null); @@ -613,11 +624,40 @@ public abstract class HudsonTestCase extends TestCase { embedder.start(); for( String dep : dependencies.split(",")) { String[] tokens = dep.split(":"); - Artifact a = embedder.createArtifact("org.jvnet.hudson.plugins", tokens[0], tokens[1], "compile"/*doesn't matter*/, "hpi"); - embedder.resolve(a, Arrays.asList(embedder.createRepository("http://maven.glassfish.org/content/groups/public/","repo")),embedder.getLocalRepository()); - File dst = new File(home, "plugins/" + tokens[0] + ".hpi"); - if(!dst.exists() || dst.lastModified()!=a.getFile().lastModified()) - FileUtils.copyFile(a.getFile(), dst); + String artifactId = tokens[0]; + String version = tokens[1]; + File dependencyJar=null; + // need to search multiple group IDs + // TODO: extend manifest to include groupID:artifactID:version + Exception resolutionError=null; + for (String groupId : new String[]{"org.jvnet.hudson.plugins","org.jvnet.hudson.main"}) { + + // first try to find it on the classpath. + // this takes advantage of Maven POM located in POM + URL dependencyPomResource = getClass().getResource("/META-INF/maven/"+groupId+"/"+artifactId+"/pom.xml"); + if (dependencyPomResource != null) { + // found it + dependencyJar = Which.jarFile(dependencyPomResource); + break; + } else { + Artifact a; + a = embedder.createArtifact(groupId, artifactId, version, "compile"/*doesn't matter*/, "hpi"); + try { + embedder.resolve(a, Arrays.asList(embedder.createRepository("http://maven.glassfish.org/content/groups/public/","repo")),embedder.getLocalRepository()); + dependencyJar = a.getFile(); + } catch (AbstractArtifactResolutionException x) { + // could be a wrong groupId + resolutionError = x; + } + } + } + if(dependencyJar==null) + throw new Exception("Failed to resolve plugin: "+dep,resolutionError); + + File dst = new File(home, "plugins/" + artifactId + ".hpi"); + if(!dst.exists() || dst.lastModified()!=dependencyJar.lastModified()) { + FileUtils.copyFile(dependencyJar, dst); + } } embedder.stop(); } diff --git a/war/pom.xml b/war/pom.xml index 6022c9fede..146f346083 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -107,6 +107,11 @@ THE SOFTWARE. + + + + @@ -153,6 +158,11 @@ THE SOFTWARE. stapler.resourcePath ../core/src/main/resources + + + hudson.bundled.plugins + ../maven-plugin/target/test-classes/the.hpl + @@ -198,6 +208,17 @@ THE SOFTWARE. 0.9.10-hudson-9 provided + + + org.jvnet.hudson.main + maven-plugin + ${project.version} + hpi + provided +