提交 edd68416 编写于 作者: I imod

minor changes from pull feedback

上级 2d9d839e
......@@ -1062,9 +1062,9 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
/**
* Report to the administrator if the plugin with the given name is older then the required version.
*
* @param pluginName name of the plugin
* @param pluginName shortName of the plugin (artifactId)
* @param requiredVersion the lowest version which is OK (e.g. 2.2.2)
* @param message the message to show
* @param message the message to show (plain text)
*/
public void ifPluginOlderThenReport(String pluginName, String requiredVersion, String message){
Plugin plugin = Jenkins.getInstance().getPlugin(pluginName);
......@@ -1095,7 +1095,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
public static class PluginUpdateInfo {
public final String pluginName;
public final String message;
public PluginUpdateInfo(String pluginName, String message) {
private PluginUpdateInfo(String pluginName, String message) {
this.pluginName = pluginName;
this.message = message;
}
......
......@@ -28,7 +28,7 @@ THE SOFTWARE.
${%RequiredPluginUpdates}
<ul>
<j:forEach var="p" items="${it.pluginsToBeUpdated}">
<li><j:out value="${p.pluginName}"/> - <j:out value="${p.message}"/></li>
<li><j:out value="${p.pluginName}"/> <j:out value="${p.message}"/></li>
</j:forEach>
</ul>
</div>
......
......@@ -184,7 +184,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
*/
@Override
public Result getResult() {
Result r = super.getResult();
Result r = super.getResult();
for (MavenBuild b : getModuleLastBuilds().values()) {
Result br = b.getResult();
......@@ -1000,7 +1000,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
private final Properties properties;
private final String privateRepository;
private final String alternateSettings;
private final String globalSetings;
private final String globalSettings;
private final boolean nonRecursive;
// We're called against the module root, not the workspace, which can cause a lot of confusion.
private final String workspaceProper;
......@@ -1056,7 +1056,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
}
this.alternateSettings = SettingsProvider.getSettingsRemotePath(project.getSettings(), build, listener);
this.globalSetings = GlobalSettingsProvider.getSettingsRemotePath(project.getGlobalSettings(), build, listener);
this.globalSettings = GlobalSettingsProvider.getSettingsRemotePath(project.getGlobalSettings(), build, listener);
this.mavenVersion = mavenVersion;
this.resolveDependencies = project.isResolveDependencies();
......@@ -1141,8 +1141,8 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
mavenEmbedderRequest.setProcessPlugins( this.processPlugins );
mavenEmbedderRequest.setResolveDependencies( this.resolveDependencies );
if (globalSetings != null) {
mavenEmbedderRequest.setGlobalSettings( new File(globalSetings) );
if (globalSettings != null) {
mavenEmbedderRequest.setGlobalSettings( new File(globalSettings) );
}
// FIXME handle 3.1 level when version will be here : no rush :-)
......
<div>
The settings element in the settings.xml file contains elements used to define values which configure Maven execution in various ways, like the pom.xml, but should not be bundled to any specific project, or distributed to an audience. These include values such as the local repository location, alternate remote repository servers, and authentication information.
The settings element in the <code>settings.xml</code> file contains elements used to define values which configure Maven execution in various ways, like the <code>pom.xml</code>, but should not be bundled to any specific project, or distributed to an audience. These include values such as the local repository location, alternate remote repository servers, and authentication information.
<br>
There are two locations where a settings.xml file per default may live:
There are two locations where a <code>settings.xml</code> file per default may live:
<ul>
<li>The Maven install - default: $M2_HOME/conf/settings.xml</li>
<li>A user's install - default: ${user.home}/.m2/settings.xml</li>
<li>The Maven install - default: <code>$M2_HOME/conf/settings.xml</code></li>
<li>A user's install - default: <code>${user.home}/.m2/settings.xml</code></li>
</ul>
The former settings.xml are also called global settings, the latter settings.xml are referred to as user settings. If both files exists, their contents gets merged, with the user-specific settings.xml being dominant.
<p>
see also: <a href="http://maven.apache.org/settings.html">settings.xml reference</a>
see also: <a href="http://maven.apache.org/settings.html"><code>settings.xml</code> reference</a>
</div>
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册