diff --git a/.gitignore b/.gitignore index d84681e336..66394a91ca 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,9 @@ out .project build +# vim +*~ + war/images/16x16 war/images/24x24 war/images/32x32 diff --git a/BUILDING.TXT b/BUILDING.TXT new file mode 100644 index 0000000000..99b41980a3 --- /dev/null +++ b/BUILDING.TXT @@ -0,0 +1,6 @@ +If you want simply to have the jenkins.war as fast as possible (without test execution), just use : +mvn clean install -pl war -am -DskipTests +the war will be in war/target/jenkins.war (you can play with it) +You can desactivate test-harness execution with -Dskip-test-harness +Have Fun !! + diff --git a/changelog.html b/changelog.html index 9b48fb516c..8d8b5fc982 100644 --- a/changelog.html +++ b/changelog.html @@ -54,6 +54,75 @@ Upcoming changes
+ + + +
+ * Unlike {@link #getExactRuns()}, this method excludes those runs
+ * that didn't run and got inherited.
+ */
+ public List
+ * Plugins can implement this extension point to filter out the subset of matrix project to build.
+ * Most typically, such a plugin would add a custom {@link Action} to a build when it goes to the queue
+ * ({@link Queue#schedule(Task, int, List)}, then access this from {@link MatrixBuild} to drive
+ * the filtering logic.
+ *
+ *
+ * See the matrix reloaded plugin for an example.
+ *
+ * @author Christian Wolfgang
+ * @since 1.413
+ */
+public abstract class MatrixBuildListener implements ExtensionPoint {
+ /**
+ * Determine whether to build a given configuration or not
+ *
+ * @param b
+ * Never null. The umbrella build.
+ * @param c
+ * The configuration whose build is being considered. If any of the {@link MatrixBuildListener}
+ * returns false, then the build for this configuration is skipped, and the previous build
+ * of this configuration will be taken as the default result.
+ * @return
+ * True to let the build happen, false to skip it.
+ */
+ public abstract boolean doBuildConfiguration(MatrixBuild b, MatrixConfiguration c);
+
+ public static boolean buildConfiguration(MatrixBuild b, MatrixConfiguration c) {
+ for (MatrixBuildListener l : all()) {
+ if(!l.doBuildConfiguration(b, c)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Returns all the registered {@link MatrixBuildListener} descriptors.
+ */
+ public static ExtensionList ,R extends Abs
} catch (AbstractMethodError e) {
mon = BuildStepMonitor.BUILD;
}
- return mon.perform(bs, AbstractBuild.this, launcher, listener);
+ Result oldResult = AbstractBuild.this.getResult();
+ boolean canContinue = mon.perform(bs, AbstractBuild.this, launcher, listener);
+ Result newResult = AbstractBuild.this.getResult();
+ if (newResult != oldResult) {
+ String buildStepName = getBuildStepName(bs);
+ listener.getLogger().format("Build step '%s' changed build result to %s%n", buildStepName, newResult);
+ }
+ if (!canContinue) {
+ String buildStepName = getBuildStepName(bs);
+ listener.getLogger().format("Build step '%s' marked build as failure%n", buildStepName);
+ }
+ return canContinue;
+ }
+
+ private String getBuildStepName(BuildStep bs) {
+ if (bs instanceof Describable>) {
+ return ((Describable>) bs).getDescriptor().getDisplayName();
+ } else {
+ return bs.getClass().getSimpleName();
+ }
}
protected final boolean preBuild(BuildListener listener,Map,? extends BuildStep> steps) {
diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index 715714cc01..cf01c0e9ea 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -1263,7 +1263,7 @@ public abstract class AbstractProject ,R extends A
// lock the workspace of the last build
FilePath ws=lb.getWorkspace();
- if (ws==null || !ws.exists()) {
+ if (workspaceOffline(lb)) {
// workspace offline. build now, or nothing will ever be built
Label label = getAssignedLabel();
if (label != null && label.isSelfLabel()) {
@@ -1326,6 +1326,24 @@ public abstract class AbstractProject ,R extends A
return NO_CHANGES;
}
}
+
+ private boolean workspaceOffline(R build) throws IOException, InterruptedException {
+ FilePath ws = build.getWorkspace();
+ if (ws==null || !ws.exists()) {
+ return true;
+ }
+
+ Node builtOn = build.getBuiltOn();
+ if (builtOn == null) { // node built-on doesn't exist anymore
+ return true;
+ }
+
+ if (builtOn.toComputer() == null) { // node still exists, but has 0 executors - o.s.l.t.
+ return true;
+ }
+
+ return false;
+ }
/**
* Returns true if this user has made a commit to this project.
diff --git a/core/src/main/java/hudson/model/ComputerSet.java b/core/src/main/java/hudson/model/ComputerSet.java
index 4d3f59d218..0407e11322 100644
--- a/core/src/main/java/hudson/model/ComputerSet.java
+++ b/core/src/main/java/hudson/model/ComputerSet.java
@@ -44,9 +44,9 @@ import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import java.io.File;
import java.io.IOException;
import java.util.AbstractList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.HashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/core/src/main/java/hudson/model/DependencyGraph.java b/core/src/main/java/hudson/model/DependencyGraph.java
index 890454e91e..338040ad12 100644
--- a/core/src/main/java/hudson/model/DependencyGraph.java
+++ b/core/src/main/java/hudson/model/DependencyGraph.java
@@ -478,7 +478,7 @@ public final class DependencyGraph implements Comparator
- * Subclasses can override this to control the returne value.
+ * Subclasses can override this to control the return value.
*
* @since 1.378
*/
diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index daeea676d9..e564ff3650 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/core/src/main/java/hudson/model/Queue.java
@@ -78,7 +78,6 @@ import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index a836fadb6f..071d5cc746 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -43,6 +43,7 @@ import hudson.matrix.MatrixRun;
import hudson.model.Descriptor.FormException;
import hudson.model.listeners.RunListener;
import hudson.model.listeners.SaveableListener;
+import hudson.model.Hudson.MasterComputer;
import hudson.search.SearchIndexBuilder;
import hudson.security.ACL;
import hudson.security.AccessControlled;
@@ -1791,7 +1792,11 @@ public abstract class Run [INFO] --- maven-clean-plugin:2.4.1:clean (default-clean) @ jobConfigHistory ---
+ *
+ * or
+ *
+ * [INFO] --- gmaven-plugin:1.0-rc-5:generateTestStubs (test-in-groovy) @ jobConfigHistory ---
+ *
+ * or
+ *
+ * [INFO] --- cobertura-maven-plugin:2.4:instrument (report:cobertura) @ sardine ---
+ *
+ * @author Mirko Friedenhagen
+ */
+public class Maven3MojoNote extends ConsoleNote {
+ public Maven3MojoNote() {
+ }
+
+ @Override
+ public ConsoleAnnotator annotate(Object context, MarkupText text, int charPos) {
+ text.addMarkup(7,text.length(),"","");
+ return null;
+ }
+
+ @Extension
+ public static final class DescriptorImpl extends ConsoleAnnotationDescriptor {
+ public String getDisplayName() {
+ return "Maven 3 Mojos";
+ }
+ }
+
+ public static Pattern PATTERN = Pattern.compile("\\[INFO\\] --- .+-plugin:[^:]+:[^ ]+ \\(.+\\) @ .+ ---");
+}
diff --git a/core/src/main/java/hudson/tasks/_maven/MavenConsoleAnnotator.java b/core/src/main/java/hudson/tasks/_maven/MavenConsoleAnnotator.java
index bb668ff827..dfbe86cbc2 100644
--- a/core/src/main/java/hudson/tasks/_maven/MavenConsoleAnnotator.java
+++ b/core/src/main/java/hudson/tasks/_maven/MavenConsoleAnnotator.java
@@ -60,6 +60,10 @@ public class MavenConsoleAnnotator extends LineTransformationOutputStream {
if (m.matches())
new MavenMojoNote().encodeTo(out);
+ m = Maven3MojoNote.PATTERN.matcher(line);
+ if (m.matches())
+ new Maven3MojoNote().encodeTo(out);
+
m = MavenWarningNote.PATTERN.matcher(line);
if (m.find())
new MavenWarningNote().encodeTo(out);
diff --git a/core/src/main/resources/hudson/PluginManager/advanced.jelly b/core/src/main/resources/hudson/PluginManager/advanced.jelly
index f5260e426e..904d3d6c1f 100644
--- a/core/src/main/resources/hudson/PluginManager/advanced.jelly
+++ b/core/src/main/resources/hudson/PluginManager/advanced.jelly
@@ -48,7 +48,7 @@ THE SOFTWARE.
java -jar jenkins-cli.jar -s ${h.inferHudsonURL(request)} help
+ ${%Available Commands}
+
+
diff --git a/core/src/main/resources/hudson/model/Hudson/_cli.properties b/core/src/main/resources/hudson/model/Hudson/_cli.properties
index 90c13f84f2..d2e768307a 100644
--- a/core/src/main/resources/hudson/model/Hudson/_cli.properties
+++ b/core/src/main/resources/hudson/model/Hudson/_cli.properties
@@ -1,4 +1,4 @@
+Jenkins\ CLI=Jenkins CLI
blurb=You can access various features in Jenkins through a command-line tool. See \
the Wiki for more details of this feature.\
To get started, download jenkins-cli.jar, and run it as follows:
-
diff --git a/core/src/main/resources/hudson/model/Hudson/legend_fr.properties b/core/src/main/resources/hudson/model/Hudson/legend_fr.properties
index 0247c1cd75..b1d2443b35 100644
--- a/core/src/main/resources/hudson/model/Hudson/legend_fr.properties
+++ b/core/src/main/resources/hudson/model/Hudson/legend_fr.properties
@@ -31,7 +31,7 @@ health-81plus=La sant\u00E9 du projet est au dessus de 80%. Vous pouvez passer v
red=Le dernier build est en échec.
red_anime=Le dernier build est en échec. Un nouveau build est en cours.
health-61to80=La sant\u00E9 du projet est entre 60% et 80%. Vous pouvez passer votre souris au dessus de l''ic\u00F4ne du projet pour plus d''informations.
-health-80plus=La stabilité du projet est d'au moins 80%. Placez la souris au-dessus de l''icône du projet pour plus de détails.
+health-80plus=La stabilité du projet est d''au moins 80%. Placez la souris au-dessus de l''icône du projet pour plus de détails.
health-41to60=La sant\u00E9 du projet est entre 40% et 60%. Vous pouvez passer votre souris au dessus de l''ic\u00F4ne du projet pour plus d''informations.
health-60to79=La stabilité du projet se situe entre 60% et 80%. Placez la souris au-dessus de l''icône du projet pour plus de détails.
health-21to40=La sant\u00E9 du projet est entre 20% et 40%. Vous pouvez passer votre souris au dessus de l''ic\u00F4ne du projet pour plus d''informations.
diff --git a/core/src/main/resources/hudson/model/Messages_fr.properties b/core/src/main/resources/hudson/model/Messages_fr.properties
index faa9325d3c..5f51efdd35 100644
--- a/core/src/main/resources/hudson/model/Messages_fr.properties
+++ b/core/src/main/resources/hudson/model/Messages_fr.properties
@@ -41,7 +41,7 @@ AbstractProject.WorkspacePermission.Description=\
Si vous ne voulez pas qu''un utilisateur ait acc\u00e8s au code source, vous pouvez retirer ce droit.
Api.MultipleMatch=Le XPath "{0}" correspond \u00e0 {1} noeud(s). \
- Merci de fournir un XPath qui ne correspond qu'\u00e0 un seul noeud, ou utilisez le param\u00e8tre de requ\u00e8te "wrapper" pour les encapsuler tous dans un \u00e9l\u00e9ment racine.
+ Merci de fournir un XPath qui ne correspond qu''\u00e0 un seul noeud, ou utilisez le param\u00e8tre de requ\u00e8te "wrapper" pour les encapsuler tous dans un \u00e9l\u00e9ment racine.
Api.NoXPathMatch=Pas de correspondance avec le XPath {0}
BallColor.Aborted=Annul\u00e9
@@ -134,7 +134,7 @@ Slave.InvalidConfig.Executors=Configuration esclave invalide pour {0}. Nombre d'
Slave.InvalidConfig.NoName=Configuration esclave invalide. Le nom est vide.
Slave.InvalidConfig.NoRemoteDir=Configuration esclave invalide pour {0}. Pas de r\u00e9pertoire distant fourni
Slave.Launching={0} Lancement de l''agent esclave
-Slave.Terminated={0} l'agent esclave a \u00e9t\u00e9 termin\u00e9
+Slave.Terminated={0} l''agent esclave a \u00e9t\u00e9 termin\u00e9
Slave.UnableToLaunch=Impossible de lancer l''agent esclave pour {0} {1}
Slave.UnixSlave=Ceci est un esclave Unix
Slave.WindowsSlave=Ceci est un esclave Windows
diff --git a/core/src/main/resources/hudson/model/Messages_ja.properties b/core/src/main/resources/hudson/model/Messages_ja.properties
index dca1655ec8..d5ee4cc871 100644
--- a/core/src/main/resources/hudson/model/Messages_ja.properties
+++ b/core/src/main/resources/hudson/model/Messages_ja.properties
@@ -1,6 +1,6 @@
# The MIT License
#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman
+# Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -201,6 +201,7 @@ UpdateCenter.PluginCategory.buildwrapper=\u30d3\u30eb\u30c9\u30e9\u30c3\u30d1\u3
UpdateCenter.PluginCategory.cli=\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9
UpdateCenter.PluginCategory.cluster=\u30af\u30e9\u30b9\u30bf\u30fc\u7ba1\u7406/\u5206\u6563\u30d3\u30eb\u30c9
UpdateCenter.PluginCategory.external=\u5916\u90e8\u30b5\u30a4\u30c8/\u30c4\u30fc\u30eb\u3068\u306e\u9023\u643a
+UpdateCenter.PluginCategory.listview-column=\u30ea\u30b9\u30c8\u30d3\u30e5\u30fc\u30ab\u30e9\u30e0
UpdateCenter.PluginCategory.maven=Maven
UpdateCenter.PluginCategory.misc=\u305d\u306e\u4ed6
UpdateCenter.PluginCategory.notifier=\u30d3\u30eb\u30c9\u901a\u77e5
diff --git a/core/src/main/resources/hudson/model/Run/confirmDelete_fr.properties b/core/src/main/resources/hudson/model/Run/confirmDelete_fr.properties
index 777399b555..ae69f35f09 100644
--- a/core/src/main/resources/hudson/model/Run/confirmDelete_fr.properties
+++ b/core/src/main/resources/hudson/model/Run/confirmDelete_fr.properties
@@ -21,6 +21,6 @@
# THE SOFTWARE.
Warning=Avertissement
-cannotMsg=Impossible de supprimer ce build, parce qu'il est {0}
+cannotMsg=Impossible de supprimer ce build, parce qu''il est {0}
Are\ you\ sure\ about\ deleting\ the\ build?=Etes-vous sûr de vouloir supprimer le build?
Yes=Oui
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.properties
index 6579823d6f..08c42679a1 100644
--- a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.properties
+++ b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.properties
@@ -22,5 +22,5 @@
NewVersionAvailable=New version of Jenkins ({0}) is available for download \
(changelog).
-UpgradeComplete=Upgrade to Jenkins {0} is complete, awaiting restart.
+UpgradeComplete=Upgrade to Jenkins {0} is complete, awaiting restart.
UpgradeProgress=Upgrade to Jenkins {0} is in progress or failed.
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_de.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_de.properties
index ad82c6980c..b0102ce16d 100644
--- a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_de.properties
+++ b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_de.properties
@@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-UpgradeComplete=Aktualisierung auf Jenkins {0} abgeschlossen. Neustart von Jenkins erforderlich.
+UpgradeComplete=Aktualisierung auf Jenkins {0} abgeschlossen. Neustart von Jenkins erforderlich.
UpgradeProgress=Aktualisierung auf Jenkins {0} in Arbeit oder fehlgeschlagen.
NewVersionAvailable=\
Eine neue Version von Jenkins ({0}) kann heruntergeladen werden \
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Failure/status_fr.properties b/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Failure/status_fr.properties
index c24d51bd7a..c2818cda8c 100644
--- a/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Failure/status_fr.properties
+++ b/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Failure/status_fr.properties
@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-Failure=
+Failure=\u00C9chec
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/index_fr.properties b/core/src/main/resources/hudson/model/UpdateCenter/index_fr.properties
index 2eabc841ee..739f0e7955 100644
--- a/core/src/main/resources/hudson/model/UpdateCenter/index_fr.properties
+++ b/core/src/main/resources/hudson/model/UpdateCenter/index_fr.properties
@@ -20,9 +20,8 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
+Update\ Center=Centre de mise à jour
warning=Une fois l''installation terminée, Jenkins doit être redémarré \
pour prendre en compte les nouveaux plugins.
-Restart\ When\ No\ Jobs\ Are\ Running=Red\u00E9marrer quand aucun job n''est en cours
-Update\ Center=Centre de mise à jour
Installing\ Plugins/Upgrades=Installation/Mise \u00E0 jour des Plugins
-Restart\ Now=Redémarrer maintenant
+Schedule\ Restart=Programmer un red\u00E9marrage
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/triggers/Messages_fr.properties b/core/src/main/resources/hudson/triggers/Messages_fr.properties
index 015458c182..58f50abe59 100644
--- a/core/src/main/resources/hudson/triggers/Messages_fr.properties
+++ b/core/src/main/resources/hudson/triggers/Messages_fr.properties
@@ -24,4 +24,4 @@ SCMTrigger.DisplayName=Scruter l''outil de gestion de version
SCMTrigger.getDisplayName=Log du dernier accès à {0}
SCMTrigger.SCMTriggerCause.ShortDescription=Un changement dans la base de code a provoqué le lancement de ce job
TimerTrigger.DisplayName=Construire périodiquement
-TimerTrigger.TimerTriggerCause.ShortDescription=L''échéance d'une alarme périodique a provoqué le lancement de ce job
+TimerTrigger.TimerTriggerCause.ShortDescription=L''\u00e9\u00e9ch\u00e9ance d''une alarme p\u00e9riodique a provoqu\u00e9 le lancement de ce job
diff --git a/core/src/main/resources/hudson/util/DoubleLaunchChecker/index_fr.properties b/core/src/main/resources/hudson/util/DoubleLaunchChecker/index_fr.properties
index f5aebc3c83..40b2515ae2 100644
--- a/core/src/main/resources/hudson/util/DoubleLaunchChecker/index_fr.properties
+++ b/core/src/main/resources/hudson/util/DoubleLaunchChecker/index_fr.properties
@@ -28,4 +28,4 @@ message=\
incorrects. \
Merci de corriger le problème.
This\ Jenkins=Cette instance de Jenkins
-Other\ Jenkins=L'autre instance de Jenkins
+Other\ Jenkins=L''autre instance de Jenkins
diff --git a/core/src/main/resources/hudson/views/Messages_ja.properties b/core/src/main/resources/hudson/views/Messages_ja.properties
index 2cac213423..40402bd650 100644
--- a/core/src/main/resources/hudson/views/Messages_ja.properties
+++ b/core/src/main/resources/hudson/views/Messages_ja.properties
@@ -20,11 +20,11 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-BuildButtonColumn.DisplayName=\u30D3\u30EB\u30C9\u30DC\u30BF\u30F3
-JobColumn.DisplayName=\u540D\u524D
-LastDurationColumn.DisplayName=\u30D3\u30EB\u30C9\u6240\u8981\u6642\u9593
-LastFailureColumn.DisplayName=\u6700\u65B0\u306E\u5931\u6557\u30D3\u30EB\u30C9
-LastStableColumn.DisplayName=\u6700\u65B0\u306E\u5B89\u5B9A\u30D3\u30EB\u30C9
-LastSuccessColumn.DisplayName=\u6700\u65B0\u306E\u6210\u529F\u30D3\u30EB\u30C9
-StatusColumn.DisplayName=\u30B9\u30C6\u30FC\u30BF\u30B9
-WeatherColumn.DisplayName=\u5929\u6C17\u4E88\u5831
+BuildButtonColumn.DisplayName=\u30d3\u30eb\u30c9\u30dc\u30bf\u30f3
+JobColumn.DisplayName=\u540d\u524d
+LastDurationColumn.DisplayName=\u30d3\u30eb\u30c9\u6240\u8981\u6642\u9593
+LastFailureColumn.DisplayName=\u6700\u65b0\u306e\u5931\u6557\u30d3\u30eb\u30c9
+LastStableColumn.DisplayName=\u6700\u65b0\u306e\u5b89\u5b9a\u30d3\u30eb\u30c9
+LastSuccessColumn.DisplayName=\u6700\u65b0\u306e\u6210\u529f\u30d3\u30eb\u30c9
+StatusColumn.DisplayName=\u30b9\u30c6\u30fc\u30bf\u30b9
+WeatherColumn.DisplayName=\u7a7a\u6a21\u69d8
diff --git a/core/src/main/resources/hudson/views/WeatherColumn/columnHeader_ja.properties b/core/src/main/resources/hudson/views/WeatherColumn/columnHeader_ja.properties
index de2f1aef3d..b494da4e78 100644
--- a/core/src/main/resources/hudson/views/WeatherColumn/columnHeader_ja.properties
+++ b/core/src/main/resources/hudson/views/WeatherColumn/columnHeader_ja.properties
@@ -1,6 +1,6 @@
# The MIT License
#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman, Martin Eigenbrodt
+# Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman, Martin Eigenbrodt
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -21,4 +21,4 @@
# THE SOFTWARE.
Weather\ report\ showing\ aggregated\ status\ of\ recent\ builds=\
- \u6700\u8FD1\u306E\u30D3\u30EB\u30C9\u306E\u30B9\u30C6\u30FC\u30BF\u30B9\u3092\u96C6\u7D04\u3057\u305F\u5929\u6C17\u4E88\u5831
+ \u6700\u8fd1\u306e\u30d3\u30eb\u30c9\u306e\u30b9\u30c6\u30fc\u30bf\u30b9\u3092\u96c6\u7d04\u3057\u305f\u7a7a\u6a21\u69d8
diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/index_ja.properties b/core/src/main/resources/hudson/widgets/HistoryWidget/index_ja.properties
index 021ad93627..37ba0dcc1d 100644
--- a/core/src/main/resources/hudson/widgets/HistoryWidget/index_ja.properties
+++ b/core/src/main/resources/hudson/widgets/HistoryWidget/index_ja.properties
@@ -1,6 +1,6 @@
# The MIT License
#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman
+# Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-trend=\u50BE\u5411
-for\ all=\u5168\u30D3\u30EB\u30C9
-for\ failures=\u5931\u6557\u30D3\u30EB\u30C9
+trend=\u63a8\u79fb
+for\ all=\u5168\u30d3\u30eb\u30c9
+for\ failures=\u5931\u6557\u30d3\u30eb\u30c9
More\ ...=\u3082\u3063\u3068 ...
\ No newline at end of file
diff --git a/core/src/main/resources/lib/form/repeatable.jelly b/core/src/main/resources/lib/form/repeatable.jelly
index ae8ab7b821..7268f72da0 100644
--- a/core/src/main/resources/lib/form/repeatable.jelly
+++ b/core/src/main/resources/lib/form/repeatable.jelly
@@ -81,6 +81,9 @@ THE SOFTWARE.
diff --git a/core/src/main/resources/lib/hudson/project/config-retryCount_fr.properties b/core/src/main/resources/lib/hudson/project/config-retryCount_fr.properties
index 762124e6b4..d1725e9120 100644
--- a/core/src/main/resources/lib/hudson/project/config-retryCount_fr.properties
+++ b/core/src/main/resources/lib/hudson/project/config-retryCount_fr.properties
@@ -22,5 +22,5 @@
Retry\ Count=Nombre de r\u00E9-essais
-Number\ of\ Retrys\ needed\ if\ checkout\ fails=Nombre de Réessayer n'est pas nécessaire si la caisse
+Number\ of\ Retrys\ needed\ if\ checkout\ fails=
SCM\ checkout\ retry\ count=Nombre de retentatives de checkout du SCM
diff --git a/core/src/test/java/hudson/tasks/_maven/Maven3MojoNoteTest.java b/core/src/test/java/hudson/tasks/_maven/Maven3MojoNoteTest.java
new file mode 100644
index 0000000000..421632e868
--- /dev/null
+++ b/core/src/test/java/hudson/tasks/_maven/Maven3MojoNoteTest.java
@@ -0,0 +1,38 @@
+package hudson.tasks._maven;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import hudson.MarkupText;
+
+import org.junit.Test;
+
+public class Maven3MojoNoteTest {
+
+ @Test
+ public void testAnnotateMavenPlugin() {
+ check("[INFO] --- maven-clean-plugin:2.4.1:clean (default-clean) @ jobConfigHistory ---", "[INFO] --- maven-clean-plugin:2.4.1:clean (default-clean) @ jobConfigHistory ---");
+ }
+
+ @Test
+ public void testAnnotateCodehausPlugin() {
+ check("[INFO] --- cobertura-maven-plugin:2.4:instrument (report:cobertura) @ sardine ---", "[INFO] --- cobertura-maven-plugin:2.4:instrument (report:cobertura) @ sardine ---");
+
+ }
+
+ @Test
+ public void testAnnotateOtherPlugin() {
+ check("[INFO] --- gmaven-plugin:1.0-rc-5:generateTestStubs (test-in-groovy) @ jobConfigHistory ---", "[INFO] --- gmaven-plugin:1.0-rc-5:generateTestStubs (test-in-groovy) @ jobConfigHistory ---");
+ }
+
+ private void check(final String decorated, final String input) {
+ assertTrue(input + " does not match" + Maven3MojoNote.PATTERN, Maven3MojoNote.PATTERN.matcher(input).matches());
+ assertEquals(decorated, annotate(input));
+ }
+
+ private String annotate(String text) {
+ final MarkupText markupText = new MarkupText(text);
+ new Maven3MojoNote().annotate(new Object(), markupText, 0);
+ return markupText.toString(true);
+ }
+
+}
diff --git a/debian/debian/changelog b/debian/debian/changelog
index fc157ee557..89d3a24c96 100644
--- a/debian/debian/changelog
+++ b/debian/debian/changelog
@@ -1,3 +1,15 @@
+jenkins (1.413) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi
- * For compatibility reason, this field may be null when loading data from old hudson.
+ * For compatibility reason, this field may be null when loading data from old hudson.
+ *
+ * @since 1.133
*/
@CopyOnWrite
private volatile List
+ To use this feature you shouldn't deactivate the automatic artifact archiving.
+
Hinweis: Unabhängig von dieser Einstellung können Sie aber auch jederzeit manuell
Artefakte aus durchgeführten Builds in beliebige Repositories ausbringen.
+
+
+ To use this feature you shouldn't deactivate the automatic artifact archiving.
+
+ To use this feature you shouldn't deactivate the automatic artifact archiving.
+
この設定を行っているかによらず、Jenkinsの画面からいつでも過去の成果物を任意のリポジトリにデプロイできます。
+
+
+ To use this feature you shouldn't deactivate the automatic artifact archiving.
+
+ If build doesn't requires access to desktop (only using command line tools and tests) this option can be checked.
+
+ This option allow Jenkins to configure the build process in headless mode. Usefull on OSX to avoid boring Dock icon
+ to take focus, this option may also in future release be used to select slave adequate instance.
+
+ Si le build ne né,cessite pas un accè à l'environnement graphique (s'il n'utilise que des outils
+ en ligne de commande) cette option peut être activŽe.
+
+ Cette option permet à Jenkins de lancer le processus de build en mode 'headless'. Ceci est
+ particulièrement intéressant sur OSX pour éviter qu'une icône Java prenne le focus en sautillant
+ dans le Dock. Cette option pourrait à l'avenir servir à sélectionner un esclave adapté.
+