diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000000000000000000000000000000000..71b25de5fede2f693026268b69839c15b95465dd
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,39 @@
+# Handle line endings automatically for files detected as text
+# and leave all files detected as binary untouched.
+* text=auto
+
+#
+# The above will handle all files NOT found below
+#
+# These files are text and should be normalized (Convert crlf => lf)
+*.css text
+*.groovy text
+*.htm text
+*.html text
+*.java text
+*.js text
+*.json text
+*.jelly text
+*.jellytag text
+*.less text
+*.properties text
+*.rb text
+*.sh text
+*.txt text
+*.xml text
+
+# These files are binary and should be left untouched
+# (binary is a macro for -text -diff)
+*.class binary
+*.gz binary
+*.tgz binary
+*.ear binary
+*.gif binary
+*.hpi binary
+*.ico binary
+*.jar binary
+*.jpg binary
+*.jpeg binary
+*.png binary
+*.war binary
+*.zip binary
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000000000000000000000000000000000..0e47cddae6542c7463aad91efb363a5402336b3d
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,35 @@
+See [JENKINS-XXXXX](https://issues.jenkins-ci.org/browse/JENKINS-XXXXX).
+
+
+
+### Proposed changelog entries
+
+* Entry 1: Issue, Human-readable Text
+* ...
+
+
+
+### Submitter checklist
+
+- [ ] JIRA issue is well described
+- [ ] Changelog entry appropriate for the audience affected by the change (users or developer, depending on the change). [Examples](https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/weekly.yml)
+ * Use the `Internal: ` prefix if the change has no user-visible impact (API, test frameworks, etc.)
+- [ ] Appropriate autotests or explanation to why this change has no tests
+- [ ] For dependency updates: links to external changelogs and, if possible, full diffs
+
+
+
+### Desired reviewers
+
+@mention
+
+
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
new file mode 100644
index 0000000000000000000000000000000000000000..e93a5b43ee1cd1968d2d971e1486071f4fa1fe0f
--- /dev/null
+++ b/.mvn/jvm.config
@@ -0,0 +1 @@
+-Xmx800m
diff --git a/BUILDING.TXT b/BUILDING.TXT
index 09766de355e22b3f2469dc88cc0a1ba35d8aa19c..bde5cadf353210259628baa34b1813f0acddc5b1 100644
--- a/BUILDING.TXT
+++ b/BUILDING.TXT
@@ -4,7 +4,6 @@ execution), run:
mvn clean install -pl war -am -DskipTests
The WAR file will be in war/target/jenkins.war (you can play with it)
-You can deactivate test-harness execution with -Dskip-test-harness
For more information on building Jenkins, visit
https://wiki.jenkins-ci.org/display/JENKINS/Building+Jenkins
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7bd3f7a8f7b30738a6187c17454f431a84f6e45f..f99fe77067ef6c25597bf54df9e0debdaff27fef 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,3 @@
# Contributing to Jenkins
-For information on contributing to Jenkins, check out the https://wiki.jenkins-ci.org/display/JENKINS/contributing and https://wiki.jenkins-ci.org/display/JENKINS/Extend+Jenkins wiki pages over at the official https://wiki.jenkins-ci.org . They will help you get started with contributing to Jenkins.
+For information on contributing to Jenkins, check out https://jenkins.io/redirect/contribute/. That page will help you get started with contributing to Jenkins.
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000000000000000000000000000000000000..bcced2b016045b0c7be4012dc213c1ccbdc9d6da
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,106 @@
+#!/usr/bin/env groovy
+
+/*
+ * This Jenkinsfile is intended to run on https://ci.jenkins.io and may fail anywhere else.
+ * It makes assumptions about plugins being installed, labels mapping to nodes that can build what is needed, etc.
+ *
+ * The required labels are "java" and "docker" - "java" would be any node that can run Java builds. It doesn't need
+ * to have Java installed, but some setups may have nodes that shouldn't have heavier builds running on them, so we
+ * make this explicit. "docker" would be any node with docker installed.
+ */
+
+// TEST FLAG - to make it easier to turn on/off unit tests for speeding up access to later stuff.
+def runTests = true
+def failFast = false
+
+properties([buildDiscarder(logRotator(numToKeepStr: '50', artifactNumToKeepStr: '20'))])
+
+// see https://github.com/jenkins-infra/documentation/blob/master/ci.adoc for information on what node types are available
+def buildTypes = ['Linux', 'Windows']
+
+def builds = [:]
+for(i = 0; i < buildTypes.size(); i++) {
+ def buildType = buildTypes[i]
+ builds[buildType] = {
+ node(buildType.toLowerCase()) {
+ timestamps {
+ // First stage is actually checking out the source. Since we're using Multibranch
+ // currently, we can use "checkout scm".
+ stage('Checkout') {
+ checkout scm
+ }
+
+ // Now run the actual build.
+ stage("${buildType} Build / Test") {
+ timeout(time: 180, unit: 'MINUTES') {
+ // See below for what this method does - we're passing an arbitrary environment
+ // variable to it so that JAVA_OPTS and MAVEN_OPTS are set correctly.
+ withMavenEnv(["JAVA_OPTS=-Xmx1536m -Xms512m",
+ "MAVEN_OPTS=-Xmx1536m -Xms512m"]) {
+ // Actually run Maven!
+ // -Dmaven.repo.local=… tells Maven to create a subdir in the temporary directory for the local Maven repository
+ def mvnCmd = "mvn -Pdebug -U clean install javadoc:javadoc ${runTests ? '-Dmaven.test.failure.ignore' : '-DskipTests'} -V -B -Dmaven.repo.local=${pwd tmp: true}/m2repo -s settings-azure.xml -e"
+ if(isUnix()) {
+ sh mvnCmd
+ sh 'test `git status --short | tee /dev/stderr | wc --bytes` -eq 0'
+ } else {
+ bat mvnCmd
+ }
+ }
+ }
+ }
+
+ // Once we've built, archive the artifacts and the test results.
+ stage("${buildType} Archive Artifacts / Test Results") {
+ def files = findFiles(glob: '**/target/*.jar, **/target/*.war, **/target/*.hpi')
+ renameFiles(files, buildType.toLowerCase())
+
+ archiveArtifacts artifacts: '**/target/*.jar, **/target/*.war, **/target/*.hpi',
+ fingerprint: true
+ if (runTests) {
+ junit healthScaleFactor: 20.0, testResults: '**/target/surefire-reports/*.xml'
+ }
+ }
+ }
+ }
+ }
+}
+
+builds.failFast = failFast
+parallel builds
+
+// This method sets up the Maven and JDK tools, puts them in the environment along
+// with whatever other arbitrary environment variables we passed in, and runs the
+// body we passed in within that environment.
+void withMavenEnv(List envVars = [], def body) {
+ // The names here are currently hardcoded for my test environment. This needs
+ // to be made more flexible.
+ // Using the "tool" Workflow call automatically installs those tools on the
+ // node.
+ String mvntool = tool name: "mvn", type: 'hudson.tasks.Maven$MavenInstallation'
+ String jdktool = tool name: "jdk8", type: 'hudson.model.JDK'
+
+ // Set JAVA_HOME, MAVEN_HOME and special PATH variables for the tools we're
+ // using.
+ List mvnEnv = ["PATH+MVN=${mvntool}/bin", "PATH+JDK=${jdktool}/bin", "JAVA_HOME=${jdktool}", "MAVEN_HOME=${mvntool}"]
+
+ // Add any additional environment variables.
+ mvnEnv.addAll(envVars)
+
+ // Invoke the body closure we're passed within the environment we've created.
+ withEnv(mvnEnv) {
+ body.call()
+ }
+}
+
+void renameFiles(def files, String prefix) {
+ for(i = 0; i < files.length; i++) {
+ def newPath = files[i].path.replace(files[i].name, "${prefix}-${files[i].name}")
+ def rename = "${files[i].path} ${newPath}"
+ if(isUnix()) {
+ sh "mv ${rename}"
+ } else {
+ bat "move ${rename}"
+ }
+ }
+}
diff --git a/README.md b/README.md
index 4ecfdb2c3738bd3ca3f83b442ecbb8b315e1e29c..6dc6c47ecef715c771fcfdeb9ccd83cc45cf4962 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,32 @@
[![][ButlerImage]][website]
# About
-In a nutshell, Jenkins CI is the leading open-source continuous integration server. Built with Java, it provides over 1000 plugins to support building and testing virtually any project.
+In a nutshell, Jenkins is the leading open-source automation server.
+Built with Java, it provides over 1000 plugins to support automating virtually anything,
+so that humans can actually spend their time doing things machines cannot.
+
+# What to Use Jenkins for and When to Use It
+
+Use Jenkins to automate your development workflow so you can focus on work that matters most. Jenkins is commonly used for:
+
+- Building projects
+- Running tests to detect bugs and other issues as soon as they are introduced
+- Static code analysis
+- Deployment
+
+Execute repetitive tasks, save time, and optimize your development process with Jenkins.
# Downloads
Non-source downloads such as WAR files and several Linux packages can be found on our [Mirrors].
# Source
-Our latest and greatest source of Jenkins CI can be found on [GitHub]. Fork us!
+Our latest and greatest source of Jenkins can be found on [GitHub]. Fork us!
# Contributing to Jenkins
Follow [contributing](CONTRIBUTING.md) file.
# News and Website
-All information about Jenkins CI can be found on our [website]. Follow us on Twitter [@jenkinsci].
+All information about Jenkins can be found on our [website]. Follow us on Twitter [@jenkinsci].
# License
Jenkins is **licensed** under the **[MIT License]**. The terms of the license are as follows:
@@ -40,12 +53,10 @@ Jenkins is **licensed** under the **[MIT License]**. The terms of the license ar
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-[ButlerImage]: http://jenkins-ci.org/sites/default/files/jenkins_logo.png
+[ButlerImage]: https://jenkins.io/sites/default/files/jenkins_logo.png
[MIT License]: https://github.com/jenkinsci/jenkins/raw/master/LICENSE.txt
[Mirrors]: http://mirrors.jenkins-ci.org
[GitHub]: https://github.com/jenkinsci/jenkins
-[website]: http://jenkins-ci.org
-[@jenkinsci]: http://twitter.com/jenkinsci
-[Contributing]: https://wiki.jenkins-ci.org/display/JENKINS/contributing
-[Extend Jenkins]: https://wiki.jenkins-ci.org/display/JENKINS/Extend+Jenkins
+[website]: https://jenkins.io/
+[@jenkinsci]: https://twitter.com/jenkinsci
[wiki]: https://wiki.jenkins-ci.org
diff --git a/changelog.html b/changelog.html
index c40bd5ef0aa3e210d8d6abbbb79f52cc155f795c..20a2db735b6fd3d3a0c137d1d5484d76c354f8d4 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,1920 +1,15 @@
-
-
-
-
- Changelog
-
-
-
-
-
-
Legend:
-
- major enhancement enhancement
- major bug fix bug fix
- xxxxx
-
-
-
-Help other Jenkins users by letting the community know which releases you've used,
-and whether they had any significant issues.
-Legend:
- = I use it on my production site without major issues.
- = I don't recommend it.
- = I tried it but rolled back to a previous version.
-View ratings below, and click one of the icons next to your version to provide your input.
-
- Added support of default values in the enum.jelly form element.
- (PR 1926)
-
- Bytecode Compatibility Transformer computes the common super class without loading classes.
- Fixes the ClassCircularityError exception in Ruby Runtime Plugin.
- (issue 31019)
-
- Extended Choice parameter definitions could not be saved since 1.637.
- (issue 31458)
-
- Display expected CRON run times even if a warning occurs.
- (issue 29059)
-
- Rework the online-node command implementation, no functional changes.
- (issue 31776)
-
- Revert trigger optimizations made in 1.621 by PR 1617.
- (issue 30745)
-
- Delegate CLI's delete-node command to the overridable Computer.doDoDelete() method.
- Fixes the issue in OpenStack and JClouds plugins.
- (issue 31098, regression in 1.618)
-
- Prevent autocorrect of username on mobile devices in login forms.
- (PR 1531)
-
- Describe the built-in JDK as "(System)".
- (issue 755)
-
- Update JNA library to 4.2.1 in order to integrate fixes for linux-ppc64 and linux-arm platforms.
- (issue 15792)
-
- Since 1.598 overrides of Descriptor.getId were not correctly handled by form binding, breaking at least the CloudBees Templates plugin.
- (issue 26781)
-
- Reverted in 1.611, reimplemented in 1.627. Archiving of large artifacts. Tar implementation cannot handle files having a size >8GB.
- (issue 10629)
-
- The queue state was not updated between scheduling builds.
- (issue 27708,
- issue 27871)
-
- PeepholePermalink RunListenerImpl oncompleted should be triggered before downstream builds are triggered.
- (issue 20989)
-
- NPE when /script used on offline slave.
- (issue 26751)
-
- Make periodic workspace cleanup configurable through system properties.
- (issue 21322)
-
- Do not offer to restart on /restart and /safeRestart if the configuration does not support it.
- (issue 27414)
-
- Polling was skipped while quieting down, resulting in ignored commit notifications. This behavior was changed.
- (issue 26208)
-
- Starting this version, native packages are produced from the new repository.
- File issues related to installers and packages in the packaging component.
-
- JSONP served with the wrong MIME type and rejected by Chrome.
- (issue 27607)
-
- Security file pattern whitelist was broken for some plugins since 1.597.
- (issue 27055)
-
- Lock an Executor without creating a Thread
- (issue 25938)
-
- Hide flyweight master executor when ≥1 heavyweight executors running as subtasks
- (issue 26900)
-
- Way to mark an Executable that should not block isReadyToRestart
- (issue 22941)
-
- Refactor the Queue and Nodes to use a consistent locking strategy
- (issue 27565)
- Note that this change involved moving slave definitions outside the main config.xml file.
- If you downgrade after this, your slave settings will be lost.
-
- Makes the Jenkins is loading screen not block on the extensions loading lock
- (issue 27563)
-
- AdjunctManager: exception upon startup
- (issue 15355)
-
- Removes race condition rendering the list of executors
- (issue 27564)
-
- Tidy up the locks that were causing deadlocks with the once retention strategy in durable tasks
- (issue 27476)
-
- Remove any requirement from Jenkins Core to lock on the Queue when rendering the Jenkins UI
- (issue 27566)
-
- Added a switch (-Dhudson.model.User.allowNonExistentUserToLogin=true) to let users login even when the record is not found in the backend security realm.
- (issue 22346)
-
- Avoid deadlock when using build-monitor-plugin.
- (issue 27183)
-
- As security hardening, mark "remember me" cookie as HTTP only
- (issue 27277)
-
- Show displayName in build remote API.
- (issue 26723)
-
- JENKINS_HOME layout change: builds are now keyed by build numbers and not timestamps.
- See Wiki for details
- and downgrade.
- (issue 24380)
-
- Do not throw exception on /signup when not possible.
- (issue 11172)
-
- Tool installer which downloads and unpacks archives should not fail the build if the tool already exists and the server returns an error code.
- (issue 26196)
-
- Use Windows line endings for batch file build steps.
- (issue 7478)
-
- Reduced the logging clutter about the lack of @ExportedBean.
- (issue 24458)
-
- Character encoding problem in form submission when file parameters are present.
- (issue 11543)
-
- Improved error handling and "in-progress" UI feedback in JNLP slave to service installation.
-
- Winstone 2.4: reverse proxy support in the logging, request header size limit control, and different private key password from keystore password.
- (issue 23665)
-
- umask setting on Debian did not work.
- (pull 1397)
-
- handle job move when buildDir is configured to a custom location.
- (issue 24825)
-
- Failure to migrate legacy user records in 1.576 properly broke Jenkins, resulted in NullPointerExceptions.
- (issue 24317)
-
- Jenkins did not correctly display icons contributed by plugins in 1.576.
- (issue 24316)
-
- Moved JUnit reporting functionality to a plugin.
- (issue 23263)
-
- Fixed ClassCastException on org.dom4j.DocumentFactory
- (issue 13709)
-
- Jenkins now logs warnings when it fails to export objects to XML/JSON.
- This can result in a lot of log output in case of heavy API use.
- We recommend that API users use the ?tree parameter instead of ?depth.
- (commit)
-
- Allow BuildStep to work with non-AbstractProject
- (issue 23713)
-
- Improved class loading performance when using Groovy.
- (issue 24309)
-
- Prevent NullPointerException from Executor.run.
- (issue 24110)
-
- Make the lifetime of queue items cache configurable.
- (issue 19691)
-
- Support --username/--password authentication for CLIMethod based CLI commands.
- (issue 23988)
-
- Don't link to /safeRestart after update if Jenkins cannot restart itself.
- (issue 24032)
-
- Properly consider busy executors when reducing a node's executor count.
- (issue 24095)
-
- Jenkins can now kill Win32 processes from Win64 JVMs.
- (issue 23410)
-
- Allow custom security realm plugins to fire events to SecurityListeners.
- (issue 23417)
-
- Recover gracefully if a build permalink has a non-numeric value.
- (issue 21631)
-
- Fix form submission via the Enter key for Internet Explorer version 9.
- (issue 22373)
-
- When Jenkins had a lot of jobs, submitting a view configuration change could overload the web server, even if few of the jobs were selected.
- (issue 20327)
-
- Fixed a reference counting bug in the remoting layer.
- (commit)
-
- Avoid repeatedly reading symlinks from disk to resolve build permalinks.
- (issue 22822)
-
- Show custom build display name in executors widget.
- (issue 10477)
-
- CodeMirror support for shell steps broke initial configuration.
- (issue 23151)
-
- Jenkins on Linux can not restart after plugin update when started without full path to java executable
- (issue 22818)
-
- Fixed NullPointerException when a build triggering returns null cause
- (issue 20499)
-
- Fixed NullPointerException on plugin installations when invalid update center is set
- (issue 20031)
-
- Use DISABLED_ANIME icon while building a disabled project
- (issue 8358)
-
- Process the items hierarchy when displaying the Show Poll Thread Count option
- (issue 22934)
-
- Compressed output was turned on even before Access Denied errors were shown for disallowed Remote API requests, yielding a confusing error.
- (issue 17374)
- (issue 18116)
-
- Properly close input streams in FileParameterValue
- (issue 22693)
-
- Incorrect failure age in the JUnit test results
- (issue 18626)
-
- Enforcing build trigger authentication at runtime by checking authentication associated with a build, rather than at configuration time.
- For compatibility, enforcement is skipped by default; you must install the Authorize Project plugin or similar for this to take effect.
- The “upstream pseudo trigger” was also removed in favor of a true trigger configured on the downstream project;
- you may use either the post-build action or the trigger according to where you want this configuration stored, and who is authorized to change it.
- (issue 16956)
-
- Fixed NPE from view new job name autocompletion since 1.553.
- (issue 22142)
-
- Deadlocks in concurrent builds under some conditions since 1.556.
- (issue 22560)
-
- JNLP slaves are now handled through NIO-based remoting channels for better scalability.
-
- Fixed ArrayIndexOutOfBoundsException in XStream with Oracle JDK8 release version
- (issue 18537)
-
- Corrected permission checks for copy-job and create-job CLI commands.
- (issue 22262)
-
- identity.key, used to secure some communications with Jenkins, now stored encrypted with the master key.
-
- When dynamically loading a plugin which another loaded plugin already had an optional dependency on, class loading errors could result before restart.
- (issue 19976)
-
- Memory leaks in the old data monitor.
- (issue 19544)
-
- Ability for custom view types to disable automatic refresh.
- (issue 21190)
- (issue 21191)
-
- Option to download metadata directly from Jenkins rather than going through the browser.
- (issue 19081)
-
- Allow JDK8 (and other versions) to be downloaded by JDKInstaller correctly.
- (issue 22347)
-
- Build history widget only showed the last day of builds.
- (Due to JENKINS-20892, even with this fix at most 20 builds are shown.)
- (issue 21159)
-
- Random class loading error mostly known to affect static analysis plugins.
- (issue 12124)
-
- After restarting Jenkins, users known only from changelogs could be shown as First Last _first.last@some.org_, breaking mail delivery.
- (issue 16332)
-
- CLI build -s -v command caused 100% CPU usage on the master.
- (issue 20965)
-
- Slave started from Java Web Start can now install itself as a systemd service.
-
- Split the “raw HTML” markup formatter out of core into a bundled plugin.
-
- Do not show Maven modules and matrix configurations in the Copy Job dialog.
- (issue 19559)
-
- Builds disappear after renaming a job.
- (issue 18678)
-
- When clicking Apply to rename a job, tell the user that Save must be used instead.
- (issue 17401)
-
- Exception from XStream running Maven builds on strange Java versions.
- (issue 21183)
-
- When clicking Apply results in an exception (error page), show it, rather than creating an empty dialog.
- (issue 20772)
-
-
-
-Older changelogs can be found in a separate file
-
-
-
+-->
\ No newline at end of file
diff --git a/cli/pom.xml b/cli/pom.xml
index bdc0fa749c34544e07a6068910088d0346028da3..36dfadd08c0cfb49acd3b3ec6609275aaa9ed087 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.mainpom
- 1.648-SNAPSHOT
+ 2.74-SNAPSHOTcli
@@ -24,11 +24,19 @@
powermock-api-mockitotest
+
+ org.kohsuke
+ access-modifier-annotation
+ commons-codeccommons-codec1.4
+
+ commons-io
+ commons-io
+ ${project.groupId}remoting
@@ -42,9 +50,20 @@
org.jvnet.localizerlocalizer
- 1.23
+ 1.24
+ org.apache.sshd
+ sshd-core
+ 1.6.0
+ true
+
+
+ org.slf4j
+ slf4j-jdk14
+ true
+
+ org.jenkins-citrilead-ssh2build214-jenkins-1
@@ -88,10 +107,15 @@
Messages.propertiestarget/generated-sources/localizer
+ true
+
+ org.codehaus.mojo
+ findbugs-maven-plugin
+
diff --git a/cli/src/main/java/hudson/cli/CLI.java b/cli/src/main/java/hudson/cli/CLI.java
index de2d2bd7950a3a7a73993dc6581213a3f4ca01ca..3b8c73e473b97d8ae9cc3a0c1080cb632d816634 100644
--- a/cli/src/main/java/hudson/cli/CLI.java
+++ b/cli/src/main/java/hudson/cli/CLI.java
@@ -25,13 +25,13 @@ package hudson.cli;
import hudson.cli.client.Messages;
import hudson.remoting.Channel;
+import hudson.remoting.NamingThreadFactory;
import hudson.remoting.PingThread;
import hudson.remoting.Pipe;
import hudson.remoting.RemoteInputStream;
import hudson.remoting.RemoteOutputStream;
import hudson.remoting.SocketChannelStream;
import hudson.remoting.SocketOutputStream;
-
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
import javax.net.ssl.HostnameVerifier;
@@ -58,6 +58,7 @@ import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.URL;
import java.net.URLConnection;
+import java.nio.charset.Charset;
import java.security.GeneralSecurityException;
import java.security.KeyPair;
import java.security.PublicKey;
@@ -71,16 +72,18 @@ import java.util.Locale;
import java.util.Properties;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;
import static java.util.logging.Level.*;
+import org.apache.commons.io.FileUtils;
/**
* CLI entry point to Jenkins.
*
* @author Kohsuke Kawaguchi
*/
-public class CLI {
+public class CLI implements AutoCloseable {
private final ExecutorService pool;
private final Channel channel;
private final CliEntryPoint entryPoint;
@@ -89,6 +92,11 @@ public class CLI {
private final String httpsProxyTunnel;
private final String authorization;
+ /**
+ * For tests only.
+ * @deprecated Specific to {@link Mode#REMOTING}.
+ */
+ @Deprecated
public CLI(URL jenkins) throws IOException, InterruptedException {
this(jenkins,null);
}
@@ -110,34 +118,29 @@ public class CLI {
public CLI(URL jenkins, ExecutorService exec, String httpsProxyTunnel) throws IOException, InterruptedException {
this(new CLIConnectionFactory().url(jenkins).executorService(exec).httpsProxyTunnel(httpsProxyTunnel));
}
-
+
+ /**
+ * @deprecated Specific to {@link Mode#REMOTING}.
+ */
+ @Deprecated
/*package*/ CLI(CLIConnectionFactory factory) throws IOException, InterruptedException {
URL jenkins = factory.jenkins;
this.httpsProxyTunnel = factory.httpsProxyTunnel;
this.authorization = factory.authorization;
ExecutorService exec = factory.exec;
- String url = jenkins.toExternalForm();
- if(!url.endsWith("/")) url+='/';
-
ownsPool = exec==null;
- pool = exec!=null ? exec : Executors.newCachedThreadPool();
+ pool = exec!=null ? exec : Executors.newCachedThreadPool(new NamingThreadFactory(Executors.defaultThreadFactory(), "CLI.pool"));
Channel _channel;
try {
- _channel = connectViaCliPort(jenkins, getCliTcpPort(url));
+ _channel = connectViaCliPort(jenkins, getCliTcpPort(jenkins));
} catch (IOException e) {
- LOGGER.log(Level.FINE,"Failed to connect via CLI port. Falling back to HTTP",e);
+ LOGGER.log(Level.FINE, "Failed to connect via CLI port. Falling back to HTTP", e);
try {
- _channel = connectViaHttp(url);
+ _channel = connectViaHttp(jenkins);
} catch (IOException e2) {
- try { // Java 7: e.addSuppressed(e2);
- Throwable.class.getMethod("addSuppressed", Throwable.class).invoke(e, e2);
- } catch (NoSuchMethodException _ignore) {
- // Java 6
- } catch (Exception _huh) {
- LOGGER.log(Level.SEVERE, null, _huh);
- }
+ e.addSuppressed(e2);
throw e;
}
}
@@ -150,13 +153,15 @@ public class CLI {
throw new IOException(Messages.CLI_VersionMismatch());
}
- private Channel connectViaHttp(String url) throws IOException {
- LOGGER.log(FINE, "Trying to connect to {0} via HTTP", url);
- url+="cli";
- URL jenkins = new URL(url);
+ /**
+ * @deprecated Specific to {@link Mode#REMOTING}.
+ */
+ @Deprecated
+ private Channel connectViaHttp(URL url) throws IOException {
+ LOGGER.log(FINE, "Trying to connect to {0} via Remoting over HTTP", url);
- FullDuplexHttpStream con = new FullDuplexHttpStream(jenkins,authorization);
- Channel ch = new Channel("Chunked connection to "+jenkins,
+ FullDuplexHttpStream con = new FullDuplexHttpStream(url, "cli?remoting=true", authorization);
+ Channel ch = new Channel("Chunked connection to " + url,
pool,con.getInputStream(),con.getOutputStream());
final long interval = 15*1000;
final long timeout = (interval * 3) / 4;
@@ -169,8 +174,17 @@ public class CLI {
return ch;
}
+ /**
+ * @deprecated Specific to {@link Mode#REMOTING}.
+ */
+ @Deprecated
private Channel connectViaCliPort(URL jenkins, CliPort clip) throws IOException {
- LOGGER.log(FINE, "Trying to connect directly via TCP/IP to {0}", clip.endpoint);
+ LOGGER.log(FINE, "Trying to connect directly via Remoting over TCP/IP to {0}", clip.endpoint);
+
+ if (authorization != null) {
+ LOGGER.warning("-auth ignored when using JNLP agent port");
+ }
+
final Socket s = new Socket();
// this prevents a connection from silently terminated by the router in between or the other peer
// and that goes without unnoticed. However, the time out is often very long (for example 2 hours
@@ -182,9 +196,10 @@ public class CLI {
if (httpsProxyTunnel!=null) {
String[] tokens = httpsProxyTunnel.split(":");
+ LOGGER.log(Level.FINE, "Using HTTP proxy {0}:{1} to connect to CLI port", new Object[]{tokens[0], tokens[1]});
s.connect(new InetSocketAddress(tokens[0], Integer.parseInt(tokens[1])));
PrintStream o = new PrintStream(s.getOutputStream());
- o.print("CONNECT " + clip.endpoint.getHostName() + ":" + clip.endpoint.getPort() + " HTTP/1.0\r\n\r\n");
+ o.print("CONNECT " + clip.endpoint.getHostString() + ":" + clip.endpoint.getPort() + " HTTP/1.0\r\n\r\n");
// read the response from the proxy
ByteArrayOutputStream rsp = new ByteArrayOutputStream();
@@ -194,8 +209,15 @@ public class CLI {
rsp.write(ch);
}
String head = new BufferedReader(new StringReader(rsp.toString("ISO-8859-1"))).readLine();
- if (!head.startsWith("HTTP/1.0 200 "))
- throw new IOException("Failed to establish a connection through HTTP proxy: "+rsp);
+
+ if (head == null) {
+ throw new IOException("Unexpected empty response");
+ }
+ if (!(head.startsWith("HTTP/1.0 200 ") || head.startsWith("HTTP/1.1 200 "))) {
+ s.close();
+ LOGGER.log(Level.SEVERE, "Failed to tunnel the CLI port through the HTTP proxy. Falling back to HTTP.");
+ throw new IOException("Failed to establish a connection through HTTP proxy: " + rsp);
+ }
// HTTP proxies (at least the one I tried --- squid) doesn't seem to do half-close very well.
// So instead of relying on it, we'll just send the close command and then let the server
@@ -260,13 +282,14 @@ public class CLI {
/**
* If the server advertises CLI endpoint, returns its location.
+ * @deprecated Specific to {@link Mode#REMOTING}.
*/
- protected CliPort getCliTcpPort(String url) throws IOException {
- URL _url = new URL(url);
- if (_url.getHost()==null || _url.getHost().length()==0) {
+ @Deprecated
+ protected CliPort getCliTcpPort(URL url) throws IOException {
+ if (url.getHost()==null || url.getHost().length()==0) {
throw new IOException("Invalid URL: "+url);
}
- URLConnection head = _url.openConnection();
+ URLConnection head = url.openConnection();
try {
head.connect();
} catch (IOException e) {
@@ -283,9 +306,7 @@ public class CLI {
flushURLConnection(head);
if (p1==null && p2==null) {
- // we aren't finding headers we are expecting. Is this even running Jenkins?
- if (head.getHeaderField("X-Hudson")==null && head.getHeaderField("X-Jenkins")==null)
- throw new IOException("There's no Jenkins running at "+url);
+ verifyJenkinsConnection(head);
throw new IOException("No X-Jenkins-CLI2-Port among " + head.getHeaderFields().keySet());
}
@@ -294,6 +315,27 @@ public class CLI {
else return new CliPort(new InetSocketAddress(h,Integer.parseInt(p1)),identity,1);
}
+ /**
+ * Make sure the connection is open against Jenkins server.
+ *
+ * @param c The open connection.
+ * @throws IOException in case of communication problem.
+ * @throws NotTalkingToJenkinsException when connection is not made to Jenkins service.
+ */
+ /*package*/ static void verifyJenkinsConnection(URLConnection c) throws IOException {
+ if (c.getHeaderField("X-Hudson")==null && c.getHeaderField("X-Jenkins")==null)
+ throw new NotTalkingToJenkinsException(c);
+ }
+ /*package*/ static final class NotTalkingToJenkinsException extends IOException {
+ public NotTalkingToJenkinsException(String s) {
+ super(s);
+ }
+
+ public NotTalkingToJenkinsException(URLConnection c) {
+ super("There's no Jenkins running at " + c.getURL().toString());
+ }
+ }
+
/**
* Flush the supplied {@link URLConnection} input and close the
* connection nicely.
@@ -380,14 +422,11 @@ public class CLI {
}
public static void main(final String[] _args) throws Exception {
-// Logger l = Logger.getLogger(Channel.class.getName());
-// l.setLevel(ALL);
-// ConsoleHandler h = new ConsoleHandler();
-// h.setLevel(ALL);
-// l.addHandler(h);
-//
try {
System.exit(_main(_args));
+ } catch (NotTalkingToJenkinsException ex) {
+ System.err.println(ex.getMessage());
+ System.exit(3);
} catch (Throwable t) {
// if the CLI main thread die, make sure to kill the JVM.
t.printStackTrace();
@@ -395,6 +434,7 @@ public class CLI {
}
}
+ private enum Mode {HTTP, SSH, REMOTING}
public static int _main(String[] _args) throws Exception {
List args = Arrays.asList(_args);
PrivateKeyProvider provider = new PrivateKeyProvider();
@@ -408,19 +448,52 @@ public class CLI {
boolean tryLoadPKey = true;
+ Mode mode = null;
+
+ String user = null;
+ String auth = null;
+ boolean strictHostKey = false;
+
while(!args.isEmpty()) {
String head = args.get(0);
if (head.equals("-version")) {
System.out.println("Version: "+computeVersion());
return 0;
}
+ if (head.equals("-http")) {
+ if (mode != null) {
+ printUsage("-http clashes with previously defined mode " + mode);
+ return -1;
+ }
+ mode = Mode.HTTP;
+ args = args.subList(1, args.size());
+ continue;
+ }
+ if (head.equals("-ssh")) {
+ if (mode != null) {
+ printUsage("-ssh clashes with previously defined mode " + mode);
+ return -1;
+ }
+ mode = Mode.SSH;
+ args = args.subList(1, args.size());
+ continue;
+ }
+ if (head.equals("-remoting")) {
+ if (mode != null) {
+ printUsage("-remoting clashes with previously defined mode " + mode);
+ return -1;
+ }
+ mode = Mode.REMOTING;
+ args = args.subList(1, args.size());
+ continue;
+ }
if(head.equals("-s") && args.size()>=2) {
url = args.get(1);
args = args.subList(2,args.size());
continue;
}
if (head.equals("-noCertificateCheck")) {
- System.out.println("Skipping HTTPS certificate checks altogether. Note that this is not secure at all.");
+ LOGGER.info("Skipping HTTPS certificate checks altogether. Note that this is not secure at all.");
SSLContext context = SSLContext.getInstance("TLS");
context.init(null, new TrustManager[]{new NoCheckTrustManager()}, new SecureRandom());
HttpsURLConnection.setDefaultSSLSocketFactory(context.getSocketFactory());
@@ -451,11 +524,37 @@ public class CLI {
sshAuthRequestedExplicitly = true;
continue;
}
+ if (head.equals("-strictHostKey")) {
+ strictHostKey = true;
+ args = args.subList(1, args.size());
+ continue;
+ }
+ if (head.equals("-user") && args.size() >= 2) {
+ user = args.get(1);
+ args = args.subList(2, args.size());
+ continue;
+ }
+ if (head.equals("-auth") && args.size() >= 2) {
+ auth = args.get(1);
+ args = args.subList(2, args.size());
+ continue;
+ }
if(head.equals("-p") && args.size()>=2) {
httpProxy = args.get(1);
args = args.subList(2,args.size());
continue;
}
+ if (head.equals("-logger") && args.size() >= 2) {
+ Level level = parse(args.get(1));
+ for (Handler h : Logger.getLogger("").getHandlers()) {
+ h.setLevel(level);
+ }
+ for (Logger logger : new Logger[] {LOGGER, PlainCLIProtocol.LOGGER, Logger.getLogger("org.apache.sshd")}) { // perhaps also Channel
+ logger.setLevel(level);
+ }
+ args = args.subList(2, args.size());
+ continue;
+ }
break;
}
@@ -464,16 +563,53 @@ public class CLI {
return -1;
}
+ if (!url.endsWith("/")) {
+ url += '/';
+ }
+
if(args.isEmpty())
args = Arrays.asList("help"); // default to help
if (tryLoadPKey && !provider.hasKeys())
provider.readFromDefaultLocations();
+ if (mode == null) {
+ mode = Mode.HTTP;
+ }
+
+ LOGGER.log(FINE, "using connection mode {0}", mode);
+
+ if (user != null && auth != null) {
+ LOGGER.warning("-user and -auth are mutually exclusive");
+ }
+
+ if (mode == Mode.SSH) {
+ if (user == null) {
+ // TODO SshCliAuthenticator already autodetects the user based on public key; why cannot AsynchronousCommand.getCurrentUser do the same?
+ LOGGER.warning("-user required when using -ssh");
+ return -1;
+ }
+ return SSHCLI.sshConnection(url, user, args, provider, strictHostKey);
+ }
+
+ if (strictHostKey) {
+ LOGGER.warning("-strictHostKey meaningful only with -ssh");
+ }
+
+ if (user != null) {
+ LOGGER.warning("Warning: -user ignored unless using -ssh");
+ }
+
CLIConnectionFactory factory = new CLIConnectionFactory().url(url).httpsProxyTunnel(httpProxy);
String userInfo = new URL(url).getUserInfo();
if (userInfo != null) {
factory = factory.basicAuth(userInfo);
+ } else if (auth != null) {
+ factory = factory.basicAuth(auth.startsWith("@") ? FileUtils.readFileToString(new File(auth.substring(1))).trim() : auth);
+ }
+
+ if (mode == Mode.HTTP) {
+ return plainHttpConnection(url, args, factory);
}
CLI cli = factory.connect();
@@ -484,22 +620,21 @@ public class CLI {
cli.authenticate(provider.getKeys());
} catch (IllegalStateException e) {
if (sshAuthRequestedExplicitly) {
- System.err.println("The server doesn't support public key authentication");
+ LOGGER.warning("The server doesn't support public key authentication");
return -1;
}
} catch (UnsupportedOperationException e) {
if (sshAuthRequestedExplicitly) {
- System.err.println("The server doesn't support public key authentication");
+ LOGGER.warning("The server doesn't support public key authentication");
return -1;
}
} catch (GeneralSecurityException e) {
if (sshAuthRequestedExplicitly) {
- System.err.println(e.getMessage());
- LOGGER.log(FINE,e.getMessage(),e);
+ LOGGER.log(WARNING, null, e);
return -1;
}
- System.err.println("[WARN] Failed to authenticate with your SSH keys. Proceeding as anonymous");
- LOGGER.log(FINE,"Failed to authenticate with your SSH keys.",e);
+ LOGGER.warning("Failed to authenticate with your SSH keys. Proceeding as anonymous");
+ LOGGER.log(FINE, null, e);
}
}
@@ -512,6 +647,72 @@ public class CLI {
}
}
+ private static int plainHttpConnection(String url, List args, CLIConnectionFactory factory) throws IOException, InterruptedException {
+ LOGGER.log(FINE, "Trying to connect to {0} via plain protocol over HTTP", url);
+ FullDuplexHttpStream streams = new FullDuplexHttpStream(new URL(url), "cli?remoting=false", factory.authorization);
+ class ClientSideImpl extends PlainCLIProtocol.ClientSide {
+ boolean complete;
+ int exit = -1;
+ ClientSideImpl(InputStream is, OutputStream os) throws IOException {
+ super(is, os);
+ if (is.read() != 0) { // cf. FullDuplexHttpService
+ throw new IOException("expected to see initial zero byte; perhaps you are connecting to an old server which does not support -http?");
+ }
+ }
+ @Override
+ protected void onExit(int code) {
+ this.exit = code;
+ finished();
+ }
+ @Override
+ protected void onStdout(byte[] chunk) throws IOException {
+ System.out.write(chunk);
+ }
+ @Override
+ protected void onStderr(byte[] chunk) throws IOException {
+ System.err.write(chunk);
+ }
+ @Override
+ protected void handleClose() {
+ finished();
+ }
+ private synchronized void finished() {
+ complete = true;
+ notifyAll();
+ }
+ }
+ try (final ClientSideImpl connection = new ClientSideImpl(streams.getInputStream(), streams.getOutputStream())) {
+ for (String arg : args) {
+ connection.sendArg(arg);
+ }
+ connection.sendEncoding(Charset.defaultCharset().name());
+ connection.sendLocale(Locale.getDefault().toString());
+ connection.sendStart();
+ connection.begin();
+ final OutputStream stdin = connection.streamStdin();
+ new Thread("input reader") {
+ @Override
+ public void run() {
+ try {
+ int c;
+ while ((c = System.in.read()) != -1) { // TODO use InputStream.available
+ stdin.write(c);
+ }
+ connection.sendEndStdin();
+ } catch (IOException x) {
+ LOGGER.log(Level.WARNING, null, x);
+ }
+ }
+ }.start();
+ synchronized (connection) {
+ while (!connection.complete) {
+ connection.wait();
+ }
+ }
+ return connection.exit;
+ }
+ }
+
private static String computeVersion() {
Properties props = new Properties();
try {
@@ -556,7 +757,9 @@ public class CLI {
*
* @return
* identity of the server represented as a public key.
+ * @deprecated Specific to {@link Mode#REMOTING}.
*/
+ @Deprecated
public PublicKey authenticate(Iterable privateKeys) throws IOException, GeneralSecurityException {
Pipe c2s = Pipe.createLocalToRemote();
Pipe s2c = Pipe.createRemoteToLocal();
@@ -582,6 +785,10 @@ public class CLI {
}
}
+ /**
+ * @deprecated Specific to {@link Mode#REMOTING}.
+ */
+ @Deprecated
public PublicKey authenticate(KeyPair key) throws IOException, GeneralSecurityException {
return authenticate(Collections.singleton(key));
}
@@ -591,5 +798,5 @@ public class CLI {
System.err.println(Messages.CLI_Usage());
}
- private static final Logger LOGGER = Logger.getLogger(CLI.class.getName());
+ static final Logger LOGGER = Logger.getLogger(CLI.class.getName());
}
diff --git a/cli/src/main/java/hudson/cli/CLIConnectionFactory.java b/cli/src/main/java/hudson/cli/CLIConnectionFactory.java
index a2e5681039effafbb22765a249a508fe8fdb22b2..894e4c0fdac60ff446e3a67ecf68e44192d93f97 100644
--- a/cli/src/main/java/hudson/cli/CLIConnectionFactory.java
+++ b/cli/src/main/java/hudson/cli/CLIConnectionFactory.java
@@ -32,6 +32,7 @@ public class CLIConnectionFactory {
/**
* This {@link ExecutorService} is used to execute closures received from the server.
+ * Used only in Remoting mode.
*/
public CLIConnectionFactory executorService(ExecutorService es) {
this.exec = es;
@@ -59,15 +60,24 @@ public class CLIConnectionFactory {
/**
* Convenience method to call {@link #authorization} with the HTTP basic authentication.
+ * Currently unused.
*/
public CLIConnectionFactory basicAuth(String username, String password) {
return basicAuth(username+':'+password);
}
+ /**
+ * Convenience method to call {@link #authorization} with the HTTP basic authentication.
+ * Cf. {@code BasicHeaderApiTokenAuthenticator}.
+ */
public CLIConnectionFactory basicAuth(String userInfo) {
return authorization("Basic " + new String(Base64.encodeBase64((userInfo).getBytes())));
}
-
+
+ /**
+ * @deprecated Specific to Remoting-based protocol.
+ */
+ @Deprecated
public CLI connect() throws IOException, InterruptedException {
return new CLI(this);
}
diff --git a/cli/src/main/java/hudson/cli/CliEntryPoint.java b/cli/src/main/java/hudson/cli/CliEntryPoint.java
index 57bd42e553b77336c2a0db0085ae4ce0474c76b2..fe1f6c835097888be71632babbe31f1b6530fab5 100644
--- a/cli/src/main/java/hudson/cli/CliEntryPoint.java
+++ b/cli/src/main/java/hudson/cli/CliEntryPoint.java
@@ -34,7 +34,9 @@ import java.util.Locale;
* Remotable interface for CLI entry point on the server side.
*
* @author Kohsuke Kawaguchi
+ * @deprecated Specific to Remoting-based protocol.
*/
+@Deprecated
public interface CliEntryPoint {
/**
* Just like the static main method.
diff --git a/cli/src/main/java/hudson/cli/CliPort.java b/cli/src/main/java/hudson/cli/CliPort.java
index 8faab7de41bee0c88fa90cdaa0cbb8c9599f6a97..56165e766ba6186489d4e3017b0a7a35510358ab 100644
--- a/cli/src/main/java/hudson/cli/CliPort.java
+++ b/cli/src/main/java/hudson/cli/CliPort.java
@@ -8,9 +8,9 @@ import java.security.KeyFactory;
import java.security.PublicKey;
import java.security.spec.X509EncodedKeySpec;
-/**
- * @author Kohsuke Kawaguchi
- */
+ /**
+ * @deprecated Specific to Remoting mode.
+ */
public final class CliPort {
/**
* The TCP endpoint to talk to.
diff --git a/cli/src/main/java/hudson/cli/Connection.java b/cli/src/main/java/hudson/cli/Connection.java
index 1c1ada471fdbaaded6f2203ec130a7e69a671a6f..017051a64a646a76b4ecfe81966381e3874adbca 100644
--- a/cli/src/main/java/hudson/cli/Connection.java
+++ b/cli/src/main/java/hudson/cli/Connection.java
@@ -56,6 +56,9 @@ import java.security.interfaces.DSAPublicKey;
import java.security.interfaces.RSAPublicKey;
import java.security.spec.X509EncodedKeySpec;
+/**
+ * Used by Jenkins core only in deprecated Remoting-based CLI.
+ */
public class Connection {
public final InputStream in;
public final OutputStream out;
diff --git a/cli/src/main/java/hudson/cli/DiagnosedStreamCorruptionException.java b/cli/src/main/java/hudson/cli/DiagnosedStreamCorruptionException.java
new file mode 100644
index 0000000000000000000000000000000000000000..4708b425dbb77a715910ac28c67ec84aca79db0f
--- /dev/null
+++ b/cli/src/main/java/hudson/cli/DiagnosedStreamCorruptionException.java
@@ -0,0 +1,55 @@
+package hudson.cli;
+
+import java.io.PrintWriter;
+import java.io.StreamCorruptedException;
+import java.io.StringWriter;
+
+// TODO COPIED FROM hudson.remoting
+
+/**
+ * Signals a {@link StreamCorruptedException} with some additional diagnostic information.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+class DiagnosedStreamCorruptionException extends StreamCorruptedException {
+ private final Exception diagnoseFailure;
+ private final byte[] readBack;
+ private final byte[] readAhead;
+
+ DiagnosedStreamCorruptionException(Exception cause, Exception diagnoseFailure, byte[] readBack, byte[] readAhead) {
+ initCause(cause);
+ this.diagnoseFailure = diagnoseFailure;
+ this.readBack = readBack;
+ this.readAhead = readAhead;
+ }
+
+ public Exception getDiagnoseFailure() {
+ return diagnoseFailure;
+ }
+
+ public byte[] getReadBack() {
+ return readBack;
+ }
+
+ public byte[] getReadAhead() {
+ return readAhead;
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder buf = new StringBuilder();
+ buf.append(super.toString()).append("\n");
+ buf.append("Read back: ").append(HexDump.toHex(readBack)).append('\n');
+ buf.append("Read ahead: ").append(HexDump.toHex(readAhead));
+ if (diagnoseFailure!=null) {
+ StringWriter w = new StringWriter();
+ PrintWriter p = new PrintWriter(w);
+ diagnoseFailure.printStackTrace(p);
+ p.flush();
+
+ buf.append("\nDiagnosis problem:\n ");
+ buf.append(w.toString().trim().replace("\n","\n "));
+ }
+ return buf.toString();
+ }
+}
diff --git a/cli/src/main/java/hudson/cli/FlightRecorderInputStream.java b/cli/src/main/java/hudson/cli/FlightRecorderInputStream.java
new file mode 100644
index 0000000000000000000000000000000000000000..ebdd18a192fec4d2e29e25c85dbeb0c2679e40d6
--- /dev/null
+++ b/cli/src/main/java/hudson/cli/FlightRecorderInputStream.java
@@ -0,0 +1,191 @@
+package hudson.cli;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Arrays;
+
+// TODO COPIED FROM hudson.remoting
+
+/**
+ * Filter input stream that records the content as it's read, so that it can be reported
+ * in case of a catastrophic stream corruption problem.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+class FlightRecorderInputStream extends InputStream {
+
+ /**
+ * Size (in bytes) of the flight recorder ring buffer used for debugging remoting issues.
+ * @since 2.41
+ */
+ static final int BUFFER_SIZE = Integer.getInteger("hudson.remoting.FlightRecorderInputStream.BUFFER_SIZE", 1024 * 1024);
+
+ private final InputStream source;
+ private ByteArrayRingBuffer recorder = new ByteArrayRingBuffer(BUFFER_SIZE);
+
+ FlightRecorderInputStream(InputStream source) {
+ this.source = source;
+ }
+
+ /**
+ * Rewinds the record buffer and forget everything that was recorded.
+ */
+ public void clear() {
+ recorder = new ByteArrayRingBuffer(BUFFER_SIZE);
+ }
+
+ /**
+ * Gets the recorded content.
+ */
+ public byte[] getRecord() {
+ return recorder.toByteArray();
+ }
+
+ /**
+ * Creates a {@link DiagnosedStreamCorruptionException} based on the recorded content plus read ahead.
+ * The caller is responsible for throwing the exception.
+ */
+ public DiagnosedStreamCorruptionException analyzeCrash(Exception problem, String diagnosisName) {
+ final ByteArrayOutputStream readAhead = new ByteArrayOutputStream();
+ final IOException[] error = new IOException[1];
+
+ Thread diagnosisThread = new Thread(diagnosisName+" stream corruption diagnosis thread") {
+ public void run() {
+ int b;
+ try {
+ // not all InputStream will look for the thread interrupt flag, so check that explicitly to be defensive
+ while (!Thread.interrupted() && (b=source.read())!=-1) {
+ readAhead.write(b);
+ }
+ } catch (IOException e) {
+ error[0] = e;
+ }
+ }
+ };
+
+ // wait up to 1 sec to grab as much data as possible
+ diagnosisThread.start();
+ try {
+ diagnosisThread.join(1000);
+ } catch (InterruptedException ignored) {
+ // we are only waiting for a fixed amount of time, so we'll pretend like we were in a busy loop
+ Thread.currentThread().interrupt();
+ // fall through
+ }
+
+ IOException diagnosisProblem = error[0]; // capture the error, if any, before we kill the thread
+ if (diagnosisThread.isAlive())
+ diagnosisThread.interrupt(); // if it's not dead, kill
+
+ return new DiagnosedStreamCorruptionException(problem,diagnosisProblem,getRecord(),readAhead.toByteArray());
+
+ }
+
+ @Override
+ public int read() throws IOException {
+ int i = source.read();
+ if (i>=0)
+ recorder.write(i);
+ return i;
+ }
+
+ @Override
+ public int read(byte[] b, int off, int len) throws IOException {
+ len = source.read(b, off, len);
+ if (len>0)
+ recorder.write(b,off,len);
+ return len;
+ }
+
+ /**
+ * To record the bytes we've skipped, convert the call to read.
+ */
+ @Override
+ public long skip(long n) throws IOException {
+ byte[] buf = new byte[(int)Math.min(n,64*1024)];
+ return read(buf,0,buf.length);
+ }
+
+ @Override
+ public int available() throws IOException {
+ return source.available();
+ }
+
+ @Override
+ public void close() throws IOException {
+ source.close();
+ }
+
+ @Override
+ public boolean markSupported() {
+ return false;
+ }
+
+ // http://stackoverflow.com/a/3651696/12916
+ private static class ByteArrayRingBuffer extends OutputStream {
+
+ byte[] data;
+
+ int capacity, pos = 0;
+
+ boolean filled = false;
+
+ public ByteArrayRingBuffer(int capacity) {
+ data = new byte[capacity];
+ this.capacity = capacity;
+ }
+
+ @Override
+ public synchronized void write(int b) {
+ if (pos == capacity) {
+ filled = true;
+ pos = 0;
+ }
+ data[pos++] = (byte) b;
+ }
+
+ public synchronized byte[] toByteArray() {
+ if (!filled) {
+ return Arrays.copyOf(data, pos);
+ }
+ byte[] ret = new byte[capacity];
+ System.arraycopy(data, pos, ret, 0, capacity - pos);
+ System.arraycopy(data, 0, ret, capacity - pos, pos);
+ return ret;
+ }
+
+ /** @author @roadrunner2 */
+ @Override public synchronized void write(byte[] buf, int off, int len) {
+ // no point in trying to copy more than capacity; this also simplifies logic below
+ if (len > capacity) {
+ off += (len - capacity);
+ len = capacity;
+ }
+
+ // copy to buffer, but no farther than the end
+ int num = Math.min(len, capacity - pos);
+ if (num > 0) {
+ System.arraycopy(buf, off, data, pos, num);
+ off += num;
+ len -= num;
+ pos += num;
+ }
+
+ // wrap around if necessary
+ if (pos == capacity) {
+ filled = true;
+ pos = 0;
+ }
+
+ // copy anything still left
+ if (len > 0) {
+ System.arraycopy(buf, off, data, pos, len);
+ pos += len;
+ }
+ }
+
+ }
+
+}
diff --git a/cli/src/main/java/hudson/cli/FullDuplexHttpStream.java b/cli/src/main/java/hudson/cli/FullDuplexHttpStream.java
index abde9bb2022664eda42f5b28d91e9d58fbcfe04f..ef8bd5ff12cea23a0906ce9e07a6fa7843973d70 100644
--- a/cli/src/main/java/hudson/cli/FullDuplexHttpStream.java
+++ b/cli/src/main/java/hudson/cli/FullDuplexHttpStream.java
@@ -20,7 +20,7 @@ import org.apache.commons.codec.binary.Base64;
* @author Kohsuke Kawaguchi
*/
public class FullDuplexHttpStream {
- private final URL target;
+ private final URL base;
/**
* Authorization header value needed to get through the HTTP layer.
*/
@@ -49,15 +49,36 @@ public class FullDuplexHttpStream {
}
/**
- * @param target
+ * @param target something like {@code http://jenkins/cli?remoting=true}
+ * which we then need to split into {@code http://jenkins/} + {@code cli?remoting=true}
+ * in order to construct a crumb issuer request
+ * @deprecated use {@link #FullDuplexHttpStream(URL, String, String)} instead
+ */
+ @Deprecated
+ public FullDuplexHttpStream(URL target, String authorization) throws IOException {
+ this(new URL(target.toString().replaceFirst("/cli.*$", "/")), target.toString().replaceFirst("^.+/(cli.*)$", "$1"), authorization);
+ }
+
+ /**
+ * @param base the base URL of Jenkins
+ * @param relativeTarget
* The endpoint that we are making requests to.
* @param authorization
* The value of the authorization header, if non-null.
*/
- public FullDuplexHttpStream(URL target, String authorization) throws IOException {
- this.target = target;
+ public FullDuplexHttpStream(URL base, String relativeTarget, String authorization) throws IOException {
+ if (!base.toString().endsWith("/")) {
+ throw new IllegalArgumentException(base.toString());
+ }
+ if (relativeTarget.startsWith("/")) {
+ throw new IllegalArgumentException(relativeTarget);
+ }
+
+ this.base = tryToResolveRedirects(base, authorization);
this.authorization = authorization;
+ URL target = new URL(this.base, relativeTarget);
+
CrumbData crumbData = new CrumbData();
UUID uuid = UUID.randomUUID(); // so that the server can correlate those two connections
@@ -77,8 +98,9 @@ public class FullDuplexHttpStream {
con.getOutputStream().close();
input = con.getInputStream();
// make sure we hit the right URL
- if(con.getHeaderField("Hudson-Duplex")==null)
- throw new IOException(target+" doesn't look like Jenkins");
+ if (con.getHeaderField("Hudson-Duplex") == null) {
+ throw new CLI.NotTalkingToJenkinsException("There's no Jenkins running at " + target + ", or is not serving the HTTP Duplex transport");
+ }
// client->server uses chunked encoded POST for unlimited capacity.
con = (HttpURLConnection) target.openConnection();
@@ -98,6 +120,24 @@ public class FullDuplexHttpStream {
output = con.getOutputStream();
}
+ // As this transport mode is using POST, it is necessary to resolve possible redirections using GET first.
+ private URL tryToResolveRedirects(URL base, String authorization) {
+ try {
+ HttpURLConnection con = (HttpURLConnection) base.openConnection();
+ if (authorization != null) {
+ con.addRequestProperty("Authorization", authorization);
+ }
+ con.getInputStream().close();
+ base = con.getURL();
+ } catch (Exception ex) {
+ // Do not obscure the problem propagating the exception. If the problem is real it will manifest during the
+ // actual exchange so will be reported properly there. If it is not real (no permission in UI but sufficient
+ // for CLI connection using one of its mechanisms), there is no reason to bother user about it.
+ LOGGER.log(Level.FINE, "Failed to resolve potential redirects", ex);
+ }
+ return base;
+ }
+
static final int BLOCK_SIZE = 1024;
static final Logger LOGGER = Logger.getLogger(FullDuplexHttpStream.class.getName());
@@ -128,8 +168,7 @@ public class FullDuplexHttpStream {
}
private String createCrumbUrlBase() {
- String url = target.toExternalForm();
- return new StringBuilder(url.substring(0, url.lastIndexOf("/cli"))).append("/crumbIssuer/api/xml/").toString();
+ return base + "crumbIssuer/api/xml/";
}
private String readData(String dest) throws IOException {
@@ -137,8 +176,9 @@ public class FullDuplexHttpStream {
if (authorization != null) {
con.addRequestProperty("Authorization", authorization);
}
- try {
- BufferedReader reader = new BufferedReader(new InputStreamReader(con.getInputStream()));
+ CLI.verifyJenkinsConnection(con);
+
+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
String line = reader.readLine();
String nextLine = reader.readLine();
if (nextLine != null) {
diff --git a/cli/src/main/java/hudson/cli/HexDump.java b/cli/src/main/java/hudson/cli/HexDump.java
new file mode 100644
index 0000000000000000000000000000000000000000..ad37158bc16d0e7939a34831bd7628120eb61207
--- /dev/null
+++ b/cli/src/main/java/hudson/cli/HexDump.java
@@ -0,0 +1,47 @@
+package hudson.cli;
+
+// TODO COPIED FROM hudson.remoting
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+class HexDump {
+ private static final String CODE = "0123456789abcdef";
+
+ public static String toHex(byte[] buf) {
+ return toHex(buf,0,buf.length);
+ }
+ public static String toHex(byte[] buf, int start, int len) {
+ StringBuilder r = new StringBuilder(len*2);
+ boolean inText = false;
+ for (int i=0; i= 0x20 && b <= 0x7e) {
+ if (!inText) {
+ inText = true;
+ r.append('\'');
+ }
+ r.append((char) b);
+ } else {
+ if (inText) {
+ r.append("' ");
+ inText = false;
+ }
+ r.append("0x");
+ r.append(CODE.charAt((b>>4)&15));
+ r.append(CODE.charAt(b&15));
+ if (i < len - 1) {
+ if (b == 10) {
+ r.append('\n');
+ } else {
+ r.append(' ');
+ }
+ }
+ }
+ }
+ if (inText) {
+ r.append('\'');
+ }
+ return r.toString();
+ }
+}
diff --git a/cli/src/main/java/hudson/cli/PlainCLIProtocol.java b/cli/src/main/java/hudson/cli/PlainCLIProtocol.java
new file mode 100644
index 0000000000000000000000000000000000000000..17d232c87b570ab0d80069ed926a54613429451f
--- /dev/null
+++ b/cli/src/main/java/hudson/cli/PlainCLIProtocol.java
@@ -0,0 +1,354 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2017 CloudBees, Inc.
+ *
+ * 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.cli;
+
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.ReadPendingException;
+import java.util.concurrent.TimeoutException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.input.CountingInputStream;
+
+/**
+ * CLI protocol working over a plain socket-like connection, without SSH or Remoting.
+ * Each side consists of frames starting with an {@code int} length,
+ * then a {@code byte} opcode, then any opcode-specific data.
+ * The length does not count the length field itself nor the opcode, so it is nonnegative.
+ */
+class PlainCLIProtocol {
+
+ static final Logger LOGGER = Logger.getLogger(PlainCLIProtocol.class.getName());
+
+ /** One-byte operation to send to the other side. */
+ private enum Op {
+ /** UTF-8 command name or argument. */
+ ARG(true),
+ /** UTF-8 locale identifier. */
+ LOCALE(true),
+ /** UTF-8 client encoding. */
+ ENCODING(true),
+ /** Start running command. */
+ START(true),
+ /** Exit code, as int. */
+ EXIT(false),
+ /** Chunk of stdin, as int length followed by bytes. */
+ STDIN(true),
+ /** EOF on stdin. */
+ END_STDIN(true),
+ /** Chunk of stdout. */
+ STDOUT(false),
+ /** Chunk of stderr. */
+ STDERR(false);
+ /** True if sent from the client to the server; false if sent from the server to the client. */
+ final boolean clientSide;
+ Op(boolean clientSide) {
+ this.clientSide = clientSide;
+ }
+ }
+
+ static abstract class EitherSide implements Closeable {
+
+ private final CountingInputStream cis;
+ private final FlightRecorderInputStream flightRecorder;
+ final DataInputStream dis;
+ final DataOutputStream dos;
+
+ protected EitherSide(InputStream is, OutputStream os) {
+ cis = new CountingInputStream(is);
+ flightRecorder = new FlightRecorderInputStream(cis);
+ dis = new DataInputStream(flightRecorder);
+ dos = new DataOutputStream(os);
+ }
+
+ final void begin() {
+ new Reader().start();
+ }
+
+ private class Reader extends Thread {
+
+ Reader() {
+ super("PlainCLIProtocol"); // TODO set distinctive Thread.name
+ }
+
+ @Override
+ public void run() {
+ try {
+ while (true) {
+ LOGGER.finest("reading frame");
+ int framelen;
+ try {
+ framelen = dis.readInt();
+ } catch (EOFException x) {
+ handleClose();
+ break; // TODO verify that we hit EOF immediately, not partway into framelen
+ } catch (IOException x) {
+ if (x.getCause() instanceof TimeoutException) { // TODO on Tomcat this seems to be SocketTimeoutException
+ LOGGER.log(Level.FINE, "ignoring idle timeout, perhaps from Jetty", x);
+ continue;
+ } else {
+ throw x;
+ }
+ }
+ if (framelen < 0) {
+ throw new IOException("corrupt stream: negative frame length");
+ }
+ byte b = dis.readByte();
+ if (b < 0) { // i.e., >127
+ throw new IOException("corrupt stream: negative operation code");
+ }
+ if (b >= Op.values().length) {
+ LOGGER.log(Level.WARNING, "unknown operation #{0}: {1}", new Object[] {b, HexDump.toHex(flightRecorder.getRecord())});
+ IOUtils.skipFully(dis, framelen);
+ continue;
+ }
+ Op op = Op.values()[b];
+ long start = cis.getByteCount();
+ LOGGER.log(Level.FINEST, "handling frame with {0} of length {1}", new Object[] {op, framelen});
+ boolean handled = handle(op, framelen);
+ if (handled) {
+ long actuallyRead = cis.getByteCount() - start;
+ if (actuallyRead != framelen) {
+ throw new IOException("corrupt stream: expected to read " + framelen + " bytes from " + op + " but read " + actuallyRead);
+ }
+ } else {
+ LOGGER.log(Level.WARNING, "unexpected {0}: {1}", new Object[] {op, HexDump.toHex(flightRecorder.getRecord())});
+ IOUtils.skipFully(dis, framelen);
+ }
+ }
+ } catch (ClosedChannelException x) {
+ LOGGER.log(Level.FINE, null, x);
+ handleClose();
+ } catch (IOException x) {
+ LOGGER.log(Level.WARNING, null, flightRecorder.analyzeCrash(x, "broken stream"));
+ } catch (ReadPendingException x) {
+ // in case trick in CLIAction does not work
+ LOGGER.log(Level.FINE, null, x);
+ handleClose();
+ } catch (RuntimeException x) {
+ LOGGER.log(Level.WARNING, null, x);
+ handleClose();
+ }
+ }
+
+ }
+
+ protected abstract void handleClose();
+
+ protected abstract boolean handle(Op op, int framelen) throws IOException;
+
+ private void writeOp(Op op) throws IOException {
+ dos.writeByte((byte) op.ordinal());
+ }
+
+ protected final synchronized void send(Op op) throws IOException {
+ dos.writeInt(0);
+ writeOp(op);
+ dos.flush();
+ }
+
+ protected final synchronized void send(Op op, int number) throws IOException {
+ dos.writeInt(4);
+ writeOp(op);
+ dos.writeInt(number);
+ dos.flush();
+ }
+
+ protected final synchronized void send(Op op, byte[] chunk, int off, int len) throws IOException {
+ dos.writeInt(len);
+ writeOp(op);
+ dos.write(chunk, off, len);
+ dos.flush();
+ }
+
+ protected final void send(Op op, byte[] chunk) throws IOException {
+ send(op, chunk, 0, chunk.length);
+ }
+
+ protected final void send(Op op, String text) throws IOException {
+ ByteArrayOutputStream buf = new ByteArrayOutputStream();
+ new DataOutputStream(buf).writeUTF(text);
+ send(op, buf.toByteArray());
+ }
+
+ protected final byte[] readChunk(int framelen) throws IOException {
+ assert Thread.currentThread() instanceof EitherSide.Reader;
+ byte[] buf = new byte[framelen];
+ dis.readFully(buf);
+ return buf;
+ }
+
+ protected final OutputStream stream(final Op op) {
+ return new OutputStream() {
+ @Override
+ public void write(int b) throws IOException {
+ send(op, new byte[] {(byte) b});
+ }
+ @Override
+ public void write(byte[] b, int off, int len) throws IOException {
+ send(op, b, off, len);
+ }
+ @Override
+ public void write(byte[] b) throws IOException {
+ send(op, b);
+ }
+ };
+ }
+
+ @Override
+ public synchronized void close() throws IOException {
+ dos.close();
+ }
+
+ }
+
+ static abstract class ServerSide extends EitherSide {
+
+ ServerSide(InputStream is, OutputStream os) {
+ super(is, os);
+ }
+
+ @Override
+ protected final boolean handle(Op op, int framelen) throws IOException {
+ assert Thread.currentThread() instanceof EitherSide.Reader;
+ assert op.clientSide;
+ switch (op) {
+ case ARG:
+ onArg(dis.readUTF());
+ return true;
+ case LOCALE:
+ onLocale(dis.readUTF());
+ return true;
+ case ENCODING:
+ onEncoding(dis.readUTF());
+ return true;
+ case START:
+ onStart();
+ return true;
+ case STDIN:
+ onStdin(readChunk(framelen));
+ return true;
+ case END_STDIN:
+ onEndStdin();
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ protected abstract void onArg(String text);
+
+ protected abstract void onLocale(String text);
+
+ protected abstract void onEncoding(String text);
+
+ protected abstract void onStart();
+
+ protected abstract void onStdin(byte[] chunk) throws IOException;
+
+ protected abstract void onEndStdin() throws IOException;
+
+ public final void sendExit(int code) throws IOException {
+ send(Op.EXIT, code);
+ }
+
+ public final OutputStream streamStdout() {
+ return stream(Op.STDOUT);
+ }
+
+ public final OutputStream streamStderr() {
+ return stream(Op.STDERR);
+ }
+
+ }
+
+ static abstract class ClientSide extends EitherSide {
+
+ ClientSide(InputStream is, OutputStream os) {
+ super(is, os);
+ }
+
+ @Override
+ protected boolean handle(Op op, int framelen) throws IOException {
+ assert Thread.currentThread() instanceof EitherSide.Reader;
+ assert !op.clientSide;
+ switch (op) {
+ case EXIT:
+ onExit(dis.readInt());
+ return true;
+ case STDOUT:
+ onStdout(readChunk(framelen));
+ return true;
+ case STDERR:
+ onStderr(readChunk(framelen));
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ protected abstract void onExit(int code);
+
+ protected abstract void onStdout(byte[] chunk) throws IOException;
+
+ protected abstract void onStderr(byte[] chunk) throws IOException;
+
+ public final void sendArg(String text) throws IOException {
+ send(Op.ARG, text);
+ }
+
+ public final void sendLocale(String text) throws IOException {
+ send(Op.LOCALE, text);
+ }
+
+ public final void sendEncoding(String text) throws IOException {
+ send(Op.ENCODING, text);
+ }
+
+ public final void sendStart() throws IOException {
+ send(Op.START);
+ }
+
+ public final OutputStream streamStdin() {
+ return stream(Op.STDIN);
+ }
+
+ public final void sendEndStdin() throws IOException {
+ send(Op.END_STDIN);
+ }
+
+ }
+
+ private PlainCLIProtocol() {}
+
+}
diff --git a/cli/src/main/java/hudson/cli/PrivateKeyProvider.java b/cli/src/main/java/hudson/cli/PrivateKeyProvider.java
index 834bb7234250d7d7bac2bd424aba5aa670be0fda..d7753a750498aff78325fc04326eb63b7e45209d 100644
--- a/cli/src/main/java/hudson/cli/PrivateKeyProvider.java
+++ b/cli/src/main/java/hudson/cli/PrivateKeyProvider.java
@@ -30,6 +30,9 @@ import java.io.DataInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
import java.security.GeneralSecurityException;
import java.security.KeyFactory;
import java.security.KeyPair;
@@ -127,15 +130,13 @@ public class PrivateKeyProvider {
}
private static String readPemFile(File f) throws IOException{
- FileInputStream is = new FileInputStream(f);
- try {
- DataInputStream dis = new DataInputStream(is);
+ try (InputStream is = Files.newInputStream(f.toPath());
+ DataInputStream dis = new DataInputStream(is)) {
byte[] bytes = new byte[(int) f.length()];
dis.readFully(bytes);
- dis.close();
return new String(bytes);
- } finally {
- is.close();
+ } catch (InvalidPathException e) {
+ throw new IOException(e);
}
}
diff --git a/cli/src/main/java/hudson/cli/SSHCLI.java b/cli/src/main/java/hudson/cli/SSHCLI.java
new file mode 100644
index 0000000000000000000000000000000000000000..bdd6c2beb50e5e696af3467e5bae7598f41eb5ef
--- /dev/null
+++ b/cli/src/main/java/hudson/cli/SSHCLI.java
@@ -0,0 +1,133 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2017 CloudBees, Inc.
+ *
+ * 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.cli;
+
+import hudson.util.QuotedStringTokenizer;
+import java.io.IOException;
+import java.net.SocketAddress;
+import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.security.KeyPair;
+import java.security.PublicKey;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.logging.Level;
+import static java.util.logging.Level.FINE;
+import java.util.logging.Logger;
+import org.apache.sshd.client.SshClient;
+import org.apache.sshd.client.channel.ClientChannel;
+import org.apache.sshd.client.channel.ClientChannelEvent;
+import org.apache.sshd.client.future.ConnectFuture;
+import org.apache.sshd.client.keyverifier.DefaultKnownHostsServerKeyVerifier;
+import org.apache.sshd.client.keyverifier.KnownHostsServerKeyVerifier;
+import org.apache.sshd.client.keyverifier.ServerKeyVerifier;
+import org.apache.sshd.client.session.ClientSession;
+import org.apache.sshd.common.future.WaitableFuture;
+import org.apache.sshd.common.util.io.NoCloseInputStream;
+import org.apache.sshd.common.util.io.NoCloseOutputStream;
+import org.apache.sshd.common.util.security.SecurityUtils;
+
+/**
+ * Implements SSH connection mode of {@link CLI}.
+ * In a separate class to avoid any class loading of {@code sshd-core} when not using {@code -ssh} mode.
+ * That allows the {@code test} module to pick up a version of {@code sshd-core} from the {@code sshd} module via {@code jenkins-war}
+ * that may not match the version being used from the {@code cli} module and may not be compatible.
+ */
+class SSHCLI {
+
+ static int sshConnection(String jenkinsUrl, String user, List args, PrivateKeyProvider provider, final boolean strictHostKey) throws IOException {
+ Logger.getLogger(SecurityUtils.class.getName()).setLevel(Level.WARNING); // suppress: BouncyCastle not registered, using the default JCE provider
+ URL url = new URL(jenkinsUrl + "login");
+ URLConnection conn = url.openConnection();
+ CLI.verifyJenkinsConnection(conn);
+ String endpointDescription = conn.getHeaderField("X-SSH-Endpoint");
+
+ if (endpointDescription == null) {
+ CLI.LOGGER.warning("No header 'X-SSH-Endpoint' returned by Jenkins");
+ return -1;
+ }
+
+ CLI.LOGGER.log(FINE, "Connecting via SSH to: {0}", endpointDescription);
+
+ int sshPort = Integer.parseInt(endpointDescription.split(":")[1]);
+ String sshHost = endpointDescription.split(":")[0];
+
+ StringBuilder command = new StringBuilder();
+
+ for (String arg : args) {
+ command.append(QuotedStringTokenizer.quote(arg));
+ command.append(' ');
+ }
+
+ try(SshClient client = SshClient.setUpDefaultClient()) {
+
+ KnownHostsServerKeyVerifier verifier = new DefaultKnownHostsServerKeyVerifier(new ServerKeyVerifier() {
+ @Override
+ public boolean verifyServerKey(ClientSession clientSession, SocketAddress remoteAddress, PublicKey serverKey) {
+ CLI.LOGGER.log(Level.WARNING, "Unknown host key for {0}", remoteAddress.toString());
+ return !strictHostKey;
+ }
+ }, true);
+
+ client.setServerKeyVerifier(verifier);
+ client.start();
+
+ ConnectFuture cf = client.connect(user, sshHost, sshPort);
+ cf.await();
+ try (ClientSession session = cf.getSession()) {
+ for (KeyPair pair : provider.getKeys()) {
+ CLI.LOGGER.log(FINE, "Offering {0} private key", pair.getPrivate().getAlgorithm());
+ session.addPublicKeyIdentity(pair);
+ }
+ session.auth().verify(10000L);
+
+ try (ClientChannel channel = session.createExecChannel(command.toString())) {
+ channel.setIn(new NoCloseInputStream(System.in));
+ channel.setOut(new NoCloseOutputStream(System.out));
+ channel.setErr(new NoCloseOutputStream(System.err));
+ WaitableFuture wf = channel.open();
+ wf.await();
+
+ Set waitMask = channel.waitFor(Collections.singletonList(ClientChannelEvent.CLOSED), 0L);
+
+ if(waitMask.contains(ClientChannelEvent.TIMEOUT)) {
+ throw new SocketTimeoutException("Failed to retrieve command result in time: " + command);
+ }
+
+ Integer exitStatus = channel.getExitStatus();
+ return exitStatus;
+
+ }
+ } finally {
+ client.stop();
+ }
+ }
+ }
+
+ private SSHCLI() {}
+
+}
diff --git a/cli/src/main/java/hudson/cli/SequenceOutputStream.java b/cli/src/main/java/hudson/cli/SequenceOutputStream.java
deleted file mode 100644
index fb6c26523b47317af89a975c7bd67930095ccabc..0000000000000000000000000000000000000000
--- a/cli/src/main/java/hudson/cli/SequenceOutputStream.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package hudson.cli;
-
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.SequenceInputStream;
-
-/**
- * {@link OutputStream} version of {@link SequenceInputStream}.
- *
- * Provides a single {@link OutputStream} view over multiple {@link OutputStream}s (each of the fixed length.)
- *
- * @author Kohsuke Kawaguchi
- */
-abstract class SequenceOutputStream extends OutputStream {
- protected static class Block {
- final OutputStream out;
- long capacity;
-
- public Block(OutputStream out, long capacity) {
- this.out = out;
- this.capacity = capacity;
- }
- }
-
- /**
- * Current block being written.
- */
- private Block block;
-
- protected SequenceOutputStream(Block block) {
- this.block = block;
- }
-
- @Override
- public void write(byte[] b, int off, int len) throws IOException {
- while(len>0) {
- int sz = (int)Math.min(len, block.capacity);
- block.out.write(b,off,sz);
- block.capacity -=sz;
- len-=sz;
- off+=sz;
- swapIfNeeded();
- }
- }
-
- public void write(int b) throws IOException {
- block.out.write(b);
- block.capacity--;
- swapIfNeeded();
- }
-
- private void swapIfNeeded() throws IOException {
- if(block.capacity >0) return;
- block.out.close();
- block=next(block);
- }
-
- @Override
- public void flush() throws IOException {
- block.out.flush();
- }
-
- @Override
- public void close() throws IOException {
- block.out.close();
- block=null;
- }
-
- /**
- * Fetches the next {@link OutputStream} to write to,
- * along with their capacity.
- */
- protected abstract Block next(Block current) throws IOException;
-}
diff --git a/core/src/main/java/hudson/util/QuotedStringTokenizer.java b/cli/src/main/java/hudson/util/QuotedStringTokenizer.java
similarity index 100%
rename from core/src/main/java/hudson/util/QuotedStringTokenizer.java
rename to cli/src/main/java/hudson/util/QuotedStringTokenizer.java
diff --git a/cli/src/main/resources/hudson/cli/client/Messages.properties b/cli/src/main/resources/hudson/cli/client/Messages.properties
index 699b4c47381227a92f7316331cbdbc3477759213..921fe67a211da560ac75fc355179a117b3c00dc2 100644
--- a/cli/src/main/resources/hudson/cli/client/Messages.properties
+++ b/cli/src/main/resources/hudson/cli/client/Messages.properties
@@ -2,10 +2,18 @@ CLI.Usage=Jenkins CLI\n\
Usage: java -jar jenkins-cli.jar [-s URL] command [opts...] args...\n\
Options:\n\
-s URL : the server URL (defaults to the JENKINS_URL env var)\n\
- -i KEY : SSH private key file used for authentication\n\
- -p HOST:PORT : HTTP proxy host and port for HTTPS proxy tunneling. See http://jenkins-ci.org/https-proxy-tunnel\n\
+ -http : use a plain CLI protocol over HTTP(S) (the default; mutually exclusive with -ssh and -remoting)\n\
+ -ssh : use SSH protocol (requires -user; SSH port must be open on server, and user must have registered a public key)\n\
+ -remoting : use deprecated Remoting channel protocol (if enabled on server; for compatibility with legacy commands or command modes only)\n\
+ -i KEY : SSH private key file used for authentication (for use with -ssh or -remoting)\n\
+ -p HOST:PORT : HTTP proxy host and port for HTTPS proxy tunneling. See https://jenkins.io/redirect/cli-https-proxy-tunnel\n\
-noCertificateCheck : bypass HTTPS certificate check entirely. Use with caution\n\
-noKeyAuth : don't try to load the SSH authentication private key. Conflicts with -i\n\
+ -user : specify user (for use with -ssh)\n\
+ -strictHostKey : request strict host key checking (for use with -ssh)\n\
+ -logger FINE : enable detailed logging from the client\n\
+ -auth [ USER:SECRET | @FILE ] : specify username and either password or API token (or load from them both from a file);\n\
+ for use with -http, or -remoting but only when the JNLP agent port is disabled\n\
\n\
The available commands depend on the server. Run the 'help' command to\n\
see the list.
diff --git a/cli/src/main/resources/hudson/cli/client/Messages_bg.properties b/cli/src/main/resources/hudson/cli/client/Messages_bg.properties
index df0d2b57e1ac7b168809824f735bec1b102b27c4..acd0191d5c8bfbf854d5344b2d29f8463f3b55e9 100644
--- a/cli/src/main/resources/hudson/cli/client/Messages_bg.properties
+++ b/cli/src/main/resources/hudson/cli/client/Messages_bg.properties
@@ -1,6 +1,6 @@
# The MIT License
#
-# Bulgarian translation copyright 2015 Alexander Shopov .
+# Bulgarian translation: Copyright (c) 2015, 2016, Alexander Shopov
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,7 @@ CLI.Usage=\
\u0441\u0440\u0435\u0434\u0430\u0442\u0430 \u201eJENKINS_URL\u201c)\n\
-i \u041a\u041b\u042e\u0427 : \u0447\u0430\u0441\u0442\u0435\u043d \u043a\u043b\u044e\u0447 \u0437\u0430 SSH \u0437\u0430 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f\n\
-p \u0425\u041e\u0421\u0422:\u041f\u041e\u0420\u0422 : \u0445\u043e\u0441\u0442 \u0438 \u043f\u043e\u0440\u0442 \u0437\u0430 \u0441\u044a\u0440\u0432\u044a\u0440-\u043f\u043e\u0441\u0440\u0435\u0434\u043d\u0438\u043a \u043f\u043e HTTP \u0437\u0430 \u0442\u0443\u043d\u0435\u043b \u043f\u043e HTTPS.\n\
- \u0417\u0430 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f: http://jenkins-ci.org/https-proxy-tunnel\n\
+ \u0417\u0430 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f: https://jenkins.io/redirect/cli-https-proxy-tunnel\n\
-noCertificateCheck : \u0431\u0435\u0437 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043d\u0430 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430 \u0437\u0430 HTTPS (\u0412\u041d\u0418\u041c\u0410\u041d\u0418\u0415!)\n\
-noKeyAuth : \u0431\u0435\u0437 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u0441 \u0447\u0430\u0441\u0442\u0435\u043d \u043a\u043b\u044e\u0447 \u0437\u0430 SSH, \u043e\u043f\u0446\u0438\u044f\u0442\u0430 \u0435\n\
\u043d\u0435\u0441\u044a\u0432\u043c\u0435\u0441\u0442\u0438\u043c\u0430 \u0441 \u043e\u043f\u0446\u0438\u044f\u0442\u0430 \u201e-i\u201c\n\n\
diff --git a/cli/src/main/resources/hudson/cli/client/Messages_de.properties b/cli/src/main/resources/hudson/cli/client/Messages_de.properties
index aa7972afa42fbb6dd99737ad46b7f3e32c7e6217..70b91e222f0240ecbd2390eb7867765e0a6c3e69 100644
--- a/cli/src/main/resources/hudson/cli/client/Messages_de.properties
+++ b/cli/src/main/resources/hudson/cli/client/Messages_de.properties
@@ -2,12 +2,13 @@
CLI.Usage=Jenkins Kommandozeilenschnittstelle (Jenkins CLI)\n\
Verwendung: java -jar jenkins-cli.jar [-s URL] command [opts...] args...\n\
Optionen:\n\
- -s URL : URL des Hudson-Servers (Wert der Umgebungsvariable JENKINS_URL ist der Vorgabewert)\n\
- -i KEY : Datei mit privatem SSH-Schlssel zur Authentisierung\n\
- -p HOST\:PORT : HTTP-Proxy-Host und -Port fr HTTPS-Proxy-Tunnel. Siehe http://jenkins-ci.org/https-proxy-tunnel\n\
- -noCertificateCheck : berspringt die Zertifikatsprfung bei HTTPS. Bitte mit Vorsicht einsetzen.\n\
+ -s URL : URL des Jenkins-Servers (Wert der Umgebungsvariable JENKINS_URL ist der Vorgabewert)\n\
+ -i KEY : Datei mit privatem SSH-Schl\u00FCssel zur Authentisierung\n\
+ -p HOST\:PORT : HTTP-Proxy-Host und -Port f\u00FCr HTTPS-Proxy-Tunnel. Siehe https://jenkins.io/redirect/cli-https-proxy-tunnel\n\
+ -noCertificateCheck : \u00DCberspringt die Zertifikatspr\u00FCfung bei HTTPS. Bitte mit Vorsicht einsetzen.\n\
+ -noKeyAuth : \u00DCberspringt die Authentifizierung mit einem privaten SSH-Schl\u00FCssel. Nicht kombinierbar mit -i\n\
\n\
- Die verfgbaren Kommandos hngen vom kontaktierten Server ab. Verwenden Sie das Kommando help, um eine Liste aller verfgbaren Kommandos anzuzeigen.
+ Die verf\u00FCgbaren Kommandos h\u00E4ngen vom kontaktierten Server ab. Verwenden Sie das Kommando help, um eine Liste aller verf\u00FCgbaren Kommandos anzuzeigen.
CLI.NoURL=Weder die Option -s noch eine Umgebungsvariable JENKINS_URL wurde spezifiziert.
CLI.NoSuchFileExists=Diese Datei existiert nicht {0}
CLI.VersionMismatch=Versionskonflikt: Diese Version von Jenkins CLI ist nicht mit dem kontaktierten Jenkins-Server kompatibel.
diff --git a/cli/src/main/resources/hudson/cli/client/Messages_fr.properties b/cli/src/main/resources/hudson/cli/client/Messages_fr.properties
new file mode 100644
index 0000000000000000000000000000000000000000..99fe0930f0d8df074c43e5a44ee25cf212381cff
--- /dev/null
+++ b/cli/src/main/resources/hudson/cli/client/Messages_fr.properties
@@ -0,0 +1,14 @@
+CLI.Usage=Jenkins CLI\n\
+ Utilisation: java -jar jenkins-cli.jar [-s URL] command [opts...] args...\n\
+ Options:\n\
+ -s URL : l''URL du serveur (par d\u00e9faut : variable d environnement JENKINS_URL)\n\
+ -i KEY : fichier de la cl\u00e9 priv\u00e9e SSH \u00e0 utiliser pour l''authentification\n\
+ -p HOST:PORT : h\u00f4te et port des proxys HTTP et HTTPS. Voir https://jenkins.io/redirect/cli-https-proxy-tunnel\n\
+ -noCertificateCheck : contourne enti\u00e9rement la v\u00e9rification des certificats HTTPS. A utiliser avec pr\u00e9caution\n\
+ -noKeyAuth : ne charge pas la cl\u00e9 priv\u00e9e d''authentification SSH. En conflit avec -i\n\
+ \n\
+ Les commandes disponibles d\u00e9pendent du serveur. Lancer la commande 'help' pour\n\
+ obtenir la liste.
+CLI.NoURL=Erreur, ni -s ou la variable d''environnement JENKINS_URL ne sont renseign\u00e9es.
+CLI.VersionMismatch=Conflit de versions. Cet outil ne peut fonctionner avec le serveur Jenkins renseign\u00e9.
+CLI.NoSuchFileExists=Ce fichier n''existe pas: {0}
diff --git a/cli/src/main/resources/hudson/cli/client/Messages_pt_BR.properties b/cli/src/main/resources/hudson/cli/client/Messages_pt_BR.properties
index 61e1895c4dfb7d5dd96cf0dd4723671fb60c673a..779e88f1a6ecfe5230b2e29d84e4191a8c1de443 100644
--- a/cli/src/main/resources/hudson/cli/client/Messages_pt_BR.properties
+++ b/cli/src/main/resources/hudson/cli/client/Messages_pt_BR.properties
@@ -26,7 +26,7 @@ CLI.Usage=Jenkins CLI\n\
Op\u00e7\u00f5es:\n\
-s URL : a URL do servidor (por padr\u00e3o a vari\u00e1vel de ambiente JENKINS_URL \u00e9 usada)\n\
-i KEY : arquivo contendo a chave SSH privada usada para autentica\u00e7\u00e3o\n\
- -p HOST:PORT : host e porta do proxy HTTP para tunelamento de proxy HTTPS. Veja http://jenkins-ci.org/https-proxy-tunnel\n\
+ -p HOST:PORT : host e porta do proxy HTTP para tunelamento de proxy HTTPS. Veja https://jenkins.io/redirect/cli-https-proxy-tunnel\n\
-noCertificateCheck : ignora completamente a valida\u00e7\u00e3o dos certificados HTTPS. Use com cautela\n\
-noKeyAuth : n\u00e3o tenta carregar a chave privada para autentica\u00e7\u00e3o SSH. Conflita com -i\n\
\n\
diff --git a/cli/src/main/resources/hudson/cli/client/Messages_zh_TW.properties b/cli/src/main/resources/hudson/cli/client/Messages_zh_TW.properties
index af303db03487aba6d903487ef308bae13d859464..4a9068624434d8c2bd6ef77c3fefe778c5fea59e 100644
--- a/cli/src/main/resources/hudson/cli/client/Messages_zh_TW.properties
+++ b/cli/src/main/resources/hudson/cli/client/Messages_zh_TW.properties
@@ -28,7 +28,7 @@ CLI.Usage=Jenkins CLI\n\
\u9078\u9805:\n\
-s URL : \u4f3a\u670d\u5668 URL (\u9810\u8a2d\u503c\u70ba JENKINS_URL \u74b0\u5883\u8b8a\u6578)\n\
-i KEY : \u9a57\u8b49\u7528\u7684 SSH \u79c1\u9470\u6a94\n\
- -p HOST:PORT : \u5efa HTTPS Proxy Tunnel \u7684 HTTP \u4ee3\u7406\u4f3a\u670d\u5668\u4e3b\u6a5f\u53ca\u9023\u63a5\u57e0\u3002\u8acb\u53c3\u8003 http://jenkins-ci.org/https-proxy-tunnel\n\
+ -p HOST:PORT : \u5efa HTTPS Proxy Tunnel \u7684 HTTP \u4ee3\u7406\u4f3a\u670d\u5668\u4e3b\u6a5f\u53ca\u9023\u63a5\u57e0\u3002\u8acb\u53c3\u8003 https://jenkins.io/redirect/cli-https-proxy-tunnel\n\
-noCertificateCheck : \u5b8c\u5168\u7565\u904e HTTPS \u6191\u8b49\u6aa2\u67e5\u3002\u8acb\u5c0f\u5fc3\u4f7f\u7528\n\
\n\
\u53ef\u7528\u7684\u6307\u4ee4\u53d6\u6c7a\u65bc\u4f3a\u670d\u5668\u3002\u57f7\u884c 'help' \u6307\u4ee4\u53ef\u4ee5\u67e5\u770b\u5b8c\u6574\u6e05\u55ae\u3002
diff --git a/cli/src/test/java/hudson/cli/PlainCLIProtocolTest.java b/cli/src/test/java/hudson/cli/PlainCLIProtocolTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..4663fbafd5e0aa1a05852562ef8c8560f3d0cac3
--- /dev/null
+++ b/cli/src/test/java/hudson/cli/PlainCLIProtocolTest.java
@@ -0,0 +1,132 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2017 CloudBees, Inc.
+ *
+ * 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.cli;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+public class PlainCLIProtocolTest {
+
+ @Test
+ public void ignoreUnknownOperations() throws Exception {
+ final PipedOutputStream upload = new PipedOutputStream();
+ final PipedOutputStream download = new PipedOutputStream();
+ class Client extends PlainCLIProtocol.ClientSide {
+ int code = -1;
+ final ByteArrayOutputStream stdout = new ByteArrayOutputStream();
+ Client() throws IOException {
+ super(new PipedInputStream(download), upload);
+ }
+ @Override
+ protected synchronized void onExit(int code) {
+ this.code = code;
+ notifyAll();
+ }
+ @Override
+ protected void onStdout(byte[] chunk) throws IOException {
+ stdout.write(chunk);
+ }
+ @Override
+ protected void onStderr(byte[] chunk) throws IOException {}
+ @Override
+ protected void handleClose() {}
+ void send() throws IOException {
+ sendArg("command");
+ sendStart();
+ streamStdin().write("hello".getBytes());
+ }
+ void newop() throws IOException {
+ dos.writeInt(0);
+ dos.writeByte(99);
+ dos.flush();
+ }
+ }
+ class Server extends PlainCLIProtocol.ServerSide {
+ String arg;
+ boolean started;
+ final ByteArrayOutputStream stdin = new ByteArrayOutputStream();
+ Server() throws IOException {
+ super(new PipedInputStream(upload), download);
+ }
+ @Override
+ protected void onArg(String text) {
+ arg = text;
+ }
+ @Override
+ protected void onLocale(String text) {}
+ @Override
+ protected void onEncoding(String text) {}
+ @Override
+ protected synchronized void onStart() {
+ started = true;
+ notifyAll();
+ }
+ @Override
+ protected void onStdin(byte[] chunk) throws IOException {
+ stdin.write(chunk);
+ }
+ @Override
+ protected void onEndStdin() throws IOException {}
+ @Override
+ protected void handleClose() {}
+ void send() throws IOException {
+ streamStdout().write("goodbye".getBytes());
+ sendExit(2);
+ }
+ void newop() throws IOException {
+ dos.writeInt(0);
+ dos.writeByte(99);
+ dos.flush();
+ }
+ }
+ Client client = new Client();
+ Server server = new Server();
+ client.begin();
+ server.begin();
+ client.send();
+ client.newop();
+ synchronized (server) {
+ while (!server.started) {
+ server.wait();
+ }
+ }
+ server.newop();
+ server.send();
+ synchronized (client) {
+ while (client.code == -1) {
+ client.wait();
+ }
+ }
+ assertEquals("hello", server.stdin.toString());
+ assertEquals("command", server.arg);
+ assertEquals("goodbye", client.stdout.toString());
+ assertEquals(2, client.code);
+ }
+
+}
diff --git a/cli/src/test/java/hudson/cli/PrivateKeyProviderTest.java b/cli/src/test/java/hudson/cli/PrivateKeyProviderTest.java
index 376b1fa815f3f62988f741c93a63f2f2d090563a..86970265089b4bf41cb7bc4aae7d6e320447d21a 100644
--- a/cli/src/test/java/hudson/cli/PrivateKeyProviderTest.java
+++ b/cli/src/test/java/hudson/cli/PrivateKeyProviderTest.java
@@ -57,7 +57,7 @@ public class PrivateKeyProviderTest {
final File dsaKey = keyFile(".ssh/id_dsa");
final File rsaKey = keyFile(".ssh/id_rsa");
- run("-i", dsaKey.getAbsolutePath(), "-i", rsaKey.getAbsolutePath(), "-s", "http://example.com");
+ run("-remoting", "-i", dsaKey.getAbsolutePath(), "-i", rsaKey.getAbsolutePath(), "-s", "http://example.com");
verify(cli).authenticate(withKeyPairs(
keyPair(dsaKey),
@@ -73,7 +73,7 @@ public class PrivateKeyProviderTest {
final File dsaKey = keyFile(".ssh/id_dsa");
fakeHome();
- run("-s", "http://example.com");
+ run("-remoting", "-s", "http://example.com");
verify(cli).authenticate(withKeyPairs(
keyPair(rsaKey),
diff --git a/core/move-l10n.groovy b/core/move-l10n.groovy
index d774ec50d4817573f8d4ba37a33632745a1f63b9..c52e66ae53aecf6318efc70b079e6777df580bd6 100644
--- a/core/move-l10n.groovy
+++ b/core/move-l10n.groovy
@@ -13,6 +13,7 @@ for (p in new File(resDir, oldview).parentFile.listFiles()) {
def n = p.name;
if (n == "${basename}.properties" || n.startsWith("${basename}_") && n.endsWith(".properties")) {
def lines = p.readLines('ISO-8859-1');
+ // TODO does not handle multiline values correctly
def matches = lines.findAll({it.startsWith("${key}=")});
if (!matches.isEmpty()) {
lines.removeAll(matches);
@@ -24,6 +25,7 @@ for (p in new File(resDir, oldview).parentFile.listFiles()) {
} else {
def nue = new File(resDir, newview + n.substring(basename.length()));
println("moving ${matches.size()} matches from ${n} to ${nue.name}");
+ // TODO if the original lacked a trailing newline, this will corrupt previously final key
nue.withWriterAppend('ISO-8859-1') {out ->
matches.each {line -> out.writeLine(line)}
}
diff --git a/core/pom.xml b/core/pom.xml
index 59be9513829c152b023923cc8aeb677e734a88da..c486ebd0bb640b4b71f5b4ca9aa99a27527749e3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
org.jenkins-ci.mainpom
- 1.648-SNAPSHOT
+ 2.74-SNAPSHOTjenkins-core
@@ -39,9 +39,11 @@ THE SOFTWARE.
true
- 1.237
+ 1.2522.5.6.SEC03
- 1.8.9
+ 2.4.11
+
+ true
@@ -63,7 +65,7 @@ THE SOFTWARE.
org.jenkins-civersion-number
- 1.1
+ 1.4org.jenkins-ci
@@ -93,6 +95,12 @@ THE SOFTWARE.
com.google.injectguice
+
+
+ com.google.guava
+ guava
+
+
@@ -103,7 +111,7 @@ THE SOFTWARE.
com.github.jnrjnr-posix
- 3.0.1
+ 3.0.41org.kohsuke
@@ -113,7 +121,7 @@ THE SOFTWARE.
org.jenkins-citrilead-ssh2
- build217-jenkins-8
+ build-217-jenkins-11org.kohsuke.stapler
@@ -147,7 +155,7 @@ THE SOFTWARE.
org.kohsukewindows-package-checker
- 1.0
+ 1.2org.kohsuke.stapler
@@ -157,7 +165,7 @@ THE SOFTWARE.
org.kohsuke.staplerstapler-adjunct-timeline
- 1.4
+ 1.5org.kohsuke.stapler
@@ -195,7 +203,7 @@ THE SOFTWARE.
org.jenkins-ciannotation-indexer
- 1.7
+ 1.12org.jenkins-ci
@@ -210,7 +218,7 @@ THE SOFTWARE.
org.jvnet.localizerlocalizer
- 1.23
+ 1.24antlr
@@ -243,8 +251,8 @@ THE SOFTWARE.
javax.servlet
- servlet-api
- 2.4
+ javax.servlet-api
+ 3.1.0provided
@@ -411,13 +419,13 @@ THE SOFTWARE.
jlinejline
- 1.0
+ 2.12compileorg.fusesource.jansijansi
- 1.9
+ 1.11commons-codec
@@ -568,7 +581,6 @@ THE SOFTWARE.
org.kohsukeaccess-modifier-annotation
- 1.4
@@ -585,9 +597,9 @@ THE SOFTWARE.
- org.mindrot
- jbcrypt
- 0.3m
+ org.mindrot
+ jbcrypt
+ 0.4
@@ -599,10 +611,21 @@ THE SOFTWARE.
/usr/local/yjp/lib/yjp.jar
-
- com.google.guava
- guava
-
+
+ com.google.guava
+ guava
+
+
+ com.google.code.findbugs
+ jsr305
+
+
+
+
+ com.google.guava
+ guava-testlib
+ test
+ com.jcraft
@@ -640,6 +663,7 @@ THE SOFTWARE.
generate-taglib-interface
+ record-core-location
@@ -689,6 +713,7 @@ THE SOFTWARE.
Messages.propertiestarget/generated-sources/localizer
+ true
@@ -696,7 +721,6 @@ THE SOFTWARE.
org.kohsukeaccess-modifier-checker
-
@@ -747,7 +771,7 @@ THE SOFTWARE.
com.sun.winswwinsw
- 1.16
+ 2.1.0binexe${project.build.outputDirectory}/windows-service
@@ -763,7 +787,7 @@ THE SOFTWARE.
0.5Ctrue
- -XX:MaxPermSize=128m -noverify
+ -noverify
@@ -798,6 +822,10 @@ THE SOFTWARE.
+
+ org.codehaus.mojo
+ findbugs-maven-plugin
+
@@ -834,21 +862,9 @@ THE SOFTWARE.
release
-
- org.codehaus.mojo
- apt-maven-plugin
-
-
-
-
- process
-
-
-
-
@@ -873,20 +889,12 @@ THE SOFTWARE.
+
findbugs
-
-
-
- org.codehaus.mojo
- findbugs-maven-plugin
-
- Max
- High
- src/findbugs-filter.xml
-
-
-
-
+
+
+ true
+
diff --git a/core/src/build-script/Cobertura.groovy b/core/src/build-script/Cobertura.groovy
index 073f6291b77c10c07ad948a47a264997e1c7069f..49b773b49ba17e79fa74975cf8a0b20d42153143 100644
--- a/core/src/build-script/Cobertura.groovy
+++ b/core/src/build-script/Cobertura.groovy
@@ -56,7 +56,6 @@ public class Cobertura {
}
sysproperty(key:"net.sourceforge.cobertura.datafile",value:ser)
sysproperty(key:"hudson.ClassicPluginStrategy.useAntClassLoader",value:"true")
- jvmarg(value:"-XX:MaxPermSize=128m")
}
}
diff --git a/core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_bg.properties b/core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_bg.properties
new file mode 100644
index 0000000000000000000000000000000000000000..95e74685ada811e8f8b8e5855fbc99b66847d304
--- /dev/null
+++ b/core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_bg.properties
@@ -0,0 +1,32 @@
+# The MIT License
+#
+# Bulgarian translation: Copyright (c) 2015, 2016, Alexander Shopov
+#
+# 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.
+
+NewVersionAvailable=\
+ \u041d\u043e\u0432\u0430\u0442\u0430 \u0432\u0435\u0440\u0441\u0438\u044f \u043d\u0430 Jenkins ({0}) \u0435 \u043d\u0430\u043b\u0438\u0447\u043d\u0430 \u0437\u0430 \u0438\u0437\u0442\u0435\u0433\u043b\u044f\u043d\u0435\
+ (\u0441\u043f\u0438\u0441\u044a\u043a \u0441 \u043f\u0440\u043e\u043c\u0435\u043d\u0438\u0442\u0435).
+UpgradeComplete=\
+ \u041e\u0431\u043d\u043e\u0432\u044f\u0432\u0430\u043d\u0435\u0442\u043e \u043a\u044a\u043c \u043d\u043e\u0432\u0430\u0442\u0430 \u0432\u0435\u0440\u0441\u0438\u044f Jenkins {0} \u043f\u0440\u0438\u043a\u043b\u044e\u0447\u0438. \u0422\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0440\u0435\u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u0442\u0435.
+UpgradeCompleteRestartNotSupported=\
+\u041e\u0431\u043d\u043e\u0432\u044f\u0432\u0430\u043d\u0435\u0442\u043e \u043a\u044a\u043c \u043d\u043e\u0432\u0430\u0442\u0430 \u0432\u0435\u0440\u0441\u0438\u044f Jenkins {0} \u043f\u0440\u0438\u043a\u043b\u044e\u0447\u0438. \u0422\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0440\u0435\u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u0442\u0435.
+UpgradeProgress=\u0418\u0437\u043f\u044a\u043b\u043d\u044f\u0432\u0430 \u0441\u0435 \u043e\u0431\u043d\u043e\u0432\u044f\u0432\u0430\u043d\u0435 \u043a\u044a\u043c Jenkins {0}.
+UpgradeFailed=\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u043e\u0431\u043d\u043e\u0432\u044f\u0432\u0430\u043d\u0435 \u043a\u044a\u043c Jenkins {0}: {1}.
diff --git a/core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_id.properties b/core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_id.properties
deleted file mode 100644
index c28903b2ddf3ae2e9e532bb7006518699b72bf77..0000000000000000000000000000000000000000
--- a/core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_id.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file is under the MIT License by authors
-
-NewVersionAvailable=Versi baru Jenkins ({0}) tersedia untuk diunduh (catatan perubahan).
-Or\ Upgrade\ Automatically=Atau Perbarui Secara Otomatis
diff --git a/core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pl.properties b/core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pl.properties
index 6f5ff479b3092c96f38a93a2f6fb46a126fead29..18a2cbe3c311f03744e1c92f180bddd06a09461a 100644
--- a/core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pl.properties
+++ b/core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pl.properties
@@ -1,6 +1,25 @@
-# This file is under the MIT License by authors
-
+# The MIT License
+#
+# Copyright (c) 2013-2016, Kohsuke Kawaguchi, Damian Szczepanik
+#
+# 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.
NewVersionAvailable=Nowa wersja Jenkinsa ({0}) jest dost\u0119pna do pobrania (historia zmian).
-Or\ Upgrade\ Automatically=Albo uaktualnij automatycznie
+Or\ Upgrade\ Automatically=Uaktualnij automatycznie
UpgradeCompleteRestartNotSupported=Aktualizacja Jenkinsa do wersji {0} zako\u0144czy\u0142a si\u0119 pomy\u015Blnie, oczekiwanie na ponowne uruchomienie.
UpgradeProgress=Aktualizacja Jenkinsa do wersji {0} trwa lub nie powiod\u0142a si\u0119.
diff --git a/core/src/main/java/hudson/AbortException.java b/core/src/main/java/hudson/AbortException.java
index 41a10739eb16075a27a26a6704923fa45432d131..b68276e8eec12409624d20932aa3c7c58f30391c 100644
--- a/core/src/main/java/hudson/AbortException.java
+++ b/core/src/main/java/hudson/AbortException.java
@@ -32,7 +32,7 @@ import java.io.IOException;
*
* @author Kohsuke Kawaguchi
*/
-public final class AbortException extends IOException {
+public class AbortException extends IOException {
public AbortException() {
}
diff --git a/core/src/main/java/hudson/AboutJenkins.java b/core/src/main/java/hudson/AboutJenkins.java
index 42332f9a920c5db3aeba241ac6df58824aeaacb9..34fc120e57272e4983e4d51b6f393e7306e579f5 100644
--- a/core/src/main/java/hudson/AboutJenkins.java
+++ b/core/src/main/java/hudson/AboutJenkins.java
@@ -2,6 +2,8 @@ package hudson;
import hudson.model.ManagementLink;
import java.net.URL;
+
+import org.jenkinsci.Symbol;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -10,7 +12,7 @@ import org.kohsuke.accmod.restrictions.NoExternalUse;
*
* @author Kohsuke Kawaguchi
*/
-@Extension
+@Extension @Symbol("about")
public class AboutJenkins extends ManagementLink {
@Override
public String getIconFileName() {
diff --git a/core/src/main/java/hudson/AbstractMarkupText.java b/core/src/main/java/hudson/AbstractMarkupText.java
index ed7e319711040b7bbb8ba657a7e1227dca85d626..1e78b3e10cfadca15f5745415141a6d4d8edf4dc 100644
--- a/core/src/main/java/hudson/AbstractMarkupText.java
+++ b/core/src/main/java/hudson/AbstractMarkupText.java
@@ -72,8 +72,8 @@ public abstract class AbstractMarkupText {
* Adds a start tag and end tag at the specified position.
*
*
- * For example, if the text was "abc", then addMarkup(1,2,"<b>","</b>")
- * would generate "a<b>b</b>c"
+ * For example, if the text was "abc", then {@code addMarkup(1,2,"","")}
+ * would generate {@code"abc"}
*/
public abstract void addMarkup( int startPos, int endPos, String startTag, String endTag );
diff --git a/core/src/main/java/hudson/BulkChange.java b/core/src/main/java/hudson/BulkChange.java
index db48db3de78cacd7f96ffde7305d1bc9ae787aa0..28b9fde4261074ca2e4828534139d16e18c8f464 100644
--- a/core/src/main/java/hudson/BulkChange.java
+++ b/core/src/main/java/hudson/BulkChange.java
@@ -25,6 +25,7 @@ package hudson;
import hudson.model.Saveable;
+import java.io.Closeable;
import java.io.IOException;
/**
@@ -35,28 +36,13 @@ import java.io.IOException;
* The usage of {@link BulkChange} needs to follow a specific closure-like pattern, namely:
*
*
- * BulkChange bc = new BulkChange(someObject);
- * try {
+ * try (BulkChange bc = new BulkChange(someObject)) {
* ... make changes to 'someObject'
- * } finally {
* bc.commit();
* }
*
*
*
- * ... or if you'd like to avoid saving when something bad happens:
- *
- *
- * BulkChange bc = new BulkChange(someObject);
- * try {
- * ... make changes to 'someObject'
- * bc.commit();
- * } finally {
- * bc.abort();
- * }
- *
- *
- *
* Use of this method is optional. If {@link BulkChange} is not used, individual mutator
* will perform the save operation, and things will just run somewhat slower.
*
@@ -68,7 +54,7 @@ import java.io.IOException;
*
*
*
- * Mutater methods should invoke {@code this.save()} so that if the method is called outside
+ * Mutator methods should invoke {@code this.save()} so that if the method is called outside
* a {@link BulkChange}, the result will be saved immediately.
*
*
@@ -82,7 +68,7 @@ import java.io.IOException;
* @author Kohsuke Kawaguchi
* @since 1.249
*/
-public class BulkChange {
+public class BulkChange implements Closeable {
private final Saveable saveable;
public final Exception allocator;
private final BulkChange parent;
@@ -92,7 +78,7 @@ public class BulkChange {
public BulkChange(Saveable saveable) {
this.parent = current();
this.saveable = saveable;
- // rememeber who allocated this object in case
+ // remember who allocated this object in case
// someone forgot to call save() at the end.
allocator = new Exception();
@@ -112,6 +98,14 @@ public class BulkChange {
saveable.save();
}
+ /**
+ * Alias for {@link #abort()} to make {@link BulkChange} auto-closeable.
+ */
+ @Override
+ public void close() {
+ abort();
+ }
+
/**
* Exits the scope of {@link BulkChange} without saving the changes.
*
diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index b90e6fcfda9e99415c00cd17932ee69c16407be9..5981ade06904c23de2c75603ec328476db760fe3 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -23,6 +23,12 @@
*/
package hudson;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
+
+import jenkins.util.AntWithFindResourceClassLoader;
+import jenkins.util.SystemProperties;
import com.google.common.collect.Lists;
import hudson.Plugin.DummyImpl;
import hudson.PluginWrapper.Dependency;
@@ -56,8 +62,6 @@ import java.io.FileInputStream;
import java.io.FilenameFilter;
import java.io.IOException;
import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
@@ -74,6 +78,10 @@ import java.util.jar.Manifest;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.jenkinsci.bytecode.Transformer;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+
+import javax.annotation.Nonnull;
import static org.apache.commons.io.FilenameUtils.getBaseName;
@@ -104,11 +112,8 @@ public class ClassicPluginStrategy implements PluginStrategy {
if (isLinked(archive)) {
manifest = loadLinkedManifest(archive);
} else {
- JarFile jf = new JarFile(archive, false);
- try {
+ try (JarFile jf = new JarFile(archive, false)) {
manifest = jf.getManifest();
- } finally {
- jf.close();
}
}
return PluginWrapper.computeShortName(manifest, archive.getName());
@@ -123,11 +128,10 @@ public class ClassicPluginStrategy implements PluginStrategy {
try {
// Locate the manifest
String firstLine;
- FileInputStream manifestHeaderInput = new FileInputStream(archive);
- try {
+ try (InputStream manifestHeaderInput = Files.newInputStream(archive.toPath())) {
firstLine = IOUtils.readFirstLine(manifestHeaderInput, "UTF-8");
- } finally {
- manifestHeaderInput.close();
+ } catch (InvalidPathException e) {
+ throw new IOException(e);
}
if (firstLine.startsWith("Manifest-Version:")) {
// this is the manifest already
@@ -137,11 +141,10 @@ public class ClassicPluginStrategy implements PluginStrategy {
}
// Read the manifest
- FileInputStream manifestInput = new FileInputStream(archive);
- try {
+ try (InputStream manifestInput = Files.newInputStream(archive.toPath())) {
return new Manifest(manifestInput);
- } finally {
- manifestInput.close();
+ } catch (InvalidPathException e) {
+ throw new IOException(e);
}
} catch (IOException e) {
throw new IOException("Failed to load " + archive, e);
@@ -162,7 +165,8 @@ public class ClassicPluginStrategy implements PluginStrategy {
if (archive.isDirectory()) {// already expanded
expandDir = archive;
} else {
- expandDir = new File(archive.getParentFile(), getBaseName(archive.getName()));
+ File f = pluginManager.getWorkDir();
+ expandDir = new File(f == null ? archive.getParentFile() : f, getBaseName(archive.getName()));
explode(archive, expandDir);
}
@@ -172,11 +176,10 @@ public class ClassicPluginStrategy implements PluginStrategy {
"Plugin installation failed. No manifest at "
+ manifestFile);
}
- FileInputStream fin = new FileInputStream(manifestFile);
- try {
+ try (InputStream fin = Files.newInputStream(manifestFile.toPath())) {
manifest = new Manifest(fin);
- } finally {
- fin.close();
+ } catch (InvalidPathException e) {
+ throw new IOException(e);
}
}
@@ -193,28 +196,17 @@ public class ClassicPluginStrategy implements PluginStrategy {
baseResourceURL = resolve(archive,atts.getValue("Resource-Path")).toURI().toURL();
} else {
File classes = new File(expandDir, "WEB-INF/classes");
- if (classes.exists())
+ if (classes.exists()) { // should not normally happen, due to createClassJarFromWebInfClasses
+ LOGGER.log(Level.WARNING, "Deprecated unpacked classes directory found in {0}", classes);
paths.add(classes);
+ }
File lib = new File(expandDir, "WEB-INF/lib");
File[] libs = lib.listFiles(JAR_FILTER);
if (libs != null)
paths.addAll(Arrays.asList(libs));
- try {
- Class pathJDK7 = Class.forName("java.nio.file.Path");
- Object toPath = File.class.getMethod("toPath").invoke(expandDir);
- URI uri = (URI) pathJDK7.getMethod("toUri").invoke(toPath);
-
- baseResourceURL = uri.toURL();
- } catch (NoSuchMethodException e) {
- throw new Error(e);
- } catch (ClassNotFoundException e) {
- baseResourceURL = expandDir.toURI().toURL();
- } catch (InvocationTargetException e) {
- throw new Error(e);
- } catch (IllegalAccessException e) {
- throw new Error(e);
- }
+ baseResourceURL = expandDir.toPath().toUri().toURL();
+
}
File disableFile = new File(archive.getPath() + ".disabled");
if (disableFile.exists()) {
@@ -235,8 +227,8 @@ public class ClassicPluginStrategy implements PluginStrategy {
}
}
}
- for (DetachedPlugin detached : DETACHED_LIST)
- detached.fix(atts,optionalDependencies);
+
+ fix(atts,optionalDependencies);
// Register global classpath mask. This is useful for hiding JavaEE APIs that you might see from the container,
// such as database plugin for JPA support. The Mask-Classes attribute is insufficient because those classes
@@ -254,6 +246,41 @@ public class ClassicPluginStrategy implements PluginStrategy {
createClassLoader(paths, dependencyLoader, atts), disableFile, dependencies, optionalDependencies);
}
+ private static void fix(Attributes atts, List optionalDependencies) {
+ String pluginName = atts.getValue("Short-Name");
+
+ String jenkinsVersion = atts.getValue("Jenkins-Version");
+ if (jenkinsVersion==null)
+ jenkinsVersion = atts.getValue("Hudson-Version");
+
+ optionalDependencies.addAll(getImpliedDependencies(pluginName, jenkinsVersion));
+ }
+
+ /**
+ * Returns all the plugin dependencies that are implicit based on a particular Jenkins version
+ * @since 2.0
+ */
+ @Nonnull
+ public static List getImpliedDependencies(String pluginName, String jenkinsVersion) {
+ List out = new ArrayList<>();
+ for (DetachedPlugin detached : DETACHED_LIST) {
+ // don't fix the dependency for itself, or else we'll have a cycle
+ if (detached.shortName.equals(pluginName)) {
+ continue;
+ }
+ if (BREAK_CYCLES.contains(pluginName + '/' + detached.shortName)) {
+ LOGGER.log(Level.FINE, "skipping implicit dependency {0} → {1}", new Object[] {pluginName, detached.shortName});
+ continue;
+ }
+ // some earlier versions of maven-hpi-plugin apparently puts "null" as a literal in Hudson-Version. watch out for them.
+ if (jenkinsVersion == null || jenkinsVersion.equals("null") || new VersionNumber(jenkinsVersion).compareTo(detached.splitWhen) <= 0) {
+ out.add(new PluginWrapper.Dependency(detached.shortName + ':' + detached.requiredVersion));
+ LOGGER.log(Level.FINE, "adding implicit dependency {0} → {1} because of {2}", new Object[] {pluginName, detached.shortName, jenkinsVersion});
+ }
+ }
+ return out;
+ }
+
@Deprecated
protected ClassLoader createClassLoader(List paths, ClassLoader parent) throws IOException {
return createClassLoader( paths, parent, null );
@@ -279,10 +306,66 @@ public class ClassicPluginStrategy implements PluginStrategy {
return classLoader;
}
+ /**
+ * Get the list of all plugins that have ever been {@link DetachedPlugin detached} from Jenkins core.
+ * @return A {@link List} of {@link DetachedPlugin}s.
+ */
+ @Restricted(NoExternalUse.class)
+ public static @Nonnull List getDetachedPlugins() {
+ return DETACHED_LIST;
+ }
+
+ /**
+ * Get the list of plugins that have been detached since a specific Jenkins release version.
+ * @param since The Jenkins version.
+ * @return A {@link List} of {@link DetachedPlugin}s.
+ */
+ @Restricted(NoExternalUse.class)
+ public static @Nonnull List getDetachedPlugins(@Nonnull VersionNumber since) {
+ List detachedPlugins = new ArrayList<>();
+
+ for (DetachedPlugin detachedPlugin : DETACHED_LIST) {
+ if (!detachedPlugin.getSplitWhen().isOlderThan(since)) {
+ detachedPlugins.add(detachedPlugin);
+ }
+ }
+
+ return detachedPlugins;
+ }
+
+ /**
+ * Is the named plugin a plugin that was detached from Jenkins at some point in the past.
+ * @param pluginId The plugin ID.
+ * @return {@code true} if the plugin is a plugin that was detached from Jenkins at some
+ * point in the past, otherwise {@code false}.
+ */
+ @Restricted(NoExternalUse.class)
+ public static boolean isDetachedPlugin(@Nonnull String pluginId) {
+ for (DetachedPlugin detachedPlugin : DETACHED_LIST) {
+ if (detachedPlugin.getShortName().equals(pluginId)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
/**
* Information about plugins that were originally in the core.
+ *
+ * A detached plugin is one that has any of the following characteristics:
+ *
+ *
+ * Was an existing plugin that at some time previously bundled with the Jenkins war file.
+ *
+ *
+ * Was previous code in jenkins core that was split to a separate-plugin (but may not have
+ * ever been bundled in a jenkins war file - i.e. it gets split after this 2.0 update).
+ *
+ *
*/
- private static final class DetachedPlugin {
+ @Restricted(NoExternalUse.class)
+ public static final class DetachedPlugin {
private final String shortName;
/**
* Plugins built for this Jenkins version (and earlier) will automatically be assumed to have
@@ -292,50 +375,58 @@ public class ClassicPluginStrategy implements PluginStrategy {
* be "1.123.*" (because 1.124 will be the first version that doesn't include the removed code.)
*/
private final VersionNumber splitWhen;
- private final String requireVersion;
+ private final String requiredVersion;
- private DetachedPlugin(String shortName, String splitWhen, String requireVersion) {
+ private DetachedPlugin(String shortName, String splitWhen, String requiredVersion) {
this.shortName = shortName;
this.splitWhen = new VersionNumber(splitWhen);
- this.requireVersion = requireVersion;
+ this.requiredVersion = requiredVersion;
}
- private void fix(Attributes atts, List optionalDependencies) {
- // don't fix the dependency for yourself, or else we'll have a cycle
- String yourName = atts.getValue("Short-Name");
- if (shortName.equals(yourName)) return;
- if (BREAK_CYCLES.contains(yourName + '/' + shortName)) {
- LOGGER.log(Level.FINE, "skipping implicit dependency {0} → {1}", new Object[] {yourName, shortName});
- return;
- }
+ /**
+ * Get the short name of the plugin.
+ * @return The short name of the plugin.
+ */
+ public String getShortName() {
+ return shortName;
+ }
- // some earlier versions of maven-hpi-plugin apparently puts "null" as a literal in Hudson-Version. watch out for them.
- String jenkinsVersion = atts.getValue("Jenkins-Version");
- if (jenkinsVersion==null)
- jenkinsVersion = atts.getValue("Hudson-Version");
- if (jenkinsVersion == null || jenkinsVersion.equals("null") || new VersionNumber(jenkinsVersion).compareTo(splitWhen) <= 0) {
- optionalDependencies.add(new PluginWrapper.Dependency(shortName + ':' + requireVersion));
- LOGGER.log(Level.FINE, "adding implicit dependency {0} → {1} because of {2}", new Object[] {yourName, shortName, jenkinsVersion});
- }
+ /**
+ * Get the Jenkins version from which the plugin was detached.
+ * @return The Jenkins version from which the plugin was detached.
+ */
+ public VersionNumber getSplitWhen() {
+ return splitWhen;
+ }
+
+ /**
+ * Gets the minimum required version for the current version of Jenkins.
+ *
+ * @return the minimum required version for the current version of Jenkins.
+ * @since 2.16
+ */
+ public VersionNumber getRequiredVersion() {
+ return new VersionNumber(requiredVersion);
}
}
- private static final List DETACHED_LIST = Arrays.asList(
- new DetachedPlugin("maven-plugin","1.296","1.296"),
- new DetachedPlugin("subversion","1.310","1.0"),
- new DetachedPlugin("cvs","1.340","0.1"),
- new DetachedPlugin("ant","1.430.*","1.0"),
- new DetachedPlugin("javadoc","1.430.*","1.0"),
- new DetachedPlugin("external-monitor-job","1.467.*","1.0"),
- new DetachedPlugin("ldap","1.467.*","1.0"),
- new DetachedPlugin("pam-auth","1.467.*","1.0"),
- new DetachedPlugin("mailer","1.493.*","1.2"),
- new DetachedPlugin("matrix-auth","1.535.*","1.0.2"),
- new DetachedPlugin("windows-slaves","1.547.*","1.0"),
- new DetachedPlugin("antisamy-markup-formatter","1.553.*","1.0"),
- new DetachedPlugin("matrix-project","1.561.*","1.0"),
- new DetachedPlugin("junit","1.577.*","1.0")
- );
+ private static final List DETACHED_LIST = Collections.unmodifiableList(Arrays.asList(
+ new DetachedPlugin("maven-plugin", "1.296", "1.296"),
+ new DetachedPlugin("subversion", "1.310", "1.0"),
+ new DetachedPlugin("cvs", "1.340", "0.1"),
+ new DetachedPlugin("ant", "1.430.*", "1.0"),
+ new DetachedPlugin("javadoc", "1.430.*", "1.0"),
+ new DetachedPlugin("external-monitor-job", "1.467.*", "1.0"),
+ new DetachedPlugin("ldap", "1.467.*", "1.0"),
+ new DetachedPlugin("pam-auth", "1.467.*", "1.0"),
+ new DetachedPlugin("mailer", "1.493.*", "1.2"),
+ new DetachedPlugin("matrix-auth", "1.535.*", "1.0.2"),
+ new DetachedPlugin("windows-slaves", "1.547.*", "1.0"),
+ new DetachedPlugin("antisamy-markup-formatter", "1.553.*", "1.0"),
+ new DetachedPlugin("matrix-project", "1.561.*", "1.0"),
+ new DetachedPlugin("junit", "1.577.*", "1.0"),
+ new DetachedPlugin("bouncycastle-api", "2.16.*", "2.16.0")
+ ));
/** Implicit dependencies that are known to be unnecessary and which must be cut out to prevent a dependency cycle among bundled plugins. */
private static final Set BREAK_CYCLES = new HashSet(Arrays.asList(
@@ -420,13 +511,9 @@ public class ClassicPluginStrategy implements PluginStrategy {
throw new IOException(className+" doesn't extend from hudson.Plugin");
}
wrapper.setPlugin((Plugin) o);
- } catch (LinkageError e) {
+ } catch (LinkageError | ClassNotFoundException e) {
throw new IOException("Unable to load " + className + " from " + wrapper.getShortName(),e);
- } catch (ClassNotFoundException e) {
- throw new IOException("Unable to load " + className + " from " + wrapper.getShortName(),e);
- } catch (IllegalAccessException e) {
- throw new IOException("Unable to create instance of " + className + " from " + wrapper.getShortName(),e);
- } catch (InstantiationException e) {
+ } catch (IllegalAccessException | InstantiationException e) {
throw new IOException("Unable to create instance of " + className + " from " + wrapper.getShortName(),e);
}
}
@@ -560,14 +647,13 @@ public class ClassicPluginStrategy implements PluginStrategy {
final long dirTime = archive.lastModified();
// this ZipOutputStream is reused and not created for each directory
- final ZipOutputStream wrappedZOut = new ZipOutputStream(new NullOutputStream()) {
+ try (ZipOutputStream wrappedZOut = new ZipOutputStream(new NullOutputStream()) {
@Override
public void putNextEntry(ZipEntry ze) throws IOException {
ze.setTime(dirTime+1999); // roundup
super.putNextEntry(ze);
}
- };
- try {
+ }) {
Zip z = new Zip() {
/**
* Forces the fixed timestamp for directories to make sure
@@ -586,8 +672,9 @@ public class ClassicPluginStrategy implements PluginStrategy {
z.setDestFile(classesJar);
z.add(mapper);
z.execute();
- } finally {
- wrappedZOut.close();
+ }
+ if (classesJar.isFile()) {
+ LOGGER.log(Level.WARNING, "Created {0}; update plugin to a version created with a newer harness", classesJar);
}
}
@@ -745,55 +832,11 @@ public class ClassicPluginStrategy implements PluginStrategy {
/**
* {@link AntClassLoader} with a few methods exposed, {@link Closeable} support, and {@link Transformer} support.
*/
- private final class AntClassLoader2 extends AntClassLoader implements Closeable {
- private final Vector pathComponents;
-
+ private final class AntClassLoader2 extends AntWithFindResourceClassLoader implements Closeable {
private AntClassLoader2(ClassLoader parent) {
- super(parent,true);
-
- try {
- Field $pathComponents = AntClassLoader.class.getDeclaredField("pathComponents");
- $pathComponents.setAccessible(true);
- pathComponents = (Vector)$pathComponents.get(this);
- } catch (NoSuchFieldException e) {
- throw new Error(e);
- } catch (IllegalAccessException e) {
- throw new Error(e);
- }
- }
-
-
- public void addPathFiles(Collection paths) throws IOException {
- for (File f : paths)
- addPathFile(f);
+ super(parent, true);
}
-
- public void close() throws IOException {
- cleanup();
- }
-
- /**
- * As of 1.8.0, {@link AntClassLoader} doesn't implement {@link #findResource(String)}
- * in any meaningful way, which breaks fast lookup. Implement it properly.
- */
- @Override
- protected URL findResource(String name) {
- URL url = null;
-
- // try and load from this loader if the parent either didn't find
- // it or wasn't consulted.
- Enumeration e = pathComponents.elements();
- while (e.hasMoreElements() && url == null) {
- File pathComponent = (File) e.nextElement();
- url = getResourceURL(pathComponent, name);
- if (url != null) {
- log("Resource " + name + " loaded from ant loader", Project.MSG_DEBUG);
- }
- }
-
- return url;
- }
-
+
@Override
protected Class defineClassFromData(File container, byte[] classData, String classname) throws IOException {
if (!DISABLE_TRANSFORMER)
@@ -802,7 +845,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
}
}
- public static boolean useAntClassLoader = Boolean.getBoolean(ClassicPluginStrategy.class.getName()+".useAntClassLoader");
+ public static boolean useAntClassLoader = SystemProperties.getBoolean(ClassicPluginStrategy.class.getName()+".useAntClassLoader");
private static final Logger LOGGER = Logger.getLogger(ClassicPluginStrategy.class.getName());
- public static boolean DISABLE_TRANSFORMER = Boolean.getBoolean(ClassicPluginStrategy.class.getName()+".noBytecodeTransformer");
+ public static boolean DISABLE_TRANSFORMER = SystemProperties.getBoolean(ClassicPluginStrategy.class.getName()+".noBytecodeTransformer");
}
diff --git a/core/src/main/java/hudson/DNSMultiCast.java b/core/src/main/java/hudson/DNSMultiCast.java
index b1f7d0b5e0c0b9844659a2af23d7a6f6bc1f8fb6..aa71b2e23b2be38ba799c7d3f3742e9442a5c550 100644
--- a/core/src/main/java/hudson/DNSMultiCast.java
+++ b/core/src/main/java/hudson/DNSMultiCast.java
@@ -1,5 +1,6 @@
package hudson;
+import jenkins.util.SystemProperties;
import jenkins.model.Jenkins;
import jenkins.model.Jenkins.MasterComputer;
@@ -87,5 +88,5 @@ public class DNSMultiCast implements Closeable {
private static final Logger LOGGER = Logger.getLogger(DNSMultiCast.class.getName());
- public static boolean disabled = Boolean.getBoolean(DNSMultiCast.class.getName()+".disabled");
+ public static boolean disabled = SystemProperties.getBoolean(DNSMultiCast.class.getName()+".disabled");
}
diff --git a/core/src/main/java/hudson/DependencyRunner.java b/core/src/main/java/hudson/DependencyRunner.java
index acf035676910ad3ac77f6e4b3164ed7358fc0f39..03efea55e4036a69b1b3297e083c8a3a86a351af 100644
--- a/core/src/main/java/hudson/DependencyRunner.java
+++ b/core/src/main/java/hudson/DependencyRunner.java
@@ -59,7 +59,7 @@ public class DependencyRunner implements Runnable {
Set topLevelProjects = new HashSet();
// Get all top-level projects
LOGGER.fine("assembling top level projects");
- for (AbstractProject p : Jenkins.getInstance().getAllItems(AbstractProject.class))
+ for (AbstractProject p : Jenkins.getInstance().allItems(AbstractProject.class))
if (p.getUpstreamProjects().size() == 0) {
LOGGER.fine("adding top level project " + p.getName());
topLevelProjects.add(p);
diff --git a/core/src/main/java/hudson/DescriptorExtensionList.java b/core/src/main/java/hudson/DescriptorExtensionList.java
index 513c557d44c7c11bcbd0c62c891d83f03997adeb..16d96ae441b0ff5a7cc4a3e59e8398db0cc595a4 100644
--- a/core/src/main/java/hudson/DescriptorExtensionList.java
+++ b/core/src/main/java/hudson/DescriptorExtensionList.java
@@ -39,6 +39,7 @@ import hudson.tasks.Publisher;
import java.util.Collection;
import java.util.List;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -182,6 +183,11 @@ public class DescriptorExtensionList, D extends Descrip
*/
@Override
protected List> load() {
+ if (jenkins == null) {
+ // Should never happen on the real instance
+ LOGGER.log(Level.WARNING, "Cannot load extension components, because Jenkins instance has not been assigned yet");
+ return Collections.emptyList();
+ }
return _load(jenkins.getExtensionList(Descriptor.class).getComponents());
}
diff --git a/core/src/main/java/hudson/EnvVars.java b/core/src/main/java/hudson/EnvVars.java
index c0047b557836d7865e14c4f9ee7919d04dd39c4b..1849ecbf66aebaf6ca6a4df5ce197b5b825c8b36 100644
--- a/core/src/main/java/hudson/EnvVars.java
+++ b/core/src/main/java/hudson/EnvVars.java
@@ -43,6 +43,7 @@ import java.util.Arrays;
import java.util.TreeSet;
import java.util.UUID;
import java.util.logging.Logger;
+import javax.annotation.Nonnull;
/**
* Environment variables.
@@ -63,7 +64,7 @@ import java.util.logging.Logger;
*
*
* In Jenkins, often we need to build up "environment variable overrides"
- * on master, then to execute the process on slaves. This causes a problem
+ * on master, then to execute the process on agents. This causes a problem
* when working with variables like PATH. So to make this work,
* we introduce a special convention PATH+FOO — all entries
* that starts with PATH+ are merged and prepended to the inherited
@@ -88,7 +89,7 @@ public class EnvVars extends TreeMap {
super(CaseInsensitiveComparator.INSTANCE);
}
- public EnvVars(Map m) {
+ public EnvVars(@Nonnull Map m) {
this();
putAll(m);
@@ -100,7 +101,7 @@ public class EnvVars extends TreeMap {
}
}
- public EnvVars(EnvVars m) {
+ public EnvVars(@Nonnull EnvVars m) {
// this constructor is so that in future we can get rid of the downcasting.
this((Map)m);
}
@@ -134,7 +135,7 @@ public class EnvVars extends TreeMap {
String v = get(realKey);
if(v==null) v=value;
else {
- // we might be handling environment variables for a slave that can have different path separator
+ // we might be handling environment variables for a agent that can have different path separator
// than the master, so the following is an attempt to get it right.
// it's still more error prone that I'd like.
char ch = platform==null ? File.pathSeparatorChar : platform.pathSeparator;
@@ -210,13 +211,15 @@ public class EnvVars extends TreeMap {
private final Comparator comparator;
+ @Nonnull
private final EnvVars target;
+ @Nonnull
private final Map overrides;
private Map> refereeSetMap;
private List orderedVariableNames;
- public OverrideOrderCalculator(EnvVars target, Map overrides) {
+ public OverrideOrderCalculator(@Nonnull EnvVars target, @Nonnull Map overrides) {
comparator = target.comparator();
this.target = target;
this.overrides = overrides;
@@ -323,9 +326,9 @@ public class EnvVars extends TreeMap {
/**
* Overrides all values in the map by the given map. Expressions in values will be expanded.
* See {@link #override(String, String)}.
- * @return this
+ * @return {@code this}
*/
- public EnvVars overrideExpandingAll(Map all) {
+ public EnvVars overrideExpandingAll(@Nonnull Map all) {
for (String key : new OverrideOrderCalculator(this, all).getOrderedVariableNames()) {
override(key, expand(all.get(key)));
}
@@ -421,8 +424,8 @@ public class EnvVars extends TreeMap {
* variables only when you access this from the master.
*
*
- * If you access this field from slaves, then this is the environment
- * variable of the slave agent.
+ * If you access this field from agents, then this is the environment
+ * variable of the agent agent.
*/
public static final Map masterEnvVars = initMaster();
diff --git a/core/src/main/java/hudson/Extension.java b/core/src/main/java/hudson/Extension.java
index 5ad913ef6ad39a1e8f2c35168c0863e48ec31221..1ca863d2f4f5cbdf46c66ede57c9e59920e5781b 100644
--- a/core/src/main/java/hudson/Extension.java
+++ b/core/src/main/java/hudson/Extension.java
@@ -74,7 +74,8 @@ public @interface Extension {
/**
* Used for sorting extensions.
*
- * Extensions will be sorted in the descending order of the ordinal.
+ * Extensions will be sorted in the descending order of the ordinal. In other words,
+ * the extensions with the highest numbers will be chosen first.
* This is a rather poor approach to the problem, so its use is generally discouraged.
*
* @since 1.306
diff --git a/core/src/main/java/hudson/ExtensionFinder.java b/core/src/main/java/hudson/ExtensionFinder.java
index 1a61b4d64a6dd01cc759d30f891bac4d705b6a60..6208f6cec8322a0145f2fc4436519000d07e0ce6 100644
--- a/core/src/main/java/hudson/ExtensionFinder.java
+++ b/core/src/main/java/hudson/ExtensionFinder.java
@@ -175,7 +175,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
* from here.
*
*
- * See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6459208 for how to force a class initialization.
+ * See https://bugs.openjdk.java.net/browse/JDK-4993813 for how to force a class initialization.
* Also see http://kohsuke.org/2010/09/01/deadlock-that-you-cant-avoid/ for how class initialization
* can results in a dead lock.
*/
@@ -282,7 +282,6 @@ public abstract class ExtensionFinder implements ExtensionPoint {
LOGGER.log(Level.SEVERE, "Failed to create Guice container from all the plugins",e);
// failing to load all bindings are disastrous, so recover by creating minimum that works
// by just including the core
- // TODO this recovery is pretty much useless; startup crashes anyway
container = Guice.createInjector(new SezpozModule(loadSezpozIndices(Jenkins.class.getClassLoader())));
}
@@ -423,10 +422,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
public T get() {
try {
return base.get();
- } catch (Exception e) {
- error(key, e);
- return null;
- } catch (LinkageError e) {
+ } catch (Exception | LinkageError e) {
error(key, e);
return null;
}
@@ -435,7 +431,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
if (verbose) {
LOGGER.log(Level.WARNING, "Failed to instantiate " + key + "; skipping this component", x);
} else {
- LOGGER.log(Level.WARNING, "Failed to instantiate optional component {0}; skipping", key.getTypeLiteral());
+ LOGGER.log(Level.INFO, "Failed to instantiate optional component {0}; skipping", key.getTypeLiteral());
LOGGER.log(Level.FINE, key.toString(), x);
}
}
@@ -479,7 +475,11 @@ public abstract class ExtensionFinder implements ExtensionPoint {
m.invoke(ecl, c);
c.getConstructors();
c.getMethods();
- c.getFields();
+ for (Field f : c.getFields()) {
+ if (f.getAnnotation(javax.inject.Inject.class) != null || f.getAnnotation(com.google.inject.Inject.class) != null) {
+ resolve(f.getType());
+ }
+ }
LOGGER.log(Level.FINER, "{0} looks OK", c);
while (c != Object.class) {
c.getGenericSuperclass();
@@ -493,10 +493,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
@SuppressWarnings({"unchecked", "ChainOfInstanceofChecks"})
@Override
protected void configure() {
- int id=0;
-
for (final IndexItem item : index) {
- id++;
boolean optional = isOptional(item.annotation());
try {
AnnotatedElement e = item.element();
@@ -521,8 +518,8 @@ public abstract class ExtensionFinder implements ExtensionPoint {
resolve(extType);
- // use arbitrary id to make unique key, because Guice wants that.
- Key key = Key.get(extType, Names.named(String.valueOf(id)));
+ // make unique key, because Guice wants that.
+ Key key = Key.get(extType, Names.named(item.className() + "." + item.memberName()));
annotations.put(key,a);
bind(key).toProvider(new Provider() {
public Object get() {
@@ -668,8 +665,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
extType = ((Method)e).getReturnType();
} else
throw new AssertionError();
- // according to http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6459208
- // this appears to be the only way to force a class initialization
+ // according to JDK-4993813 this is the only way to force class initialization
Class.forName(extType.getName(),true,extType.getClassLoader());
} catch (Exception | LinkageError e) {
LOGGER.log(logLevel(item), "Failed to scout "+item.className(), e);
diff --git a/core/src/main/java/hudson/ExtensionList.java b/core/src/main/java/hudson/ExtensionList.java
index 46447fbcdabaffddfb0716b0cbbb94a73569f073..f2fcab81d403e63588322b73ceacae33dce66617 100644
--- a/core/src/main/java/hudson/ExtensionList.java
+++ b/core/src/main/java/hudson/ExtensionList.java
@@ -46,6 +46,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import jenkins.util.io.OnMaster;
/**
* Retains the known extension instances for the given type 'T'.
@@ -68,7 +69,7 @@ import javax.annotation.Nonnull;
* @see jenkins.model.Jenkins#getExtensionList(Class)
* @see jenkins.model.Jenkins#getDescriptorList(Class)
*/
-public class ExtensionList extends AbstractList {
+public class ExtensionList extends AbstractList implements OnMaster {
/**
* @deprecated as of 1.417
* Use {@link #jenkins}
@@ -203,6 +204,21 @@ public class ExtensionList extends AbstractList {
}
}
+ @Override
+ public boolean removeAll(Collection c) {
+ boolean removed = false;
+ try {
+ for (Object o : c) {
+ removed |= removeSync(o);
+ }
+ return removed;
+ } finally {
+ if (extensions != null && removed) {
+ fireOnChangeListeners();
+ }
+ }
+ }
+
private synchronized boolean removeSync(Object o) {
boolean removed = removeComponent(legacyInstances, o);
if(extensions!=null) {
@@ -390,14 +406,14 @@ public class ExtensionList extends AbstractList {
/**
* Gets the extension list for a given type.
* Normally calls {@link Jenkins#getExtensionList(Class)} but falls back to an empty list
- * in case {@link Jenkins#getInstance} is null.
+ * in case {@link Jenkins#getInstanceOrNull()} is null.
* Thus it is useful to call from {@code all()} methods which need to behave gracefully during startup or shutdown.
* @param type the extension point type
* @return some list
* @since 1.572
*/
public static @Nonnull ExtensionList lookup(Class type) {
- Jenkins j = Jenkins.getInstance();
+ Jenkins j = Jenkins.getInstanceOrNull();
return j == null ? create((Jenkins) null, type) : j.getExtensionList(type);
}
diff --git a/core/src/main/java/hudson/ExtensionListView.java b/core/src/main/java/hudson/ExtensionListView.java
index 59b81ffd95869297d20ea67694b923652235812d..100dad6fb758520864230cd18157b52bc062986e 100644
--- a/core/src/main/java/hudson/ExtensionListView.java
+++ b/core/src/main/java/hudson/ExtensionListView.java
@@ -23,6 +23,7 @@
*/
package hudson;
+import hudson.tasks.UserNameResolver;
import jenkins.model.Jenkins;
import hudson.util.CopyOnWriteList;
diff --git a/core/src/main/java/hudson/ExtensionPoint.java b/core/src/main/java/hudson/ExtensionPoint.java
index f49a5a096cc7ba2b6671b3ec8a0dd5b23746f3a2..e544ed7576ad411694e868a149dbf2ee1a6971b2 100644
--- a/core/src/main/java/hudson/ExtensionPoint.java
+++ b/core/src/main/java/hudson/ExtensionPoint.java
@@ -29,6 +29,7 @@ import static java.lang.annotation.ElementType.TYPE;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
+import jenkins.util.io.OnMaster;
/**
* Marker interface that designates extensible components
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index 9690c39cd0d03cef537a76aa399c7ed2bced97b1..cd3fa60451c232c8ce42d1536a16430a08206075 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -25,6 +25,7 @@
*/
package hudson;
+import com.google.common.annotations.VisibleForTesting;
import com.jcraft.jzlib.GZIPInputStream;
import com.jcraft.jzlib.GZIPOutputStream;
import hudson.Launcher.LocalLauncher;
@@ -57,28 +58,9 @@ import hudson.util.IOUtils;
import hudson.util.NamingThreadFactory;
import hudson.util.io.Archiver;
import hudson.util.io.ArchiverFactory;
-import jenkins.FilePathFilter;
-import jenkins.MasterToSlaveFileCallable;
-import jenkins.SlaveToMasterFileCallable;
-import jenkins.SoloFilePathFilter;
-import jenkins.model.Jenkins;
-import jenkins.util.ContextResettingExecutorService;
-import jenkins.util.VirtualFile;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.io.input.CountingInputStream;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.zip.ZipEntry;
-import org.apache.tools.zip.ZipFile;
-import org.kohsuke.stapler.Stapler;
-
-import javax.annotation.CheckForNull;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
@@ -91,9 +73,12 @@ import java.io.RandomAccessFile;
import java.io.Serializable;
import java.io.Writer;
import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.net.URLConnection;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
@@ -111,23 +96,45 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-
-import static hudson.FilePath.TarCompression.*;
-import static hudson.Util.*;
+import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import jenkins.FilePathFilter;
+import jenkins.MasterToSlaveFileCallable;
+import jenkins.SlaveToMasterFileCallable;
+import jenkins.SoloFilePathFilter;
+import jenkins.model.Jenkins;
import jenkins.security.MasterToSlaveCallable;
+import jenkins.util.ContextResettingExecutorService;
+import jenkins.util.SystemProperties;
+import jenkins.util.VirtualFile;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.io.input.CountingInputStream;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.zip.ZipEntry;
+import org.apache.tools.zip.ZipFile;
import org.jenkinsci.remoting.RoleChecker;
import org.jenkinsci.remoting.RoleSensitive;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.Stapler;
+
+import static hudson.FilePath.TarCompression.GZIP;
+import static hudson.Util.deleteFile;
+import static hudson.Util.fixEmpty;
+import static hudson.Util.isSymlink;
+import java.util.Collections;
/**
* {@link File} like object with remoting support.
*
*
* Unlike {@link File}, which always implies a file path on the current computer,
- * {@link FilePath} represents a file path on a specific slave or the master.
+ * {@link FilePath} represents a file path on a specific agent or the master.
*
* Despite that, {@link FilePath} can be used much like {@link File}. It exposes
* a bunch of operations (and we should add more operations as long as they are
@@ -162,7 +169,7 @@ import org.jenkinsci.remoting.RoleSensitive;
* }
* // if 'file' is on a different node, this FileCallable will
* // be transferred to that node and executed there.
- * private static final class Freshen implements FileCallable<Void> {
+ * private static final class Freshen implements FileCallable<Void> {
* private static final long serialVersionUID = 1;
* @Override public Void invoke(File f, VirtualChannel channel) {
* // f and file represent the same thing
@@ -188,22 +195,27 @@ import org.jenkinsci.remoting.RoleSensitive;
* @see VirtualFile
*/
public final class FilePath implements Serializable {
+ /**
+ * Maximum http redirects we will follow. This defaults to the same number as Firefox/Chrome tolerates.
+ */
+ private static final int MAX_REDIRECTS = 20;
+
/**
* When this {@link FilePath} represents the remote path,
* this field is always non-null on master (the field represents
- * the channel to the remote slave.) When transferred to a slave via remoting,
+ * the channel to the remote agent.) When transferred to a agent via remoting,
* this field reverts back to null, since it's transient.
*
* When this {@link FilePath} represents a path on the master,
- * this field is null on master. When transferred to a slave via remoting,
+ * this field is null on master. When transferred to a agent via remoting,
* this field becomes non-null, representing the {@link Channel}
* back to the master.
*
- * This is used to determine whether we are running on the master or the slave.
+ * This is used to determine whether we are running on the master or the agent.
*/
private transient VirtualChannel channel;
- // since the platform of the slave might be different, can't use java.io.File
+ // since the platform of the agent might be different, can't use java.io.File
private final String remote;
/**
@@ -223,9 +235,9 @@ public final class FilePath implements Serializable {
*
* @param channel
* To create a path that represents a remote path, pass in a {@link Channel}
- * that's connected to that machine. If null, that means the local file path.
+ * that's connected to that machine. If {@code null}, that means the local file path.
*/
- public FilePath(VirtualChannel channel, String remote) {
+ public FilePath(@CheckForNull VirtualChannel channel, @Nonnull String remote) {
this.channel = channel instanceof LocalChannel ? null : channel;
this.remote = normalize(remote);
}
@@ -237,7 +249,7 @@ public final class FilePath implements Serializable {
* A "local" path means a file path on the computer where the
* constructor invocation happened.
*/
- public FilePath(File localPath) {
+ public FilePath(@Nonnull File localPath) {
this.channel = null;
this.remote = normalize(localPath.getPath());
}
@@ -247,19 +259,19 @@ public final class FilePath implements Serializable {
* @param base starting point for resolution, and defines channel
* @param rel a path which if relative will be resolved against base
*/
- public FilePath(FilePath base, String rel) {
+ public FilePath(@Nonnull FilePath base, @Nonnull String rel) {
this.channel = base.channel;
this.remote = normalize(resolvePathIfRelative(base, rel));
}
- private String resolvePathIfRelative(FilePath base, String rel) {
+ private String resolvePathIfRelative(@Nonnull FilePath base, @Nonnull String rel) {
if(isAbsolute(rel)) return rel;
if(base.isUnix()) {
// shouldn't need this replace, but better safe than sorry
return base.remote+'/'+rel.replace('\\','/');
} else {
// need this replace, see Slave.getWorkspaceFor and AbstractItem.getFullName, nested jobs on Windows
- // slaves will always have a rel containing at least one '/' character. JENKINS-13649
+ // agents will always have a rel containing at least one '/' character. JENKINS-13649
return base.remote+'\\'+rel.replace('/','\\');
}
}
@@ -267,7 +279,7 @@ public final class FilePath implements Serializable {
/**
* Is the given path name an absolute path?
*/
- private static boolean isAbsolute(String rel) {
+ private static boolean isAbsolute(@Nonnull String rel) {
return rel.startsWith("/") || DRIVE_PATTERN.matcher(rel).matches() || UNC_PATTERN.matcher(rel).matches();
}
@@ -279,7 +291,7 @@ public final class FilePath implements Serializable {
* {@link File#getParent()} etc cannot handle ".." and "." in the path component very well,
* so remove them.
*/
- private static String normalize(String path) {
+ private static String normalize(@Nonnull String path) {
StringBuilder buf = new StringBuilder();
// Check for prefix designating absolute path
Matcher m = ABSOLUTE_PREFIX_PATTERN.matcher(path);
@@ -379,11 +391,8 @@ public final class FilePath implements Serializable {
}
public void zip(FilePath dst) throws IOException, InterruptedException {
- OutputStream os = dst.write();
- try {
+ try (OutputStream os = dst.write()) {
zip(os);
- } finally {
- os.close();
}
}
@@ -545,7 +554,7 @@ public final class FilePath implements Serializable {
* @see #unzip(FilePath)
*/
public void unzipFrom(InputStream _in) throws IOException, InterruptedException {
- final InputStream in = new RemoteInputStream(_in);
+ final InputStream in = new RemoteInputStream(_in, Flag.GREEDY);
act(new SecureFileCallable() {
public Void invoke(File dir, VirtualChannel channel) throws IOException {
unzip(dir, in);
@@ -584,11 +593,8 @@ public final class FilePath implements Serializable {
if (p != null) {
mkdirs(p);
}
- InputStream input = zip.getInputStream(e);
- try {
+ try (InputStream input = zip.getInputStream(e)) {
IOUtils.copy(input, writing(f));
- } finally {
- input.close();
}
try {
FilePath target = new FilePath(f);
@@ -714,7 +720,7 @@ public final class FilePath implements Serializable {
*/
public void untarFrom(InputStream _in, final TarCompression compression) throws IOException, InterruptedException {
try {
- final InputStream in = new RemoteInputStream(_in);
+ final InputStream in = new RemoteInputStream(_in, Flag.GREEDY);
act(new SecureFileCallable() {
public Void invoke(File dir, VirtualChannel channel) throws IOException {
readFromTar("input stream",dir, compression.extract(in));
@@ -723,7 +729,7 @@ public final class FilePath implements Serializable {
private static final long serialVersionUID = 1L;
});
} finally {
- org.apache.commons.io.IOUtils.closeQuietly(_in);
+ _in.close();
}
}
@@ -755,6 +761,10 @@ public final class FilePath implements Serializable {
* @since 1.299
*/
public boolean installIfNecessaryFrom(@Nonnull URL archive, @CheckForNull TaskListener listener, @Nonnull String message) throws IOException, InterruptedException {
+ return installIfNecessaryFrom(archive, listener, message, MAX_REDIRECTS);
+ }
+
+ private boolean installIfNecessaryFrom(@Nonnull URL archive, @CheckForNull TaskListener listener, @Nonnull String message, int maxRedirects) throws InterruptedException, IOException {
try {
FilePath timestamp = this.child(".timestamp");
long lastModified = timestamp.lastModified();
@@ -777,14 +787,28 @@ public final class FilePath implements Serializable {
}
}
- if (lastModified != 0 && con instanceof HttpURLConnection) {
+ if (con instanceof HttpURLConnection) {
HttpURLConnection httpCon = (HttpURLConnection) con;
int responseCode = httpCon.getResponseCode();
- if (responseCode == HttpURLConnection.HTTP_NOT_MODIFIED) {
- return false;
- } else if (responseCode != HttpURLConnection.HTTP_OK) {
- listener.getLogger().println("Skipping installation of " + archive + " to " + remote + " due to server error: " + responseCode + " " + httpCon.getResponseMessage());
- return false;
+ if (responseCode == HttpURLConnection.HTTP_MOVED_PERM
+ || responseCode == HttpURLConnection.HTTP_MOVED_TEMP) {
+ // follows redirect
+ if (maxRedirects > 0) {
+ String location = httpCon.getHeaderField("Location");
+ listener.getLogger().println("Following redirect " + archive.toExternalForm() + " -> " + location);
+ return installIfNecessaryFrom(getUrlFactory().newURL(location), listener, message, maxRedirects - 1);
+ } else {
+ listener.getLogger().println("Skipping installation of " + archive + " to " + remote + " due to too many redirects.");
+ return false;
+ }
+ }
+ if (lastModified != 0) {
+ if (responseCode == HttpURLConnection.HTTP_NOT_MODIFIED) {
+ return false;
+ } else if (responseCode != HttpURLConnection.HTTP_OK) {
+ listener.getLogger().println("Skipping installation of " + archive + " to " + remote + " due to server error: " + responseCode + " " + httpCon.getResponseMessage());
+ return false;
+ }
}
}
@@ -802,14 +826,14 @@ public final class FilePath implements Serializable {
listener.getLogger().println(message);
if (isRemote()) {
- // First try to download from the slave machine.
+ // First try to download from the agent machine.
try {
act(new Unpack(archive));
timestamp.touch(sourceTimestamp);
return true;
} catch (IOException x) {
if (listener != null) {
- x.printStackTrace(listener.error("Failed to download " + archive + " from slave; will retry from master"));
+ Functions.printStackTrace(x, listener.error("Failed to download " + archive + " from agent; will retry from master"));
}
}
}
@@ -840,8 +864,7 @@ public final class FilePath implements Serializable {
this.archive = archive;
}
@Override public Void invoke(File dir, VirtualChannel channel) throws IOException, InterruptedException {
- InputStream in = archive.openStream();
- try {
+ try (InputStream in = archive.openStream()) {
CountingInputStream cis = new CountingInputStream(in);
try {
if (archive.toExternalForm().endsWith(".zip")) {
@@ -852,8 +875,6 @@ public final class FilePath implements Serializable {
} catch (IOException x) {
throw new IOException(String.format("Failed to unpack %s (%d bytes read)", archive, cis.getByteCount()), x);
}
- } finally {
- in.close();
}
return null;
}
@@ -866,11 +887,8 @@ public final class FilePath implements Serializable {
* @since 1.293
*/
public void copyFrom(URL url) throws IOException, InterruptedException {
- InputStream in = url.openStream();
- try {
+ try (InputStream in = url.openStream()) {
copyFrom(in);
- } finally {
- in.close();
}
}
@@ -880,11 +898,8 @@ public final class FilePath implements Serializable {
* @since 1.293
*/
public void copyFrom(InputStream in) throws IOException, InterruptedException {
- OutputStream os = write();
- try {
+ try (OutputStream os = write()) {
org.apache.commons.io.IOUtils.copy(in, os);
- } finally {
- os.close();
}
}
@@ -910,16 +925,9 @@ public final class FilePath implements Serializable {
throw new IOException(e);
}
} else {
- InputStream i = file.getInputStream();
- OutputStream o = write();
- try {
+ try (InputStream i = file.getInputStream();
+ OutputStream o = write()) {
org.apache.commons.io.IOUtils.copy(i,o);
- } finally {
- try {
- o.close();
- } finally {
- i.close();
- }
}
}
}
@@ -927,7 +935,7 @@ public final class FilePath implements Serializable {
/**
* Code that gets executed on the machine where the {@link FilePath} is local.
* Used to act on {@link FilePath}.
- * Warning: implementations must be serializable, so prefer a static nested class to an inner class.
+ * Warning: implementations must be serializable, so prefer a static nested class to an inner class.
*
*
* Subtypes would likely want to extend from either {@link MasterToSlaveCallable}
@@ -1133,7 +1141,7 @@ public final class FilePath implements Serializable {
* @since 1.571
*/
public @CheckForNull Computer toComputer() {
- Jenkins j = Jenkins.getInstance();
+ Jenkins j = Jenkins.getInstanceOrNull();
if (j != null) {
for (Computer c : j.getComputers()) {
if (getChannel()==c.getChannel()) {
@@ -1196,7 +1204,7 @@ public final class FilePath implements Serializable {
deleteFile(deleting(dir));
} catch (IOException e) {
// if some of the child directories are big, it might take long enough to delete that
- // it allows others to create new files, causing problemsl ike JENKINS-10113
+ // it allows others to create new files, causing problems like JENKINS-10113
// so give it one more attempt before we give up.
if(!isSymlink(dir))
deleteContentsRecursive(dir);
@@ -1368,11 +1376,8 @@ public final class FilePath implements Serializable {
throw new IOException("Failed to create a temporary directory in "+dir,e);
}
- Writer w = new FileWriter(writing(f));
- try {
+ try (Writer w = new FileWriter(writing(f))) {
w.write(contents);
- } finally {
- w.close();
}
return f.getAbsolutePath();
@@ -1466,8 +1471,13 @@ public final class FilePath implements Serializable {
act(new SecureFileCallable() {
private static final long serialVersionUID = -5094638816500738429L;
public Void invoke(File f, VirtualChannel channel) throws IOException {
- if(!f.exists())
- new FileOutputStream(creating(f)).close();
+ if(!f.exists()) {
+ try {
+ Files.newOutputStream(creating(f).toPath()).close();
+ } catch (InvalidPathException e) {
+ throw new IOException(e);
+ }
+ }
if(!stating(f).setLastModified(timestamp))
throw new IOException("Failed to set the timestamp of "+f+" to "+timestamp);
return null;
@@ -1627,6 +1637,7 @@ public final class FilePath implements Serializable {
*
* This method returns direct children of the directory denoted by the 'this' object.
*/
+ @Nonnull
public List list() throws IOException, InterruptedException {
return list((FileFilter)null);
}
@@ -1636,6 +1647,7 @@ public final class FilePath implements Serializable {
*
* @return can be empty but never null. Doesn't contain "." and ".."
*/
+ @Nonnull
public List listDirectories() throws IOException, InterruptedException {
return list(new DirectoryFilter());
}
@@ -1656,6 +1668,7 @@ public final class FilePath implements Serializable {
* If this {@link FilePath} represents a remote path,
* the filter object will be executed on the remote machine.
*/
+ @Nonnull
public List list(final FileFilter filter) throws IOException, InterruptedException {
if (filter != null && !(filter instanceof Serializable)) {
throw new IllegalArgumentException("Non-serializable filter of " + filter.getClass());
@@ -1664,7 +1677,9 @@ public final class FilePath implements Serializable {
private static final long serialVersionUID = 1L;
public List invoke(File f, VirtualChannel channel) throws IOException {
File[] children = reading(f).listFiles(filter);
- if(children ==null) return null;
+ if (children == null) {
+ return Collections.emptyList();
+ }
ArrayList r = new ArrayList(children.length);
for (File child : children)
@@ -1683,6 +1698,7 @@ public final class FilePath implements Serializable {
* @return
* can be empty but always non-null.
*/
+ @Nonnull
public FilePath[] list(final String includes) throws IOException, InterruptedException {
return list(includes, null);
}
@@ -1697,6 +1713,7 @@ public final class FilePath implements Serializable {
* can be empty but always non-null.
* @since 1.407
*/
+ @Nonnull
public FilePath[] list(final String includes, final String excludes) throws IOException, InterruptedException {
return list(includes, excludes, true);
}
@@ -1712,6 +1729,7 @@ public final class FilePath implements Serializable {
* can be empty but always non-null.
* @since 1.465
*/
+ @Nonnull
public FilePath[] list(final String includes, final String excludes, final boolean defaultExcludes) throws IOException, InterruptedException {
return act(new SecureFileCallable() {
private static final long serialVersionUID = 1L;
@@ -1733,6 +1751,7 @@ public final class FilePath implements Serializable {
* @return
* A set of relative file names from the base directory.
*/
+ @Nonnull
private static String[] glob(File dir, String includes, String excludes, boolean defaultExcludes) throws IOException {
if(isAbsolute(includes))
throw new IOException("Expecting Ant GLOB pattern, but saw '"+includes+"'. See http://ant.apache.org/manual/Types/fileset.html for syntax");
@@ -1747,8 +1766,13 @@ public final class FilePath implements Serializable {
* Reads this file.
*/
public InputStream read() throws IOException, InterruptedException {
- if(channel==null)
- return new FileInputStream(reading(new File(remote)));
+ if(channel==null) {
+ try {
+ return Files.newInputStream(reading(new File(remote)).toPath());
+ } catch (InvalidPathException e) {
+ throw new IOException(e);
+ }
+ }
final Pipe p = Pipe.createRemoteToLocal();
actAsync(new SecureFileCallable() {
@@ -1756,15 +1780,13 @@ public final class FilePath implements Serializable {
@Override
public Void invoke(File f, VirtualChannel channel) throws IOException, InterruptedException {
- FileInputStream fis = null;
- try {
- fis = new FileInputStream(reading(f));
- Util.copyStream(fis, p.getOut());
+ try (InputStream fis = Files.newInputStream(reading(f).toPath());
+ OutputStream out = p.getOut()) {
+ org.apache.commons.io.IOUtils.copy(fis, out);
+ } catch (InvalidPathException e) {
+ p.error(new IOException(e));
} catch (Exception x) {
p.error(x);
- } finally {
- org.apache.commons.io.IOUtils.closeQuietly(fis);
- org.apache.commons.io.IOUtils.closeQuietly(p.getOut());
}
return null;
}
@@ -1818,10 +1840,9 @@ public final class FilePath implements Serializable {
private static final long serialVersionUID = 1L;
public Void invoke(File f, VirtualChannel channel) throws IOException {
- final OutputStream out = new java.util.zip.GZIPOutputStream(p.getOut(), 8192);
- RandomAccessFile raf = null;
- try {
- raf = new RandomAccessFile(reading(f), "r");
+ try (OutputStream os = p.getOut();
+ OutputStream out = new java.util.zip.GZIPOutputStream(os, 8192);
+ RandomAccessFile raf = new RandomAccessFile(reading(f), "r")) {
raf.seek(offset);
byte[] buf = new byte[8192];
int len;
@@ -1829,15 +1850,6 @@ public final class FilePath implements Serializable {
out.write(buf, 0, len);
}
return null;
- } finally {
- IOUtils.closeQuietly(out);
- if (raf != null) {
- try {
- raf.close();
- } catch (IOException e) {
- // ignore
- }
- }
}
}
});
@@ -1849,11 +1861,8 @@ public final class FilePath implements Serializable {
* Reads this file into a string, by using the current system encoding.
*/
public String readToString() throws IOException, InterruptedException {
- InputStream in = read();
- try {
+ try (InputStream in = read()) {
return org.apache.commons.io.IOUtils.toString(in);
- } finally {
- in.close();
}
}
@@ -1876,7 +1885,11 @@ public final class FilePath implements Serializable {
if(channel==null) {
File f = new File(remote).getAbsoluteFile();
mkdirs(f.getParentFile());
- return new FileOutputStream(writing(f));
+ try {
+ return Files.newOutputStream(writing(f).toPath());
+ } catch (InvalidPathException e) {
+ throw new IOException(e);
+ }
}
return act(new SecureFileCallable() {
@@ -1884,8 +1897,12 @@ public final class FilePath implements Serializable {
public OutputStream invoke(File f, VirtualChannel channel) throws IOException, InterruptedException {
f = f.getAbsoluteFile();
mkdirs(f.getParentFile());
- FileOutputStream fos = new FileOutputStream(writing(f));
- return new RemoteOutputStream(fos);
+ try {
+ OutputStream fos = Files.newOutputStream(writing(f).toPath());
+ return new RemoteOutputStream(fos);
+ } catch (InvalidPathException e) {
+ throw new IOException(e);
+ }
}
});
}
@@ -1902,12 +1919,11 @@ public final class FilePath implements Serializable {
private static final long serialVersionUID = 1L;
public Void invoke(File f, VirtualChannel channel) throws IOException {
mkdirs(f.getParentFile());
- FileOutputStream fos = new FileOutputStream(writing(f));
- Writer w = encoding != null ? new OutputStreamWriter(fos, encoding) : new OutputStreamWriter(fos);
- try {
+ try (OutputStream fos = Files.newOutputStream(writing(f).toPath());
+ Writer w = encoding != null ? new OutputStreamWriter(fos, encoding) : new OutputStreamWriter(fos)) {
w.write(content);
- } finally {
- w.close();
+ } catch (InvalidPathException e) {
+ throw new IOException(e);
}
return null;
}
@@ -1980,11 +1996,8 @@ public final class FilePath implements Serializable {
*/
public void copyTo(FilePath target) throws IOException, InterruptedException {
try {
- OutputStream out = target.write();
- try {
+ try (OutputStream out = target.write()) {
copyTo(out);
- } finally {
- out.close();
}
} catch (IOException e) {
throw new IOException("Failed to copy "+this+" to "+target,e);
@@ -2011,14 +2024,13 @@ public final class FilePath implements Serializable {
act(new SecureFileCallable() {
private static final long serialVersionUID = 4088559042349254141L;
public Void invoke(File f, VirtualChannel channel) throws IOException {
- FileInputStream fis = null;
- try {
- fis = new FileInputStream(reading(f));
- Util.copyStream(fis,out);
+ try (InputStream fis = Files.newInputStream(reading(f).toPath())) {
+ org.apache.commons.io.IOUtils.copy(fis, out);
return null;
+ } catch (InvalidPathException e) {
+ throw new IOException(e);
} finally {
- org.apache.commons.io.IOUtils.closeQuietly(fis);
- org.apache.commons.io.IOUtils.closeQuietly(out);
+ out.close();
}
}
});
@@ -2170,11 +2182,9 @@ public final class FilePath implements Serializable {
Future future = target.actAsync(new SecureFileCallable() {
private static final long serialVersionUID = 1L;
public Void invoke(File f, VirtualChannel channel) throws IOException {
- try {
- readFromTar(remote + '/' + description, f,TarCompression.GZIP.extract(pipe.getIn()));
+ try (InputStream in = pipe.getIn()) {
+ readFromTar(remote + '/' + description, f,TarCompression.GZIP.extract(in));
return null;
- } finally {
- pipe.getIn().close();
}
}
});
@@ -2198,10 +2208,8 @@ public final class FilePath implements Serializable {
Future future = actAsync(new SecureFileCallable() {
private static final long serialVersionUID = 1L;
public Integer invoke(File f, VirtualChannel channel) throws IOException {
- try {
- return writeToTar(f, scanner, TarCompression.GZIP.compress(pipe.getOut()));
- } finally {
- pipe.getOut().close();
+ try (OutputStream out = pipe.getOut()) {
+ return writeToTar(f, scanner, TarCompression.GZIP.compress(out));
}
}
});
@@ -2267,17 +2275,16 @@ public final class FilePath implements Serializable {
/**
* Reads from a tar stream and stores obtained files to the base dir.
- * @since TODO supports large files > 10 GB, migration to commons-compress
+ * Supports large files > 10 GB since 1.627 when this was migrated to use commons-compress.
*/
private void readFromTar(String name, File baseDir, InputStream in) throws IOException {
- TarArchiveInputStream t = new TarArchiveInputStream(in);
-
+
// TarInputStream t = new TarInputStream(in);
- try {
+ try (TarArchiveInputStream t = new TarArchiveInputStream(in)) {
TarArchiveEntry te;
while ((te = t.getNextTarEntry()) != null) {
- File f = new File(baseDir,te.getName());
- if(te.isDirectory()) {
+ File f = new File(baseDir, te.getName());
+ if (te.isDirectory()) {
mkdirs(f);
} else {
File parent = f.getParentFile();
@@ -2287,22 +2294,20 @@ public final class FilePath implements Serializable {
if (te.isSymbolicLink()) {
new FilePath(f).symlinkTo(te.getLinkName(), TaskListener.NULL);
} else {
- IOUtils.copy(t,f);
+ IOUtils.copy(t, f);
f.setLastModified(te.getModTime().getTime());
- int mode = te.getMode()&0777;
- if(mode!=0 && !Functions.isWindows()) // be defensive
- _chmod(f,mode);
+ int mode = te.getMode() & 0777;
+ if (mode != 0 && !Functions.isWindows()) // be defensive
+ _chmod(f, mode);
}
}
}
- } catch(IOException e) {
- throw new IOException("Failed to extract "+name,e);
+ } catch (IOException e) {
+ throw new IOException("Failed to extract " + name, e);
} catch (InterruptedException e) {
Thread.currentThread().interrupt(); // process this later
- throw new IOException("Failed to extract "+name,e);
- } finally {
- t.close();
+ throw new IOException("Failed to extract " + name, e);
}
}
@@ -2319,6 +2324,7 @@ public final class FilePath implements Serializable {
}
private static final class IsUnix extends MasterToSlaveCallable {
+ @Nonnull
public Boolean call() throws IOException {
return File.pathSeparatorChar==':';
}
@@ -2344,7 +2350,7 @@ public final class FilePath implements Serializable {
}
/**
- * Same as {@link #validateFileMask(String, int, boolean)} with caseSensitive set to true
+ * Same as {@link #validateAntFileMask(String, int, boolean)} with caseSensitive set to true
*/
public String validateAntFileMask(final String fileMasks, final int bound) throws IOException, InterruptedException {
return validateAntFileMask(fileMasks, bound, true);
@@ -2354,7 +2360,7 @@ public final class FilePath implements Serializable {
* Default bound for {@link #validateAntFileMask(String, int, boolean)}.
* @since 1.592
*/
- public static int VALIDATE_ANT_FILE_MASK_BOUND = Integer.getInteger(FilePath.class.getName() + ".VALIDATE_ANT_FILE_MASK_BOUND", 10000);
+ public static int VALIDATE_ANT_FILE_MASK_BOUND = SystemProperties.getInteger(FilePath.class.getName() + ".VALIDATE_ANT_FILE_MASK_BOUND", 10000);
/**
* Like {@link #validateAntFileMask(String)} but performing only a bounded number of operations.
@@ -2396,7 +2402,7 @@ public final class FilePath implements Serializable {
for (String token : Util.tokenize(fileMask))
matched &= hasMatch(dir,token,caseSensitive);
if(matched)
- return Messages.FilePath_validateAntFileMask_whitespaceSeprator();
+ return Messages.FilePath_validateAntFileMask_whitespaceSeparator();
}
// a common mistake is to assume the wrong base dir, and there are two variations
@@ -2520,6 +2526,31 @@ public final class FilePath implements Serializable {
});
}
+ private static final UrlFactory DEFAULT_URL_FACTORY = new UrlFactory();
+
+ @Restricted(NoExternalUse.class)
+ static class UrlFactory {
+ public URL newURL(String location) throws MalformedURLException {
+ return new URL(location);
+ }
+ }
+
+ private UrlFactory urlFactory;
+
+ @VisibleForTesting
+ @Restricted(NoExternalUse.class)
+ void setUrlFactory(UrlFactory urlFactory) {
+ this.urlFactory = urlFactory;
+ }
+
+ private UrlFactory getUrlFactory() {
+ if (urlFactory != null) {
+ return urlFactory;
+ } else {
+ return DEFAULT_URL_FACTORY;
+ }
+ }
+
/**
* Short for {@code validateFileMask(path, value, true)}
*/
@@ -2528,7 +2559,7 @@ public final class FilePath implements Serializable {
}
/**
- * Shortcut for {@link #validateFileMask(String,true,boolean)} as the left-hand side can be null.
+ * Shortcut for {@link #validateFileMask(String,boolean,boolean)} with {@code errorIfNotExist} true, as the left-hand side can be null.
*/
public static FormValidation validateFileMask(@CheckForNull FilePath path, String value, boolean caseSensitive) throws IOException {
if(path==null) return FormValidation.ok();
@@ -2800,6 +2831,11 @@ public final class FilePath implements Serializable {
new NamingThreadFactory(new DaemonThreadFactory(), "FilePath.localPool"))
));
+
+ /**
+ * Channel to the current instance.
+ */
+ @Nonnull
public static final LocalChannel localChannel = new LocalChannel(threadPoolForRemoting);
private @Nonnull SoloFilePathFilter filterNonNull() {
diff --git a/core/src/main/java/hudson/FileSystemProvisioner.java b/core/src/main/java/hudson/FileSystemProvisioner.java
index bbb98f5e9d0c873ca4bc5af33b1d2b0b34048e58..13f55b7370028832eba66ea7e16af84cb19547aa 100644
--- a/core/src/main/java/hudson/FileSystemProvisioner.java
+++ b/core/src/main/java/hudson/FileSystemProvisioner.java
@@ -31,9 +31,12 @@ import hudson.model.Describable;
import hudson.model.Job;
import hudson.model.TaskListener;
import hudson.util.io.ArchiverFactory;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
import jenkins.model.Jenkins;
import hudson.model.listeners.RunListener;
import hudson.scm.SCM;
+import org.jenkinsci.Symbol;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -51,7 +54,7 @@ import java.io.OutputStream;
* STILL A WORK IN PROGRESS. SUBJECT TO CHANGE! DO NOT EXTEND.
*
* TODO: is this per {@link Computer}? Per {@link Job}?
- * -> probably per slave.
+ * → probably per agent.
*
*
Design Problems
*
@@ -71,7 +74,7 @@ import java.io.OutputStream;
* one more configuration option. It's especially tricky because
* during the configuration we don't know the OS type.
*
- * OTOH special slave type like the ones for network.com grid can
+ * OTOH special agent type like the ones for network.com grid can
* hide this.
*
*
@@ -80,8 +83,8 @@ import java.io.OutputStream;
*
* To recap,
*
- * - when a slave connects, we auto-detect the file system provisioner.
- * (for example, ZFS FSP would check the slave root user prop
+ * - when an agent connects, we auto-detect the file system provisioner.
+ * (for example, ZFS FSP would check the agent root user prop
* and/or attempt to "pfexec zfs create" and take over.)
*
* - the user may configure jobs for snapshot collection, along with
@@ -214,11 +217,10 @@ public abstract class FileSystemProvisioner implements ExtensionPoint, Describab
*/
public WorkspaceSnapshot snapshot(AbstractBuild build, FilePath ws, String glob, TaskListener listener) throws IOException, InterruptedException {
File wss = new File(build.getRootDir(),"workspace.tgz");
- OutputStream os = new BufferedOutputStream(new FileOutputStream(wss));
- try {
- ws.archive(ArchiverFactory.TARGZ,os,glob);
- } finally {
- os.close();
+ try (OutputStream os = new BufferedOutputStream(Files.newOutputStream(wss.toPath()))) {
+ ws.archive(ArchiverFactory.TARGZ, os, glob);
+ } catch (InvalidPathException e) {
+ throw new IOException(e);
}
return new WorkspaceSnapshotImpl();
}
@@ -235,7 +237,7 @@ public abstract class FileSystemProvisioner implements ExtensionPoint, Describab
}
}
- @Extension
+ @Extension @Symbol("standard")
public static final class DescriptorImpl extends FileSystemProvisionerDescriptor {
public boolean discard(FilePath ws, TaskListener listener) throws IOException, InterruptedException {
// the default provisioner does not do anything special,
diff --git a/core/src/main/java/hudson/FileSystemProvisionerDescriptor.java b/core/src/main/java/hudson/FileSystemProvisionerDescriptor.java
index 4827366d36f41f3c7845aa71571eef7480d61f09..1e02e11f7f4dfdbedf2f00b853535725c1d43f86 100644
--- a/core/src/main/java/hudson/FileSystemProvisionerDescriptor.java
+++ b/core/src/main/java/hudson/FileSystemProvisionerDescriptor.java
@@ -38,9 +38,9 @@ public abstract class FileSystemProvisionerDescriptor extends Descriptor
- * Because users may modify the file system behind Hudson, and slaves may come and go when
+ * Because users may modify the file system behind Hudson, and agents may come and go when
* configuration changes happen, in general case Hudson is unable to keep track of which jobs
- * have workspaces in which slaves.
+ * have workspaces in which agents.
*
*
* So instead we rey on a garbage collection mechanism, to look at workspaces left in the file system
@@ -63,7 +63,7 @@ public abstract class FileSystemProvisionerDescriptor extends Descriptor= 0;
+ final Jenkins jenkins = Jenkins.getInstanceOrNull();
+ return jenkins != null && jenkins.getInitLevel().compareTo(InitMilestone.EXTENSIONS_AUGMENTED) >= 0
+ && !jenkins.isTerminating();
}
public static void initPageVariables(JellyContext context) {
@@ -561,7 +579,7 @@ public class Functions {
/**
* Set to true if you need to use the debug version of YUI.
*/
- public static boolean DEBUG_YUI = Boolean.getBoolean("debug.YUI");
+ public static boolean DEBUG_YUI = SystemProperties.getBoolean("debug.YUI");
/**
* Creates a sub map by using the given range (both ends inclusive).
@@ -616,7 +634,7 @@ public class Functions {
response.addCookie(c);
}
if (refresh) {
- response.addHeader("Refresh", System.getProperty("hudson.Functions.autoRefreshSeconds", "10"));
+ response.addHeader("Refresh", SystemProperties.getString("hudson.Functions.autoRefreshSeconds", "10"));
}
}
@@ -838,9 +856,9 @@ public class Functions {
*/
public static String getFooterURL() {
if(footerURL == null) {
- footerURL = System.getProperty("hudson.footerURL");
+ footerURL = SystemProperties.getString("hudson.footerURL");
if(StringUtils.isBlank(footerURL)) {
- footerURL = "http://jenkins-ci.org/";
+ footerURL = "https://jenkins.io/";
}
}
return footerURL;
@@ -879,10 +897,24 @@ public class Functions {
return SCM._for(project);
}
+ /**
+ * @since 2.12
+ * @deprecated replaced by {@link Slave.SlaveDescriptor#computerLauncherDescriptors(Slave)}
+ */
+ @Deprecated
+ @Restricted(DoNotUse.class)
+ @RestrictedSince("2.12")
public static List> getComputerLauncherDescriptors() {
return Jenkins.getInstance().>getDescriptorList(ComputerLauncher.class);
}
+ /**
+ * @since 2.12
+ * @deprecated replaced by {@link Slave.SlaveDescriptor#retentionStrategyDescriptors(Slave)}
+ */
+ @Deprecated
+ @Restricted(DoNotUse.class)
+ @RestrictedSince("2.12")
public static List>> getRetentionStrategyDescriptors() {
return RetentionStrategy.all();
}
@@ -903,6 +935,13 @@ public class Functions {
return MyViewsTabBar.all();
}
+ /**
+ * @deprecated replaced by {@link Slave.SlaveDescriptor#nodePropertyDescriptors(Slave)}
+ * @since 2.12
+ */
+ @Deprecated
+ @Restricted(DoNotUse.class)
+ @RestrictedSince("2.12")
public static List getNodePropertyDescriptors(Class clazz) {
List result = new ArrayList();
Collection list = (Collection) Jenkins.getInstance().getDescriptorList(NodeProperty.class);
@@ -955,12 +994,8 @@ public class Functions {
Descriptor d = c.getInstance();
if (d.getGlobalConfigPage()==null) continue;
- if (d instanceof GlobalConfiguration) {
- if (predicate.apply(((GlobalConfiguration)d).getCategory()))
- r.add(new Tag(c.ordinal(), d));
- } else {
- if (predicate.apply(GlobalConfigurationCategory.get(Unclassified.class)))
- r.add(new Tag(0, d));
+ if (predicate.apply(d.getCategory())) {
+ r.add(new Tag(c.ordinal(), d));
}
}
Collections.sort(r);
@@ -1068,7 +1103,7 @@ public class Functions {
ItemGroup ig = i.getParent();
url = i.getShortUrl()+url;
- if(ig== Jenkins.getInstance() || (view != null && ig == view.getOwnerItemGroup())) {
+ if(ig== Jenkins.getInstance() || (view != null && ig == view.getOwner().getItemGroup())) {
assert i instanceof TopLevelItem;
if (view != null) {
// assume p and the current page belong to the same view, so return a relative path
@@ -1359,7 +1394,7 @@ public class Functions {
}
/**
- * Resoruce path prefix.
+ * Resource path prefix.
*/
public static String getResourcePath() {
return Jenkins.RESOURCE_PATH;
@@ -1408,19 +1443,87 @@ public class Functions {
}
/**
- * Gets info about the specified {@link Throwable}.
+ * Prints a stack trace from an exception into a readable form.
+ * Unlike {@link Throwable#printStackTrace(PrintWriter)}, this implementation follows the suggestion of JDK-6507809
+ * to produce a linear trace even when {@link Throwable#getCause} is used.
* @param t Input {@link Throwable}
- * @return If {@link Throwable} is not null, a summary info with the
- * stacktrace will be returned. Otherwise, the method returns a default
+ * @return If {@code t} is not null, generally a multiline string ending in a (platform-specific) newline;
+ * otherwise, the method returns a default
* "No exception details" string.
*/
- public static String printThrowable(@CheckForNull Throwable t) {
+ public static @Nonnull String printThrowable(@CheckForNull Throwable t) {
if (t == null) {
return Messages.Functions_NoExceptionDetails();
}
- StringWriter sw = new StringWriter();
- t.printStackTrace(new PrintWriter(sw));
- return sw.toString();
+ StringBuilder s = new StringBuilder();
+ doPrintStackTrace(s, t, null, "", new HashSet());
+ return s.toString();
+ }
+ private static void doPrintStackTrace(@Nonnull StringBuilder s, @Nonnull Throwable t, @CheckForNull Throwable higher, @Nonnull String prefix, @Nonnull Set encountered) {
+ if (!encountered.add(t)) {
+ s.append("\n");
+ return;
+ }
+ if (Util.isOverridden(Throwable.class, t.getClass(), "printStackTrace", PrintWriter.class)) {
+ StringWriter sw = new StringWriter();
+ t.printStackTrace(new PrintWriter(sw));
+ s.append(sw.toString());
+ return;
+ }
+ Throwable lower = t.getCause();
+ if (lower != null) {
+ doPrintStackTrace(s, lower, t, prefix, encountered);
+ }
+ for (Throwable suppressed : t.getSuppressed()) {
+ s.append(prefix).append("Also: ");
+ doPrintStackTrace(s, suppressed, t, prefix + "\t", encountered);
+ }
+ if (lower != null) {
+ s.append(prefix).append("Caused: ");
+ }
+ String summary = t.toString();
+ if (lower != null) {
+ String suffix = ": " + lower;
+ if (summary.endsWith(suffix)) {
+ summary = summary.substring(0, summary.length() - suffix.length());
+ }
+ }
+ s.append(summary).append(IOUtils.LINE_SEPARATOR);
+ StackTraceElement[] trace = t.getStackTrace();
+ int end = trace.length;
+ if (higher != null) {
+ StackTraceElement[] higherTrace = higher.getStackTrace();
+ while (end > 0) {
+ int higherEnd = end + higherTrace.length - trace.length;
+ if (higherEnd <= 0 || !higherTrace[higherEnd - 1].equals(trace[end - 1])) {
+ break;
+ }
+ end--;
+ }
+ }
+ for (int i = 0; i < end; i++) {
+ s.append(prefix).append("\tat ").append(trace[i]).append(IOUtils.LINE_SEPARATOR);
+ }
+ }
+
+ /**
+ * Like {@link Throwable#printStackTrace(PrintWriter)} but using {@link #printThrowable} format.
+ * @param t an exception to print
+ * @param pw the log
+ * @since 2.43
+ */
+ public static void printStackTrace(@CheckForNull Throwable t, @Nonnull PrintWriter pw) {
+ pw.println(printThrowable(t).trim());
+ }
+
+ /**
+ * Like {@link Throwable#printStackTrace(PrintStream)} but using {@link #printThrowable} format.
+ * @param t an exception to print
+ * @param ps the log
+ * @since 2.43
+ */
+ public static void printStackTrace(@CheckForNull Throwable t, @Nonnull PrintStream ps) {
+ ps.println(printThrowable(t).trim());
}
/**
@@ -1527,10 +1630,12 @@ public class Functions {
/**
* Computes the hyperlink to actions, to handle the situation when the {@link Action#getUrlName()}
* returns absolute URL.
+ *
+ * @return null in case the action should not be presented to the user.
*/
- public static String getActionUrl(String itUrl,Action action) {
+ public static @CheckForNull String getActionUrl(String itUrl,Action action) {
String urlName = action.getUrlName();
- if(urlName==null) return null; // to avoid NPE and fail to render the whole page
+ if(urlName==null) return null; // Should not be displayed
try {
if (new URI(urlName).isAbsolute()) {
return urlName;
@@ -1567,15 +1672,11 @@ public class Functions {
return projectName;
}
- public String getSystemProperty(String key) {
- return System.getProperty(key);
- }
-
/**
* Obtains the host name of the Hudson server that clients can use to talk back to.
*
* This is primarily used in slave-agent.jnlp.jelly to specify the destination
- * that the slaves talk to.
+ * that the agents talk to.
*/
public String getServerName() {
// Try to infer this from the configured root URL.
@@ -1649,7 +1750,7 @@ public class Functions {
*/
public static List getPageDecorators() {
// this method may be called to render start up errors, at which point Hudson doesn't exist yet. see HUDSON-3608
- if(Jenkins.getInstance()==null) return Collections.emptyList();
+ if(Jenkins.getInstanceOrNull()==null) return Collections.emptyList();
return PageDecorator.all();
}
@@ -1671,13 +1772,13 @@ public class Functions {
}
public static String getCrumb(StaplerRequest req) {
- Jenkins h = Jenkins.getInstance();
+ Jenkins h = Jenkins.getInstanceOrNull();
CrumbIssuer issuer = h != null ? h.getCrumbIssuer() : null;
return issuer != null ? issuer.getCrumb(req) : "";
}
public static String getCrumbRequestField() {
- Jenkins h = Jenkins.getInstance();
+ Jenkins h = Jenkins.getInstanceOrNull();
CrumbIssuer issuer = h != null ? h.getCrumbIssuer() : null;
return issuer != null ? issuer.getDescriptor().getCrumbRequestField() : "";
}
@@ -1697,7 +1798,7 @@ public class Functions {
}
/**
- * Generate a series of <script> tags to include script.js
+ * Generate a series of {@code
diff --git a/core/src/main/resources/hudson/PluginManager/installed.properties b/core/src/main/resources/hudson/PluginManager/installed.properties
index 2fa0cafb8083f2b150ecd074aeb95ea0321dc2b7..0c1b07c42737b8ee2958fe7c7f1691c9eb8c56b8 100644
--- a/core/src/main/resources/hudson/PluginManager/installed.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed.properties
@@ -19,6 +19,5 @@
# 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.
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
downgradeTo=Downgrade to {0}
-requires.restart=This Jenkins instance requires a restart. Changing the state of plugins at this time is strongly discouraged. Restart Jenkins before proceeding.
\ No newline at end of file
+requires.restart=This Jenkins instance requires a restart. Changing the state of plugins at this time is strongly discouraged. Restart Jenkins before proceeding.
diff --git a/core/src/main/resources/hudson/PluginManager/installed_bg.properties b/core/src/main/resources/hudson/PluginManager/installed_bg.properties
index 8d62547e3d7d906b808c8d67b21d25fc4298baec..60dc8c4e29ac354bafffe5de51bec57b6b793d95 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_bg.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_bg.properties
@@ -1,13 +1,67 @@
-# This file is under the MIT License by authors
+# The MIT License
+#
+# Bulgarian translation: Copyright (c) 2015, 2016, Alexander Shopov
+#
+# 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.
-Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=\u041F\u0440\u043E\u043C\u0435\u043D\u0438\u0442\u0435 \u0449\u0435 \u0441\u0442\u0430\u043D\u0430\u0442 \u0430\u043A\u0442\u0438\u0432\u043D\u0438 \u0441\u043B\u0435\u0434 \u0440\u0435\u0441\u0442\u0430\u0440\u0442 \u043D\u0430 Jenkins
-Enabled=\u0420\u0430\u0437\u0440\u0435\u0448\u0435\u043D
-Name=\u0418\u043C\u0435
-Pinned=\u0417\u0430\u043B\u0435\u043F\u0435\u043D
-Previously\ installed\ version=\u041F\u0440\u0435\u0434\u0438\u0448\u043D\u043E \u0438\u043D\u0441\u0442\u0430\u043B\u0438\u0440\u0430\u043D\u0430 \u0432\u0435\u0440\u0441\u0438\u044F
-Restart\ Once\ No\ Jobs\ Are\ Running=\u0420\u0435\u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u0439 \u0432 \u043C\u043E\u043C\u0435\u043D\u0442\u0430 \u0432 \u043A\u043E\u0439\u0442\u043E \u043D\u044F\u043C\u0430 \u043F\u043E\u0432\u0435\u0447\u0435 \u0440\u0430\u0431\u043E\u0442\u0435\u0449\u0438 \u0431\u0438\u043B\u0434\u043E\u0432\u0435.
-Uncheck\ to\ disable\ the\ plugin=\u0418\u0437\u0447\u0438\u0441\u0442\u0435\u0442\u0435 \u0437\u0430 \u0434\u0430 \u0437\u0430\u0431\u0440\u0430\u043D\u0438\u0442\u0435 \u043F\u043B\u044A\u0433\u0438\u043D\u0430
-Uninstall=\u0414\u0435\u0438\u043D\u0441\u0442\u0430\u043B\u0438\u0440\u0430\u0439
-Unpin=\u041E\u0442\u043B\u0435\u043F\u0438
-Version=\u0412\u0435\u0440\u0441\u0438\u044F
-downgradeTo=\u0412\u044A\u0440\u043D\u0438 \u043A\u044A\u043C \u0432\u0435\u0440\u0441\u0438\u044F {0}
+Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=\
+ \u041f\u0440\u043e\u043c\u0435\u043d\u0438\u0442\u0435 \u0449\u0435 \u0432\u043b\u044f\u0437\u0430\u0442 \u0432 \u0441\u0438\u043b\u0430 \u0441\u043b\u0435\u0434 \u0440\u0435\u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 Jenkins
+Enabled=\
+ \u0420\u0430\u0437\u0440\u0435\u0448\u0435\u043d
+Name=\
+ \u0418\u043c\u0435
+Previously\ installed\ version=\
+ \u041f\u0440\u0435\u0434\u0438\u0448\u043d\u043e \u0438\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430\u043d\u0430 \u0432\u0435\u0440\u0441\u0438\u044f
+Restart\ Once\ No\ Jobs\ Are\ Running=\
+ \u0411\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e \u0440\u0435\u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435, \u0432 \u043c\u043e\u043c\u0435\u043d\u0442\u0430 \u0431\u0435\u0437 \u0442\u0435\u043a\u0443\u0449\u0438 \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0438\u044f.
+Uncheck\ to\ disable\ the\ plugin=\
+ \u041c\u0430\u0445\u043d\u0435\u0442\u0435 \u043e\u0442\u043c\u0435\u0442\u043a\u0430\u0442\u0430 \u0437\u0430 \u0437\u0430\u0431\u0440\u0430\u043d\u0430 \u043d\u0430 \u043f\u0440\u0438\u0441\u0442\u0430\u0432\u043a\u0430\u0442\u0430
+Uninstall=\
+ \u0414\u0435\u0438\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430\u043d\u0435
+Version=\
+ \u0412\u0435\u0440\u0441\u0438\u044f
+downgradeTo=\
+ \u041a\u044a\u043c \u0432\u0435\u0440\u0441\u0438\u044f {0}
+No\ plugins\ installed.=\
+ \u041d\u044f\u043c\u0430 \u0438\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430\u043d\u0438 \u043f\u0440\u0438\u0441\u0442\u0430\u0432\u043a\u0438.
+Update\ Center=\
+ \u0421\u0430\u0439\u0442 \u0437\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f
+Uninstallation\ pending=\
+ \u041f\u0440\u0435\u0434\u0441\u0442\u043e\u0438 \u0434\u0435\u0438\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430\u043d\u0435
+Warning=\
+ \u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435
+This\ plugin\ cannot\ be\ uninstalled=\
+ \u0422\u0430\u0437\u0438 \u043f\u0440\u0438\u0441\u0442\u0430\u0432\u043a\u0430 \u043d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0434\u0435\u0438\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430
+It\ has\ one\ or\ more\ enabled\ dependants=\
+ \u0418\u043c\u0430 \u043f\u043e\u043d\u0435 \u0435\u0434\u043d\u0430 \u0434\u0440\u0443\u0433\u0430 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0430 \u043f\u0440\u0438\u0441\u0442\u0430\u0432\u043a\u0430, \u043a\u043e\u044f\u0442\u043e \u0437\u0430\u0432\u0438\u0441\u0438 \u043e\u0442 \u043d\u0435\u044f
+It\ has\ one\ or\ more\ disabled\ dependencies=\
+ \u0418\u043c\u0430 \u043f\u043e\u043d\u0435 \u0435\u0434\u043d\u0430 \u0434\u0440\u0443\u0433\u0430 \u0438\u0437\u043a\u043b\u044e\u0447\u0435\u043d\u0430 \u043f\u0440\u0438\u0441\u0442\u0430\u0432\u043a\u0430, \u043a\u043e\u044f\u0442\u043e \u0437\u0430\u0432\u0438\u0441\u0438 \u043e\u0442 \u043d\u0435\u044f
+This\ plugin\ cannot\ be\ disabled=\
+ \u0422\u0430\u0437\u0438 \u043f\u0440\u0438\u0441\u0442\u0430\u0432\u043a\u0430 \u043d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0438\u0437\u043a\u043b\u044e\u0447\u0438
+This\ plugin\ cannot\ be\ enabled=\
+ \u0422\u0430\u0437\u0438 \u043f\u0440\u0438\u0441\u0442\u0430\u0432\u043a\u0430 \u043d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0432\u043a\u043b\u044e\u0447\u0438
+Filter=\
+ \u0424\u0438\u043b\u0442\u0440\u0438\u0440\u0430\u043d\u0435
+requires.restart=\
+ \u0422\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0440\u0435\u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u0442\u0435 Jenkins, \u043f\u0440\u0435\u0434\u0438 \u0434\u0430 \u043f\u0440\u0430\u0432\u0438\u0442\u0435 \u043f\u043e\u0432\u0435\u0447\u0435 \u043f\u0440\u043e\u043c\u0435\u043d\u0438 \u043f\u043e\
+ \u043f\u0440\u0438\u0441\u0442\u0430\u0432\u043a\u0438\u0442\u0435. \u041e\u043f\u0430\u0441\u043d\u043e \u0435 \u0434\u0430 \u043f\u0440\u043e\u0434\u044a\u043b\u0436\u0438\u0442\u0435 \u0431\u0435\u0437 \u0440\u0435\u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435.
+It\ has\ one\ or\ more\ installed\ dependants=\
+ \u041a\u044a\u043c \u043f\u0440\u0438\u0441\u0442\u0430\u0432\u043a\u0430\u0442\u0430 \u0435 \u0438\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430\u043d\u0430 \u043f\u043e\u043d\u0435 \u0435\u0434\u043d\u0430 \u0434\u0440\u0443\u0433\u0430 \u043a\u0430\u0442\u043e \u0437\u0430\u0432\u0438\u0441\u0438\u043c\u043e\u0441\u0442.
+No\ description\ available.=\
+ \u0411\u0435\u0437 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
diff --git a/core/src/main/resources/hudson/PluginManager/installed_cs.properties b/core/src/main/resources/hudson/PluginManager/installed_cs.properties
index 21847ed21d95ec27e0b955dc11f6614d8e745f13..9fb56abb6a8981744a87550484f14cb02aa68927 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_cs.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_cs.properties
@@ -3,11 +3,9 @@
Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=Zm\u011Bny se projev\u00ED a\u017E po restartu Jenkinse
Enabled=Povolen\u00E9
Name=Jm\u00E9no
-Pinned=Preferovat
Previously\ installed\ version=P\u0159edchoz\u00ED nainstalovan\u00E1 verze
Restart\ Once\ No\ Jobs\ Are\ Running=Restartovat a\u017E po dokon\u010Den\u00ED v\u0161ech \u00FAloh.
Uncheck\ to\ disable\ the\ plugin=Od\u0161krtnout pro deaktivaci modulu
Uninstall=Odinstalovat
Version=Verze
downgradeTo=Vr\u00E1tit se k {0}
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
diff --git a/core/src/main/resources/hudson/PluginManager/installed_da.properties b/core/src/main/resources/hudson/PluginManager/installed_da.properties
index 4086d2a08ac457e4508899f2278ebd1c94b988ad..9e17d018924b1a85654c414ad1927ddc02722b72 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_da.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_da.properties
@@ -21,15 +21,12 @@
# THE SOFTWARE.
Version=Version
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
Restart\ Once\ No\ Jobs\ Are\ Running=Genstart n\u00e5r ingen jobs k\u00f8rer
Previously\ installed\ version=Forudg\u00e5ende installerede version
New\ plugins\ will\ take\ effect\ once\ you\ restart\ Jenkins=Nye plugins tr\u00e6der i kraft efter du har genstartet Jenkins
Uncheck\ to\ disable\ the\ plugin=Fjern flueben for at sl\u00e5 plugin''et fra
No\ plugins\ installed.=Ingen installerede plugins.
downgradeTo=Nedgrader til {0}
-Pinned=L\u00e5st
Name=Navn
Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=\u00c6ndringer tr\u00e6der i kraft efter Jenkins er genstartet
Enabled=Sl\u00e5et til
-Unpin=L\u00e5s op
diff --git a/core/src/main/resources/hudson/PluginManager/installed_de.properties b/core/src/main/resources/hudson/PluginManager/installed_de.properties
index 3653a5c9e839f877ae82b4bfb8ce5761c8ec8656..442d08f12707b16915c7d46dfe698185392783ba 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_de.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_de.properties
@@ -21,17 +21,24 @@
# THE SOFTWARE.
No\ plugins\ installed.=Keine Plugins installiert.
-Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=nderungen treten nach einem Neustart von Jenkins in Kraft.
-Uncheck\ to\ disable\ the\ plugin=Zum Deaktivieren des Plugins Markierung lschen
+Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=\u00C4nderungen treten nach einem Neustart von Jenkins in Kraft.
+Uncheck\ to\ disable\ the\ plugin=Zum Deaktivieren des Plugins Markierung entfernen
Enabled=Aktiviert
Name=Name
Version=Version
Restart\ Once\ No\ Jobs\ Are\ Running=Neu starten, sobald keine Jobs mehr laufen.
Previously\ installed\ version=Vorher installierte Version
downgradeTo={0} wiederherstellen
-Pinned=Gesperrt
-Unpin=Entsperren
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
Uninstall=Deinstallieren
Uninstallation\ pending=Zur Deinstallation vorgemerkt
Update\ Center=Update-Center
+This\ plugin\ cannot\ be\ disabled=Dieses Plugin kann nicht deaktiviert werden.
+requires.restart=Jenkins erfordert einen Neustart. Die Plugin-Konfiguration sollte nicht weiter ge\u00E4ndert werden. Starten Sie Jenkins neu, bevor Sie fortfahren.
+It\ has\ one\ or\ more\ installed\ dependants=Mindestens ein Plugin ist von diesem abh\u00E4ngig
+Warning=Warnung
+Filter=Filter
+It\ has\ one\ or\ more\ enabled\ dependants=Mindestens ein aktives Plugin ist von diesem abh\u00E4ngig
+It\ has\ one\ or\ more\ disabled\ dependencies=Mindestens eine Abh\u00E4ngigkeit ist deaktiviert
+This\ plugin\ cannot\ be\ uninstalled=Dieses Plugin kann nicht deinstalliert werden.
+No\ description\ available.=Keine Beschreibung verf\u00FCgbar.
+This\ plugin\ cannot\ be\ enabled=Dieses Plugin kann nicht aktiviert werden.
diff --git a/core/src/main/resources/hudson/PluginManager/installed_es.properties b/core/src/main/resources/hudson/PluginManager/installed_es.properties
index 70956f31d1b389dd4f44eef441fb8e53e1bcaa8f..34f849e78dccc253e5099bc7b453a12f3e0596ed 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_es.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_es.properties
@@ -27,10 +27,7 @@ Name=Nombre
Version=Versin
Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=Los cambios no estarn disponibles hasta que Jenkins se reinicie
Restart\ Once\ No\ Jobs\ Are\ Running=Reiniciar cuando no haya tareas en ejecucin
-wiki.url="http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins"
downgradeTo=Bajar a la version {0}.
Previously\ installed\ version=Versin previamente instalada.
-Pinned=marcado
Uninstall=Desinstalar
-Unpin=desmarcar
Update\ Center=Centro de actualizaciones
diff --git a/core/src/main/resources/hudson/PluginManager/installed_fi.properties b/core/src/main/resources/hudson/PluginManager/installed_fi.properties
index c04443e10d2fe07012c6a0233fd44bf0581752dc..209c8d6e2d3903add7a171d1838baf01770f505f 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_fi.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_fi.properties
@@ -23,10 +23,8 @@
Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=Muutokset astuvat voimaan kun Jenkins k\u00E4ynnistet\u00E4\u00E4n
Enabled=Aktivoitu
Name=Nimi
-Pinned=Lukittu
Previously\ installed\ version=Aiemmin asennettu versio
Restart\ Once\ No\ Jobs\ Are\ Running=K\u00E4ynnist\u00E4 heti kun k\u00E4\u00E4nn\u00F6ksi\u00E4 ei ole ajossa
Uncheck\ to\ disable\ the\ plugin=Poist ruudun rasti poistaaksesi liit\u00E4nn\u00E4inen k\u00E4yt\u00F6st\u00E4
-Unpin=Vapauta lukitus
Version=Versio
downgradeTo=Palaa versioon {0}
diff --git a/core/src/main/resources/hudson/PluginManager/installed_fr.properties b/core/src/main/resources/hudson/PluginManager/installed_fr.properties
index fde1e85e1c11cb7e8ef32524056d3193409e6fa4..b3767a6e65ecde4201c44f5c2db50a59c22e5dd2 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_fr.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_fr.properties
@@ -28,9 +28,6 @@ Uncheck\ to\ disable\ the\ plugin=D\u00e9cochez pour d\u00e9sactiver le plugin
Enabled=Activ\u00e9
Name=Nom
Uninstall=D\u00E9sinstaller
-Unpin=Annuler \u00E9pingler
Version=Version
-Pinned=\u00C9pingl\u00E9
Previously\ installed\ version=Version pr\u00E9c\u00E9dente
downgradeTo=R\u00E9trograder \u00E0 {0}
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
diff --git a/core/src/main/resources/hudson/PluginManager/installed_hu.properties b/core/src/main/resources/hudson/PluginManager/installed_hu.properties
index 01d83570d004de8d58e6774dc17923350d7e5bd6..a71aafe3567e5b4b7f530dc97750319017773d7e 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_hu.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_hu.properties
@@ -28,4 +28,3 @@ Restart\ Once\ No\ Jobs\ Are\ Running=\u00DAjraind\u00EDt\u00E1s ha m\u00E1r nin
Uncheck\ to\ disable\ the\ plugin=T\u00F6r\u00F6lje a jel\u00F6l\u00E9st a be\u00E9p\u00FCl\u0151 kikapcsol\u00E1s\u00E1hoz
Version=Verzi\u00F3
downgradeTo=Visszafriss\u00EDt\u00E9s {0} verzi\u00F3ra
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
diff --git a/core/src/main/resources/hudson/PluginManager/installed_id.properties b/core/src/main/resources/hudson/PluginManager/installed_id.properties
deleted file mode 100644
index 880aaa392fad34f80ba91b0b22d21709a4c848e1..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/PluginManager/installed_id.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file is under the MIT License by authors
-
-Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=Perubahan akan berefek ketika anda mengulang Jenkins
-Enabled=Diaktifkan
-Name=Nama
-Previously\ installed\ version=Versi terpasang sebelumnya
-Restart\ Once\ No\ Jobs\ Are\ Running=Restart Begitu Tidak Ada Pekerjaan Berjalan
-Version=Versi
diff --git a/core/src/main/resources/hudson/PluginManager/installed_it.properties b/core/src/main/resources/hudson/PluginManager/installed_it.properties
index 0c30e7269d122832fc67c9585b1bffb81121b59c..2be147af2a3a07f1079642d9cdaaa49f304b847a 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_it.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_it.properties
@@ -23,12 +23,9 @@
Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=Le modifiche avranno effetto quando riavvierai Jenkins
Enabled=Attivo
Name=Nome
-Pinned=Bloccato
Previously\ installed\ version=Versione precedente
Restart\ Once\ No\ Jobs\ Are\ Running=Riavvia quando non ci sono lavori in esecuzione
Uncheck\ to\ disable\ the\ plugin=Deseleziona per disattivare il plugin
Uninstall=Disintalla
-Unpin=Sblocca
Version=Versione
downgradeTo=Retrocedi a
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
diff --git a/core/src/main/resources/hudson/PluginManager/installed_ja.properties b/core/src/main/resources/hudson/PluginManager/installed_ja.properties
index cca9a2797f7350e2a3c8134cd565fddc7811f0d7..8e9aaf1ef60c3fe9b450e5938855407ea3b3810d 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_ja.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_ja.properties
@@ -27,9 +27,6 @@ Enabled=\u6709\u52b9\u5316
Name=\u540d\u524d
Version=\u30d0\u30fc\u30b8\u30e7\u30f3
Restart\ Once\ No\ Jobs\ Are\ Running=\u30b8\u30e7\u30d6\u304c\u5b9f\u884c\u4e2d\u3067\u306a\u3051\u308c\u3070\u518d\u8d77\u52d5
-Pinned=\u30d4\u30f3
-Unpin=\u89e3\u9664
-wiki.url=http://wiki.jenkins-ci.org/display/JA/Pinned+Plugins
Previously\ installed\ version=\u524d\u56de\u30d0\u30fc\u30b8\u30e7\u30f3
downgradeTo={0} \u306b\u30c0\u30a6\u30f3\u30b0\u30ec\u30fc\u30c9
Update\ Center=\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u30bb\u30f3\u30bf\u30fc
diff --git a/core/src/main/resources/hudson/PluginManager/installed_ko.properties b/core/src/main/resources/hudson/PluginManager/installed_ko.properties
index 7a6397fbf43c26b8aff2d1febbb00bca4a35f369..1d745838f474d6d7a274acca4520adbe482b0bc3 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_ko.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_ko.properties
@@ -23,13 +23,10 @@
Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=Jenkins\uC744 \uC7AC\uC2DC\uC791\uD558\uBA74 \uBCC0\uACBD\uC0AC\uD56D\uC774 \uC801\uC6A9\uB429\uB2C8\uB2E4.
Enabled=\uC0AC\uC6A9\uAC00\uB2A5
Name=\uC774\uB984
-Pinned=\uACE0\uC815\uB428
Previously\ installed\ version=\uC774\uC804 \uC124\uCE58 \uBC84\uC804
Restart\ Once\ No\ Jobs\ Are\ Running=\uB3D9\uC791\uC911\uC778 \uC791\uC5C5\uC774 \uC5C6\uC73C\uBA74 \uD55C\uBC88 \uC7AC\uAE30\uB3D9\uD569\uB2C8\uB2E4.
Uncheck\ to\ disable\ the\ plugin=\uC0AC\uC6A9\uBD88\uAC00 \uD50C\uB7EC\uADF8\uC778 \uCCB4\uD06C\uD574\uC81C
Uninstall=\uC124\uCE58 \uC81C\uAC70
Uninstallation\ pending=\uC0AD\uC81C \uB300\uAE30
-Unpin=\uACE0\uC815 \uD574\uC81C
Version=\uBC84\uC804
downgradeTo={0}\uC73C\uB85C \uB2E4\uC6B4\uADF8\uB808\uC774\uB4DC
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
diff --git a/core/src/main/resources/hudson/PluginManager/installed_lv.properties b/core/src/main/resources/hudson/PluginManager/installed_lv.properties
index 27b7271b2c7ca80d3bf812a3945af09a2c23521a..6539b07429a8033f1f0bd1e9a25b1f4919dcec87 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_lv.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_lv.properties
@@ -3,11 +3,8 @@
Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=Izmai\u0146as st\u0101sies sp\u0113k\u0101 p\u0113c Jenkins p\u0101rstart\u0113\u0161anas
Enabled=Iespejots
Name=Nosaukums
-Pinned=Piesaist\u012Bts
Previously\ installed\ version=Iepriek\u0161 instal\u0113t\u0101 versija
Restart\ Once\ No\ Jobs\ Are\ Running=P\u0101rstart\u0113 tikl\u012Bdz neviens uzdevums nestr\u0101d\u0101
Uncheck\ to\ disable\ the\ plugin=At\u0137eks\u0113 lai atsp\u0113jotu spraudni
Uninstall=Atinstal\u0113t
-Unpin=Atsiet
Version=Versija
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
diff --git a/core/src/main/resources/hudson/PluginManager/installed_nl.properties b/core/src/main/resources/hudson/PluginManager/installed_nl.properties
index 78c5ea28610ab25a901a9f3959b97abf820a91b1..aa7cc818944895680c9fafd0b01dbf47cf58fb2d 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_nl.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_nl.properties
@@ -27,10 +27,7 @@ Restart\ Once\ No\ Jobs\ Are\ Running=Opnieuw starten
Uncheck\ to\ disable\ the\ plugin=Vink aan om de plugin te de-activeren.
Enabled=Actief
Name=Naam
-Unpin=Losmaken
Version=Versie
-Pinned=Vastgezet
Previously\ installed\ version=Vorige ge\u00EFnstalleerde versie
Restart\ Now=Nu herstarten
downgradeTo=Versie {0} terugzetten
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
diff --git a/core/src/main/resources/hudson/PluginManager/installed_pl.properties b/core/src/main/resources/hudson/PluginManager/installed_pl.properties
index 47bc109f1610e7bcb56bee252f1219fbbb80e717..4fb0ab51f38e684b709ed63b14ead78d5bce3bec 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_pl.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_pl.properties
@@ -1,6 +1,6 @@
# The MIT License
#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
+# Copyright (c) 2004-2017, Sun Microsystems, Damian Szczepanik
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -23,13 +23,19 @@
Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=Zmiany zostan\u0105 wprowadzone po ponownym uruchomieniu Jenkinsa
Enabled=W\u0142\u0105czone wtyczki
Name=Nazwa
-Pinned=Przypi\u0119ta
Previously\ installed\ version=Poprzednia zainstalowana wersja
-Restart\ Once\ No\ Jobs\ Are\ Running=Zrestartuj gdy \u017Cadne zadania nie s\u0105 wykonywane
+Restart\ Once\ No\ Jobs\ Are\ Running=Uruchom ponownie gdy \u017Cadne zadania nie s\u0105 wykonywane
Uncheck\ to\ disable\ the\ plugin=Odznacz aby wy\u0142\u0105czy\u0107 wtyczk\u0119
Uninstall=Odinstaluj
-Unpin=Odepnij
Version=Wersja
-downgradeTo=Powr\u00F3\u0107 do starszej wersji {0}
+downgradeTo=Powr\u00F3\u0107 do wersji {0}
requires.restart=Wymagane jest ponowne uruchomienie Jenkinsa. Zmiany wtyczek w tym momencie s\u0105 bardzo niewskazane. Uruchom ponownie Jenkinsa, zanim wprowadzisz zmiany.
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
+Uninstallation\ pending=Trwa odinstalowywanie
+This\ plugin\ cannot\ be\ disabled=Ta wtyczka nie mo\u017Ce by\u0107 wy\u0142\u0105czona
+No\ plugins\ installed.=Brak zainstalowanych wtyczek
+This\ plugin\ cannot\ be\ enabled=Ta wtyczka nie mo\u017Ce by\u0107 w\u0142\u0105czona
+Update\ Center=Centrum aktualizacji
+Filter=Filtruj
+No\ description\ available.=Opis nie jest dost\u0119pny
+Warning=Ostrze\u017Cenie
+New\ plugins\ will\ take\ effect\ once\ you\ restart\ Jenkins=Nowe wtyczki zostan\u0105 w\u0142\u0105czone po ponownym uruchomieniu Jenkinsa.
diff --git a/core/src/main/resources/hudson/PluginManager/installed_pt_BR.properties b/core/src/main/resources/hudson/PluginManager/installed_pt_BR.properties
index 492b30e39c76f80fbb68d008212cd664ef2d08fa..543c634fa81a45edad7691004e9cae6b15accbd3 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_pt_BR.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_pt_BR.properties
@@ -24,15 +24,12 @@ No\ plugins\ installed.=Nenhum plugin instalado.
Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=A mudan\u00e7as ter\u00e3o efeito quando o Jenkins for reiniciado
Uncheck\ to\ disable\ the\ plugin=Desmarque para desativar o plugin
Enabled=Habilitar
-Pinned=Fixado
Previously\ installed\ version=Vers\u00E3o anterior instalada
Restart\ Once\ No\ Jobs\ Are\ Running=Reiniciar assim que nenhum job estiver rodando
Uninstall=Desinstalar
-Unpin=Desprender
Version=Vers\u00e3o
Name=Nome
downgradeTo=Regredir para {0}
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
Filter=Filtro
Update\ Center=Central de atualiza\u00e7\u00e3o
No\ description\ available.=Nenhuma descri\u00e7\u00e3o dispon\u00edvel
diff --git a/core/src/main/resources/hudson/PluginManager/installed_pt_PT.properties b/core/src/main/resources/hudson/PluginManager/installed_pt_PT.properties
index 32259b92eca3c3e50a56ec81e1a3107c2827e1ae..e4464f4900255725f2afe88835223683096d8d60 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_pt_PT.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_pt_PT.properties
@@ -3,11 +3,9 @@
Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=As altera\u00E7\u00F5es ser\u00E3o aplicadas quando reiniciares o Jenkins
Enabled=Ativado
Name=Nome
-Pinned=Fixo
Previously\ installed\ version=\u00DAltima vers\u00E3o instalada
Restart\ Once\ No\ Jobs\ Are\ Running=Reiniciar quando n\u00E3o estiverem Jobs em execu\u00E7\u00E3o
Uncheck\ to\ disable\ the\ plugin=Seleccione para desactivar o plugin
Uninstall=Desinstalar
Version=Vers\u00E3o
downgradeTo=Downgrade para {0}
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
diff --git a/core/src/main/resources/hudson/PluginManager/installed_ro.properties b/core/src/main/resources/hudson/PluginManager/installed_ro.properties
index 9d960272ae146aaa3bba204479e7ecd274637254..a0fc137d09387e6dff7b675cb0a52bca9d2de112 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_ro.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_ro.properties
@@ -3,11 +3,8 @@
Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=Schimb\u0103rile vor avea efect c\u00E2nd ve\u021Bi reporni Jenkins
Enabled=Activat
Name=Denumire
-Pinned=Fixat
Previously\ installed\ version=Versiunea instalat\u0103 anterior
Restart\ Once\ No\ Jobs\ Are\ Running=Reporne\u0219te odat\u0103 ce nu mai sunt joburi ce ruleaz\u0103
Uncheck\ to\ disable\ the\ plugin=Debifa\u021Bi pentru a dezactiva pluginul
-Unpin=Defixeaz\u0103
Version=Versiune
downgradeTo=Retrogradeaz\u0103 la
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
diff --git a/core/src/main/resources/hudson/PluginManager/installed_ru.properties b/core/src/main/resources/hudson/PluginManager/installed_ru.properties
index 8fd3ed203354f97eeb08bc116a5c431388a1762a..02ece9626713737dc2422ba15194ea032ea8e010 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_ru.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_ru.properties
@@ -23,13 +23,10 @@
Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=\u0418\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0432\u0441\u0442\u0443\u043f\u044f\u0442 \u0432 \u0441\u0438\u043b\u0443 \u043f\u043e\u0441\u043b\u0435 \u043f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 Jenkins
Enabled=\u0410\u043a\u0442\u0438\u0432\u043d\u044b\u0439
Name=\u041d\u0430\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u0438\u0435
-Pinned=\u041f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0451\u043d\u043d\u044b\u0435
Previously\ installed\ version=\u0420\u0430\u043d\u0435\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043d\u044b\u0435 \u0432\u0435\u0440\u0441\u0438\u0438
Restart\ Once\ No\ Jobs\ Are\ Running=\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u043f\u043e\u0441\u043b\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0438\u0438 \u0432\u0441\u0435\u0445 \u0437\u0430\u0434\u0430\u0447
Uncheck\ to\ disable\ the\ plugin=\u0421\u043d\u0438\u043c\u0438\u0442\u0435 \u0444\u043b\u0430\u0436\u043e\u043a, \u0447\u0442\u043e\u0431\u044b \u0432\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043f\u043b\u0430\u0433\u0438\u043d
Uninstall=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
Uninstallation\ pending=\u041e\u0436\u0438\u0434\u0430\u043d\u0438\u0435 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f...
-Unpin=\u041e\u0442\u043a\u0440\u0435\u043f\u0438\u0442\u044c
Version=\u0412\u0435\u0440\u0441\u0438\u044f
downgradeTo=\u0412\u0435\u0440\u043d\u0443\u0442\u044c \u043a \u0432\u0435\u0440\u0441\u0438\u0438 {0}
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
diff --git a/core/src/main/resources/hudson/PluginManager/installed_sk.properties b/core/src/main/resources/hudson/PluginManager/installed_sk.properties
index c8e910951476144131acf6f7d57f124a68bf1a0b..a8be79712009f819087e3ea9a128f30c00b12407 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_sk.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_sk.properties
@@ -9,4 +9,3 @@ Uncheck\ to\ disable\ the\ plugin=Odzna\u010Den\u00EDm zak\u00E1\u017Eete plugin
Uninstall=Odin\u0161taluj
Uninstallation\ pending=Odin\u0161tal\u00E1cia \u010Dak\u00E1
Version=Verzia
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
diff --git a/core/src/main/resources/hudson/PluginManager/installed_sr.properties b/core/src/main/resources/hudson/PluginManager/installed_sr.properties
new file mode 100644
index 0000000000000000000000000000000000000000..b555a4dbe95c4f1292178ce39b49dcc2e388a2c7
--- /dev/null
+++ b/core/src/main/resources/hudson/PluginManager/installed_sr.properties
@@ -0,0 +1,26 @@
+# This file is under the MIT License by authors
+
+Update\ Center=\u0426\u0435\u043D\u0442\u0430\u0440 \u0437\u0430 \u0410\u0436\u0443\u0440\u0438\u0440\u0430\u045A\u0435
+Filter=\u041F\u0440\u043E\u0444\u0438\u043B\u0442\u0440\u0438\u0440\u0430\u0458
+Warning=\u0423\u043F\u043E\u0437\u043E\u0440\u0435\u045A\u0435
+requires.restart=\u041F\u043E\u0442\u0440\u0435\u0431\u043D\u043E \u0458\u0435 \u043F\u043E\u043D\u043E\u0432\u043E \u043F\u043E\u043A\u0440\u0435\u043D\u0443\u0442\u0438 Jenkins. \u041E\u043F\u0430\u0441\u043D\u043E \u0458\u0435 \u043C\u0435\u045A\u0430\u0442\u0438 \u043C\u043E\u0434\u0443\u043B\u0435 \u0443 \u043E\u0432\u043E \u0432\u0440\u0435\u043C\u0435 - \u043F\u043E\u043D\u043E\u0432\u043E Jenkins \u043F\u0440\u0435 \u043D\u0435\u0433\u043E \u0448\u0442\u043E \u0434\u0435\u043B\u0443\u0458\u0435\u0442\u0435 \u0434\u0430\u0459\u0435.
+This\ plugin\ cannot\ be\ enabled=\u041E\u0432\u0430 \u043C\u043E\u0434\u0443\u043B\u0430 \u043D\u0435\u043C\u043E\u0436\u0435 \u0431\u0438\u0442\u0438 \u043E\u043C\u043E\u0433\u0443\u045B\u0435\u043D\u0430
+This\ plugin\ cannot\ be\ disabled=\u041E\u0432\u0430 \u043C\u043E\u0434\u0443\u043B\u0430 \u043D\u0435\u043C\u043E\u0436\u0435 \u0431\u0438\u0442\u0438 \u043E\u043D\u0435\u043C\u043E\u0433\u0443\u045B\u0435\u043D\u0430
+This\ plugin\ cannot\ be\ uninstalled=\u041E\u0432\u0430 \u043C\u043E\u0434\u0443\u043B\u0430 \u043D\u0435\u043C\u043E\u0436\u0435 \u0432\u0438\u0442\u0438 \u0434\u0435\u0438\u043D\u0441\u0442\u0430\u043B\u0438\u0440\u0430\u043D\u0430
+It\ has\ one\ or\ more\ disabled\ dependencies=\u041F\u043E\u0441\u0442\u043E\u0458\u0438 \u043D\u0430\u0458\u043C\u0430\u045A\u0435 \u0458\u0435\u0434\u043D\u0430 \u0438\u0441\u043A\u0459\u0443\u0447\u0435\u043D\u0430 \u043C\u043E\u0434\u0443\u043B\u0430 \u043E\u0434 \u043A\u043E\u0458\u0435 \u043E\u0432\u0430 \u0437\u0430\u0432\u0438\u0441\u0438
+It\ has\ one\ or\ more\ enabled\ dependants=\u041F\u043E\u0441\u0442\u043E\u0458\u0438 \u043D\u0430\u0458\u043C\u0430\u045A\u0435 \u0458\u0435\u043D\u0434\u0430 \u0434\u0440\u0443\u0433\u0430 \u043C\u043E\u0434\u0443\u043B\u0430 \u043A\u043E\u0458\u0430 \u0437\u0430\u0432\u0438\u0441\u0438 \u043E\u0434 \u045A\u0435
+It\ has\ one\ or\ more\ installed\ dependants=\u041F\u043E\u0441\u0442\u043E\u0458\u0438 \u043D\u0430\u0458\u043C\u0430\u045A\u0435 \u0458\u0435\u043D\u0434\u0430 \u0434\u0440\u0443\u0433\u0430 \u043C\u043E\u0434\u0443\u043B\u0430 \u043A\u043E\u0458\u0430 \u0437\u0430\u0432\u0438\u0441\u0438 \u043E\u0434 \u045A\u0435
+No\ plugins\ installed.=\u041D\u0435\u043C\u0430 \u0438\u043D\u0441\u0442\u0430\u043B\u0438\u0440\u0430\u043D\u0438\u0445 \u043C\u043E\u0434\u0443\u043B\u0430
+Uncheck\ to\ disable\ the\ plugin=\u0423\u043A\u043B\u043E\u043D\u0438\u0442\u0435 \u043A\u0432\u0430\u0447\u0438\u0446\u0443 \u0434\u0430 \u043E\u043D\u0435\u043C\u043E\u0433\u0443\u045B\u0438\u0442\u0435 \u043C\u043E\u0434\u0443\u043B\u0443
+Enabled=\u0410\u043A\u0442\u0438\u043D\u0432\u043E
+Name=\u0418\u043C\u0435
+Version=\u0412\u0435\u0440\u0437\u0438\u0458\u0430
+Previously\ installed\ version=\u041F\u0440\u0435\u0442\u0445\u043E\u0434\u043D\u043E \u0438\u043D\u0441\u0442\u0430\u043B\u0438\u0440\u0430\u043D\u0430 \u0432\u0435\u0440\u0437\u0438\u0458\u0430
+Uninstall=\u0414\u0435\u0438\u043D\u0441\u0442\u0430\u043B\u0430\u0446\u0438\u0458\u0430
+No\ description\ available.=\u041D\u0435\u043C\u0430 \u043E\u043F\u0438\u0441\u0430
+downgradeTo=\u0412\u0440\u0430\u0442\u0438 \u0432\u0435\u0440\u0437\u0438\u0458\u0443 \u043D\u0430\u0437\u0430\u0434 \u043D\u0430 {0}
+Uninstallation\ pending=\u0414\u0435\u0438\u043D\u0441\u0442\u0430\u043B\u0430\u0446\u0438\u0458\u0430 \u0458\u0435 \u0443 \u0442\u043E\u043A\u0443
+Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=\u041F\u0440\u043E\u043C\u0435\u043D\u0435 \u045B\u0435 \u0441\u0442\u0443\u043F\u0438\u0442\u0438 \u043D\u0430\u043A\u043E\u043D \u043F\u043E\u043D\u043E\u0432\u043D\u043E\u0433 \u043F\u043E\u043A\u0440\u0435\u0442\u0430\u045A\u0430 Jenkins
+Restart\ Once\ No\ Jobs\ Are\ Running=\u041F\u043D\u043E\u0432\u043E \u043F\u043E\u043A\u0440\u0435\u043D\u0442\u0438 \u043A\u0430\u0434 \u043D\u0435 \u0431\u0443\u0434\u0435 \u0431\u0438\u043B\u043E \u0442\u0435\u043A\u0443\u045B\u0438\u0445 \u0437\u0430\u0434\u0430\u0442\u0430\u043A\u0430.
+New\ plugins\ will\ take\ effect\ once\ you\ restart\ Jenkins=\u041D\u043E\u0432\u0435 \u043C\u043E\u0434\u0443\u043B\u0435 \u045B\u0435 \u0441\u0442\u0443\u043F\u0438\u0442\u0438 \u043D\u0430\u043A\u043E\u043D \u043F\u043E\u043D\u043E\u0432\u043E\u0433 \u043F\u043E\u043A\u0440\u0435\u0442\u0430\u045A\u0430
+Restart\ Now=\u041F\u043E\u043D\u043E\u0432\u043E \u043F\u043E\u043A\u0440\u0435\u043D\u0438 \u0441\u0430\u0434\u0430
diff --git a/core/src/main/resources/hudson/PluginManager/installed_uk.properties b/core/src/main/resources/hudson/PluginManager/installed_uk.properties
deleted file mode 100644
index cdfbd4ea6110127b07f899d1dbdf51677200eddf..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/PluginManager/installed_uk.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is under the MIT License by authors
-
-Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=\uBCC0\uACBD\uC0AC\uD56D\uC740 \uC820\uD0A8\uC2A4\uB97C \uC7AC\uC2DC\uC791\uD560\uB54C \uC801\uC6A9\uB429\uB2C8\uB2E4
-Enabled=\uD65C\uC131\uD654\uB428
-Name=\uC774\uB984
-Pinned=\uD540 \uACE0\uC815
-Previously\ installed\ version=\uC774\uC804\uC5D0 \uC124\uCE58\uD55C \uBC84\uC804
-Restart\ Once\ No\ Jobs\ Are\ Running=\uC544\uBB34\uB7F0 \uC791\uC5C5\uC774 \uC5C6\uC744 \uB54C \uC7AC\uC2DC\uC791\uD558\uAE30
-Uncheck\ to\ disable\ the\ plugin=\uD50C\uB7EC\uADF8\uC778\uC744 \uBE44\uD65C\uC131\uD654\uD558\uB824\uBA74 \uCCB4\uD06C\uB97C \uD574\uC9C0\uD558\uC2ED\uC2DC\uC624
-Uninstall=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438
-Unpin=\uD540 \uD574\uCCB4
-Version=\uBC84\uC804
-downgradeTo={0}\uB85C \uB2E4\uC6B4\uADF8\uB808\uC774\uB4DC
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
diff --git a/core/src/main/resources/hudson/PluginManager/installed_zh_CN.properties b/core/src/main/resources/hudson/PluginManager/installed_zh_CN.properties
index 20edd4eb6a73edac358789c094d1ca71ff907074..cef268874e540eb42c2222a5bcade4e6c00a3ef0 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_zh_CN.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_zh_CN.properties
@@ -23,12 +23,9 @@
Changes\ will\ take\ effect\ when\ you\ restart\ Jenkins=\u6240\u6709\u6539\u53D8\u4F1A\u5728\u91CD\u65B0\u542F\u52A8Jenkins\u4EE5\u540E\u751F\u6548\u3002
Enabled=\u542F\u7528
Name=\u540D\u79F0
-Pinned=\u7ED1\u5B9A
Previously\ installed\ version=\u4E0A\u4E00\u4E2A\u5B89\u88C5\u7684\u7248\u672C
Restart\ Once\ No\ Jobs\ Are\ Running=\u5F53\u6CA1\u6709\u4EFB\u52A1\u65F6\u91CD\u542F
Uncheck\ to\ disable\ the\ plugin=\u53D6\u6D88\u9009\u62E9\u4EE5\u7981\u7528\u63D2\u4EF6
Uninstall=\u5378\u8F7D
-Unpin=\u89E3\u9664\u7ED1\u5B9A
Version=\u7248\u672C
downgradeTo=\u964D\u5230
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
diff --git a/core/src/main/resources/hudson/PluginManager/installed_zh_TW.properties b/core/src/main/resources/hudson/PluginManager/installed_zh_TW.properties
index 205f23e21971174a1f3015c5ca9368066df6d4f8..9721180a51cfad58cb54873faaed0fa82bba6b11 100644
--- a/core/src/main/resources/hudson/PluginManager/installed_zh_TW.properties
+++ b/core/src/main/resources/hudson/PluginManager/installed_zh_TW.properties
@@ -30,11 +30,8 @@ Enabled=\u5DF2\u555F\u7528
Name=\u540d\u7a31
Version=\u7248\u672c
Previously\ installed\ version=\u524D\u4E00\u5B89\u88DD\u7248\u672C
-Pinned=\u5df2\u639b\u8f09
downgradeTo=\u964d\u7248\u6210 {0}
-Unpin=\u5378\u9664
-wiki.url=http://wiki.jenkins-ci.org/display/JENKINS/Pinned+Plugins
Uninstallation\ pending=\u89e3\u9664\u5b89\u88dd\u4f5c\u696d\u64f1\u7f6e\u4e2d
Uninstall=\u89E3\u9664\u5B89\u88DD
diff --git a/core/src/main/resources/hudson/PluginManager/sidepanel.groovy b/core/src/main/resources/hudson/PluginManager/sidepanel.groovy
index 98aeab34702702834934e1499d9f20e3286ebd81..d129bd53c71afabdb533e5a7e679fad3906d656c 100644
--- a/core/src/main/resources/hudson/PluginManager/sidepanel.groovy
+++ b/core/src/main/resources/hudson/PluginManager/sidepanel.groovy
@@ -28,7 +28,7 @@ l.header()
l.side_panel {
l.tasks {
l.task(icon:"icon-up icon-md", href:rootURL+'/', title:_("Back to Dashboard"))
- l.task(icon:"icon-setting icon-md", href:"${rootURL}/manage", title:_("Manage Jenkins"), permission:app.ADMINISTER, it:app)
+ l.task(icon:"icon-gear2 icon-md", href:"${rootURL}/manage", title:_("Manage Jenkins"), permission:app.ADMINISTER, it:app)
if (!app.updateCenter.jobs.isEmpty()) {
l.task(icon:"icon-plugin icon-md", href:"${rootURL}/updateCenter/", title:_("Update Center"))
}
diff --git a/core/src/main/resources/hudson/PluginManager/sidepanel_bg.properties b/core/src/main/resources/hudson/PluginManager/sidepanel_bg.properties
new file mode 100644
index 0000000000000000000000000000000000000000..18a142f1ce25170da4da6e000fa3b12385b7f7dd
--- /dev/null
+++ b/core/src/main/resources/hudson/PluginManager/sidepanel_bg.properties
@@ -0,0 +1,28 @@
+# The MIT License
+#
+# Bulgarian translation: Copyright (c) 2015, 2016, Alexander Shopov
+#
+# 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.
+
+Back\ to\ Dashboard=\
+ \u041a\u044a\u043c \u043e\u0441\u043d\u043e\u0432\u043d\u0438\u044f \u0435\u043a\u0440\u0430\u043d
+Manage\ Jenkins=\
+ \u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043d\u0430 Jenkins
+Update\ Center=\
+ \u0421\u0430\u0439\u0442 \u0437\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f
diff --git a/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_fr.properties b/core/src/main/resources/hudson/PluginManager/sidepanel_pl.properties
similarity index 88%
rename from core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_fr.properties
rename to core/src/main/resources/hudson/PluginManager/sidepanel_pl.properties
index 0ed84708b8dbaab5f397c796020c683f42839d23..cd9cfbdce1c1d2b016ae8aba04bfc322236240b0 100644
--- a/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_fr.properties
+++ b/core/src/main/resources/hudson/PluginManager/sidepanel_pl.properties
@@ -1,6 +1,6 @@
# The MIT License
#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant
+# Copyright (c) 2004-2016, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant
#
# 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,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-cancel\ this\ build=annuler cette construction
-pending= lancer
+Back\ to\ Dashboard=Powr\u00F3t do tablicy
+Manage\ Jenkins=Zarz\u0105dzaj Jenkinsem
diff --git a/core/src/main/resources/hudson/PluginManager/sidepanel_sr.properties b/core/src/main/resources/hudson/PluginManager/sidepanel_sr.properties
new file mode 100644
index 0000000000000000000000000000000000000000..baba7c569c30a788802dce6a9cf9ba11f431ebc2
--- /dev/null
+++ b/core/src/main/resources/hudson/PluginManager/sidepanel_sr.properties
@@ -0,0 +1,5 @@
+# This file is under the MIT License by authors
+
+Back\ to\ Dashboard=\u041D\u0430\u0437\u0430\u0434 \u043A\u0430 \u043A\u043E\u043D\u0442\u043E\u0440\u043B\u043D\u043E\u0458 \u043F\u0430\u043D\u0435\u043B\u0438
+Manage\ Jenkins=\u0423\u043F\u0440\u0430\u0432\u0459\u0430\u045A\u0435 Jenkins-\u043E\u043C
+Update\ Center=\u0426\u0435\u043D\u0442\u0430\u0440 \u0437\u0430 \u0410\u0436\u0443\u0440\u0438\u0440\u0430\u045A\u0435
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Executor/causeOfDeath_zh_TW.properties b/core/src/main/resources/hudson/PluginManager/sites_bg.properties
similarity index 75%
rename from core/src/main/resources/hudson/model/Executor/causeOfDeath_zh_TW.properties
rename to core/src/main/resources/hudson/PluginManager/sites_bg.properties
index 1a5bca33768540002aa1bdf4524017799507650b..52e24f2840bb03b5e019691503113d20609ffb4a 100644
--- a/core/src/main/resources/hudson/model/Executor/causeOfDeath_zh_TW.properties
+++ b/core/src/main/resources/hudson/PluginManager/sites_bg.properties
@@ -1,6 +1,6 @@
# The MIT License
#
-# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang
+# Bulgarian translation: Copyright (c) 2015, 2016, Alexander Shopov
#
# 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,8 +20,10 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-Back=\u8fd4\u56de
-Thread\ is\ still\ alive=Thread \u904b\u4f5c\u4e2d
-Thread\ has\ died=Thread \u5df2\u4e2d\u6b62
-more\ info=\u66f4\u591a\u8cc7\u8a0a
-Restart\ this\ thread=\u91cd\u65b0\u555f\u52d5 Thread
+Remove=\
+ \u041f\u0440\u0435\u043c\u0430\u0445\u0432\u0430\u043d\u0435
+Add...=\
+ \u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\u2026
+Update\ Center=\
+ \u0421\u0430\u0439\u0442 \u0437\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f
+
diff --git a/core/src/main/resources/hudson/PluginManager/sites_sr.properties b/core/src/main/resources/hudson/PluginManager/sites_sr.properties
new file mode 100644
index 0000000000000000000000000000000000000000..008225b821ad3154447f184aeb3fba9c275af713
--- /dev/null
+++ b/core/src/main/resources/hudson/PluginManager/sites_sr.properties
@@ -0,0 +1,5 @@
+# This file is under the MIT License by authors
+
+Update\ Center=\u0426\u0435\u043D\u0442\u0430\u0440 \u0437\u0430 \u0430\u0436\u0443\u0440\u0438\u0440\u0430\u045A\u0435
+Add...=\u0414\u043E\u0434\u0430\u0458...
+Remove=\u0423\u043A\u043B\u043E\u043D\u0438
diff --git a/core/src/main/resources/hudson/PluginManager/tabBar_bg.properties b/core/src/main/resources/hudson/PluginManager/tabBar_bg.properties
index 1c89e45f4ada87a2f6d3126feb2edf37133778b6..440d9b26d84a9a35acbda671965d6cc1173a06f7 100644
--- a/core/src/main/resources/hudson/PluginManager/tabBar_bg.properties
+++ b/core/src/main/resources/hudson/PluginManager/tabBar_bg.properties
@@ -1,6 +1,32 @@
-# This file is under the MIT License by authors
+# The MIT License
+#
+# Bulgarian translation: Copyright (c) 2015, 2016, Alexander Shopov
+#
+# 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.
-Advanced=\u0420\u0430\u0437\u0448\u0438\u0440\u0435\u043D\u0438
-Available=\u041D\u0430\u043B\u0438\u0447\u043D\u0438
-Installed=\u0418\u043D\u0441\u0442\u0430\u043B\u0438\u0440\u0430\u043D\u0438
-Updates=\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u044F
+Advanced=\
+ \u0414\u043e\u043f\u044a\u043b\u043d\u0438\u0442\u0435\u043b\u043d\u0438
+Available=\
+ \u041d\u0430\u043b\u0438\u0447\u043d\u0438
+Installed=\
+ \u0418\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430\u043d\u0438
+Updates=\
+ \u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f
+Sites=\
+ \u0421\u0430\u0439\u0442\u043e\u0432\u0435
diff --git a/core/src/main/resources/hudson/PluginManager/tabBar_ca.properties b/core/src/main/resources/hudson/PluginManager/tabBar_ca.properties
index 018ec6ea8aa597537866ccde6ece6b7c04cf2672..7465dffa99a8abad29aeb6525002444fe77b6f69 100644
--- a/core/src/main/resources/hudson/PluginManager/tabBar_ca.properties
+++ b/core/src/main/resources/hudson/PluginManager/tabBar_ca.properties
@@ -3,4 +3,4 @@
Advanced=Avan\u00E7at
Available=Disponible
Installed=Instal\u00B7lats
-Updates=Actulitzacions
+Updates=Actualitzacions
diff --git a/core/src/main/resources/hudson/PluginManager/tabBar_sr.properties b/core/src/main/resources/hudson/PluginManager/tabBar_sr.properties
new file mode 100644
index 0000000000000000000000000000000000000000..c7e4f8cb4bab6a7ffadb29e6a162a1da3633fb29
--- /dev/null
+++ b/core/src/main/resources/hudson/PluginManager/tabBar_sr.properties
@@ -0,0 +1,7 @@
+# This file is under the MIT License by authors
+
+Updates=\u041D\u0430\u0434\u0433\u0440\u0430\u0434\u045A\u0435
+Available=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u043E
+Installed=\u0418\u043D\u0441\u0442\u0430\u043B\u0438\u0440\u0430\u043D\u043E
+Advanced=\u041D\u0430\u043F\u0440\u0435\u0434\u043D\u043E
+Sites=\u0421\u0442\u0440\u0430\u043D\u0438\u0446\u0435
diff --git a/core/src/main/resources/hudson/PluginManager/tabBar_th.properties b/core/src/main/resources/hudson/PluginManager/tabBar_th.properties
deleted file mode 100644
index 73f99e3b966497deb42e710586e87df830e6d6f6..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/PluginManager/tabBar_th.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is under the MIT License by authors
-
-Advanced=\u0E02\u0E31\u0E49\u0E19\u0E2A\u0E39\u0E07
-Available=\u0E17\u0E35\u0E48\u0E21\u0E35\u0E2D\u0E22\u0E39\u0E48
-Installed=\u0E15\u0E34\u0E14\u0E15\u0E31\u0E49\u0E07\u0E41\u0E25\u0E49\u0E27
-Updates=\u0E1B\u0E23\u0E31\u0E1A\u0E1B\u0E23\u0E38\u0E07
diff --git a/core/src/main/resources/hudson/PluginManager/table.jelly b/core/src/main/resources/hudson/PluginManager/table.jelly
index e8c75170b412f01cdc4ac3fa8b082801d1057be6..52fed7654972f959acec2c9943fcd857db702e40 100644
--- a/core/src/main/resources/hudson/PluginManager/table.jelly
+++ b/core/src/main/resources/hudson/PluginManager/table.jelly
@@ -49,12 +49,13 @@ THE SOFTWARE.
-
- ${%The slave this project has run on for the last time was removed.}
+ ${%The agent this project has run on for the last time was removed.}
${%li3(it.workspace)}
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_bg.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_bg.properties
new file mode 100644
index 0000000000000000000000000000000000000000..fbec109035d7ab3bd4a47b47f985ddbdaed440cd
--- /dev/null
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_bg.properties
@@ -0,0 +1,44 @@
+# The MIT License
+#
+# Bulgarian translation: Copyright (c) 2015, 2016, Alexander Shopov
+#
+# 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.
+
+The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=\
+ \u041f\u0440\u043e\u0435\u043a\u0442\u044a\u0442 \u0431\u0435 \u043f\u0440\u0435\u0438\u043c\u0435\u043d\u0443\u0432\u0430\u043d \u0441\u043a\u043e\u0440\u043e. \u0412\u0441\u0435 \u043e\u0449\u0435 \u043d\u044f\u043c\u0430 \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0438\u044f \u0441 \u0442\u043e\u0432\u0430 \u0438\u043c\u0435.
+# The workspace directory ({0}) is removed outside Jenkins.
+li3=\
+ \u0420\u0430\u0431\u043e\u0442\u043d\u043e\u0442\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e \u201e{0}\u201c \u0435 \u043f\u0440\u043e\u043c\u0435\u043d\u044f\u043d\u043e \u0438\u0437\u0432\u044a\u043d Jenkins.
+There''s\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=\
+ \u0420\u0430\u0431\u043e\u0442\u043d\u043e\u0442\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e \u043d\u0430 \u0442\u043e\u0437\u0438 \u043f\u0440\u043e\u0435\u043a\u0442 \u043b\u0438\u043f\u0441\u0432\u0430. \u0412\u044a\u0437\u043c\u043e\u0436\u043d\u0438 \u043f\u0440\u0438\u0447\u0438\u043d\u0438 \u0441\u0430:
+text=\
+ \u0418\u0437\u043f\u044a\u043b\u043d\u0435\u0442\u0435 \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435 \u0438 Jenkins \u0449\u0435 \u0441\u044a\u0437\u0434\u0430\u0434\u0435 \u0440\u0430\u0431\u043e\u0442\u043d\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e.
+Error\:\ no\ workspace=\
+ \u0413\u0440\u0435\u0448\u043a\u0430: \u043b\u0438\u043f\u0441\u0432\u0430 \u0440\u0430\u0431\u043e\u0442\u043d\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e
+The\ workspace\ was\ wiped\ out\ and\ no\ build\ has\ been\ done\ since\ then.=\
+ \u0420\u0430\u0431\u043e\u0442\u043d\u043e\u0442\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e \u0435 \u0431\u0438\u043b\u043e \u0438\u0437\u0442\u0440\u0438\u0442\u043e \u0438 \u043e\u0442\u0442\u043e\u0433\u0430\u0432\u0430 \u043d\u044f\u043c\u0430 \u043d\u043e\u0432\u0438 \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0438\u044f.
+A\ project\ won''t\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ performed.=\
+ \u0417\u0430 \u0434\u0430 \u0441\u0435 \u0441\u044a\u0437\u0434\u0430\u0434\u0435 \u0440\u0430\u0431\u043e\u0442\u043d\u043e\u0442\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e \u043d\u0430 \u0435\u0434\u0438\u043d \u043f\u0440\u043e\u0435\u043a\u0442, \u0442\u043e\u0439 \u0442\u0440\u044f\u0431\u0432\u0430 \u043f\u044a\u0440\u0432\u043e \u0434\u0430 \u0441\u0435\
+ \u0438\u0437\u0433\u0440\u0430\u0434\u0438.
+The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=\
+ \u041a\u043e\u043c\u043f\u044e\u0442\u044a\u0440\u044a\u0442, \u043d\u0430 \u043a\u043e\u0439\u0442\u043e \u0442\u043e\u0437\u0438 \u043f\u0440\u043e\u0435\u043a\u0442 \u0435 \u0431\u0438\u043b \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u043e \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d, \u0435 \u0438\u0437\u0432\u0430\u0434\u0435\u043d \u043e\u0442\
+ \u043a\u043b\u044a\u0441\u0442\u044a\u0440\u0430.
+The\ agent\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=\
+ \u041a\u043e\u043c\u043f\u044e\u0442\u044a\u0440\u044a\u0442, \u043d\u0430 \u043a\u043e\u0439\u0442\u043e \u0442\u043e\u0437\u0438 \u043f\u0440\u043e\u0435\u043a\u0442 \u0435 \u0431\u0438\u043b \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u043e \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d, \u0435 \u0438\u0437\u0432\u0430\u0434\u0435\u043d \u043e\u0442\
+ \u043a\u043b\u044a\u0441\u0442\u044a\u0440\u0430.
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_da.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_da.properties
index 3db6b4afeea54c42e668a32908ff232065a1e78d..38f08ccf26d7e09d41bbd9ccfb531123a2c02012 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_da.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_da.properties
@@ -27,4 +27,3 @@ The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new
Projektet er blevet omd\u00f8bt for nyligt og ingen byg er endnu udf\u00f8rt under det nye navn
Error\:\ no\ workspace=Fejl: intet arbejdsomr\u00e5de
text=K\u00f8r et byg for at f\u00e5 Jenkins til at lave et arbejdsomr\u00e5de.
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=Slaven projektet sidst k\u00f8rte p\u00e5 er blevet fjernet.
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_de.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_de.properties
index 784afb23af17f2379dfde79e2f5440353fcd6024..2c42ae6b53be5c9c6ab4c1481ba3071135aa599e 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_de.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_de.properties
@@ -21,14 +21,11 @@
# THE SOFTWARE.
Error\:\ no\ workspace=Fehler: Kein Arbeitsbereich.
-A\ project\ won't\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ performed.=\
- Ein Projekt besitzt keinen Arbeitsbereich, so lange nicht mindestens ein Build ausgefhrt wurde.
-There's\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=\
- Es existiert kein Arbeitsbereich fr dieses Projekt. Mgliche Grnde sind:
The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=\
- Das Projekt wurde vor kurzem umbenannt und noch kein Build unter dem neuen Namen ausgefhrt.
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=\
- Der Slave, auf dem dieses Projekt das letzte Mal ausgefhrt wurde, wurde entfernt.
-li3=Das Arbeitsbereichsverzeichnis ({0}) wurde auerhalb von Jenkins entfernt.
+ Das Projekt wurde vor kurzem umbenannt und es wurde noch kein Build unter dem neuen Namen ausgef\u00FChrt.
+li3=Das Arbeitsbereichsverzeichnis ({0}) wurde au\u00DFerhalb von Jenkins entfernt.
text=Starten Sie einen Build, um von Jenkins einen Arbeitsbereich anlegen zu lassen.
The\ workspace\ was\ wiped\ out\ and\ no\ build\ has\ been\ done\ since\ then.=Der Arbeitsbereich wurde gel\u00F6scht und es wurde seitdem kein Build durchgef\u00FChrt.
+A\ project\ won''t\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ performed.=Ein Projekt hat keinen Arbeitsbereich, bevor nicht mindestens ein Build durchgef\u00FChrt wurde.
+There''s\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=Es gibt f\u00FCr dieses Projekt keinen Arbeitsbereich. M\u00F6gliche Gr\u00FCnde:
+The\ agent\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=Der Agent, auf dem dieses Projekt zuletzt ausgef\u00FChrt wurde, wurde entfernt.
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_es.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_es.properties
index fc9d13524e66602aafaf07f1ec29b13f3f5c6cd1..58f2750bb3423ae4b73a6327eab1a099bd0d372d 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_es.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_es.properties
@@ -26,7 +26,7 @@ text=Lanzar una ejecuci
There''s\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=No hay espacio de trabajo para este proyecto, las causas posibles son:
The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=El proyecto se ha renombrado y no se a ejecutado desde entonces
Error\:\ no\ workspace=Error, no hay espacio de trabajo
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=El nodo esclavo donde se ejecut la ltima vez se ha eliminado
+The\ agent\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=El agente donde se ejecut la ltima vez se ha eliminado
The\ workspace\ was\ wiped\ out\ and\ no\ build\ has\ been\ done\ since\ then.=El espacio de trabajo se ha borrado, y no se ha ejecutado la tarea desde entonces.
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_fr.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_fr.properties
index 70d43848b321293c94f0967270ec8b6bf6ba531a..09aa43473944061daadcc73d399df2f378103464 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_fr.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_fr.properties
@@ -24,6 +24,5 @@ Error\:\ no\ workspace=Erreur : pas de workspace
A\ project\ won't\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ performed.=Un projet n''a pas de workspace avant un premier build.
There's\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=Il n''y a pas de workspace existant pour ce projet. Les raisons possibles sont :
The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=Le projet a \u00e9t\u00e9 renomm\u00e9 r\u00e9cemment et aucun build n''a \u00e9t\u00e9 fait avec ce nouveau nom.
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=La machine esclave sur laquelle ce projet a \u00e9t\u00e9 lanc\u00e9 pour la derni\u00e8re fois a \u00e9t\u00e9 retir\u00e9e.
li3=Le r\u00e9pertoire de travail ({0}) a \u00e9t\u00e9 d\u00e9plac\u00e9 hors de Jenkins.
text=Lancer un build afin de faire cr\u00e9er un workspace par Jenkins.
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_ja.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_ja.properties
index 6f2a4b51856d7332072df660c644f2c24b776ab4..f8332b3369bbc542debb7e139671d2d05e78fa65 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_ja.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_ja.properties
@@ -27,8 +27,6 @@ There''s\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=\
\u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9\u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u3002\u4ee5\u4e0b\u306e\u7406\u7531\u304c\u8003\u3048\u3089\u308c\u307e\u3059\u3002
The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=\
\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u65b0\u3057\u3044\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d\u306b\u5909\u66f4\u3055\u308c\u305f\u5f8c\u306b\u3001\u305d\u306e\u540d\u524d\u3067\u30d3\u30eb\u30c9\u304c\u5b9f\u884c\u3055\u308c\u3066\u3044\u306a\u3044\u3002
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=\
- \u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u6700\u5f8c\u306b\u5b9f\u884c\u3057\u305f\u30b9\u30ec\u30fc\u30d6\u304c\u3001\u5916\u3055\u308c\u305f\u3002
li3=\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\uff08{0}\uff09\u304cJenkins\u306e\u7ba1\u7406\u5916\u3078\u53d6\u308a\u9664\u304b\u308c\u305f\u3002
text=\u30d3\u30eb\u30c9\u3092\u5b9f\u884c\u3057\u3066\u3001\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9\u3092\u4f5c\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002
The\ workspace\ was\ wiped\ out\ and\ no\ build\ has\ been\ done\ since\ then.=\
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_nl.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_nl.properties
index a569ad31227a6de65809639d245cd787bedcc4f2..2e441f20407920f6ca523661a5090080378745a4 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_nl.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_nl.properties
@@ -24,6 +24,5 @@ Error\:\ no\ workspace=Fout : geen werkplaats beschikbaar
A\ project\ won't\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ performed.=Een project zal geen werkplaats hebben tot er op zijn mins \u00E9\u00E9n bouwpoging plaatsgevonden heeft.
There's\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=Er is geen werkplaats beschikbaar voor dit project. Mogelijke redenen zijn :
The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=Dit project werd hernoemd en heeft nog bouwpoging plaats gevonden onder de nieuwe naam.
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=De slaafnode die dit project het laatst gebouwd heeft werd verwijderd.
li3=Het pad naar de werkplaats ({0}) werd buiten Jenkins verwijderd.
text=Lanceer een bouwpoging om Jenkins de werkplaats te laten cre\u00EBren.
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_pt_BR.properties
index a05b67754518ad6748b1f00e83303e81fd36f788..7abc0567057a2aa67bc5d65d2a67f8c8668e94fc 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_pt_BR.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_pt_BR.properties
@@ -22,7 +22,6 @@
Error\:\ no\ workspace=Erro: nenhum workspace
The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=O projeto foi renomeado recentemente e nenhum build foi feito com um novo nome.
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=A m\u00e1quina slave onde esse projeto executou pela ultima vez foi removida.
li3=O diret\u00f3rio de workspace ({0}) foi removido externamente ao Jenkins.
text=Execute um build para que o Jenkins crie um workspace.
There''s\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=N\u00e3o existe nenhum workspace dispon\u00edvel para esse projeto
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_ru.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_ru.properties
index d3cd6ba59db1dbe734ef0373eff3549a37812ef6..a76a9c1b5735d7492e2167682729925bb2e1d68b 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_ru.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_ru.properties
@@ -1,17 +1,17 @@
# The MIT License
-#
+#
# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Mike Salnikov
-#
+#
# 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
@@ -21,13 +21,15 @@
# THE SOFTWARE.
Error\:\ no\ workspace=\u041e\u0448\u0438\u0431\u043a\u0430: \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430 \u0441\u0431\u043e\u0440\u043e\u0447\u043d\u0430\u044f \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f
-A\ project\ won't\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ performed.=\
+A\ project\ won''t\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ performed.=\
\u041f\u0440\u043e\u0435\u043a\u0442 \u043d\u0435 \u0431\u0443\u0434\u0435\u0442 \u0438\u043c\u0435\u0442\u044c \u0441\u0431\u043e\u0440\u043e\u0447\u043d\u0443\u044e \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044e \u043f\u043e\u043a\u0430 \u0445\u043e\u0442\u044f \u0431\u044b \u043e\u0434\u043d\u0430 \u0441\u0431\u043e\u0440\u043a\u0430 \u043d\u0435 \u0431\u0443\u0434\u0435\u0442 \u0437\u0430\u043f\u0443\u0449\u0435\u043d\u0430.
-There's\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=\
+There''s\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=\
\u0421\u0431\u043e\u0440\u043e\u0447\u043d\u0430\u044f \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f \u0434\u043b\u044f \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u043f\u0440\u043e\u0435\u043a\u0442\u0430 \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u044b\u0435 \u043f\u0440\u0438\u0447\u0438\u043d\u044b:
The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=\
\u041f\u0440\u043e\u0435\u043a\u0442 \u0431\u044b\u043b \u043d\u0435\u0434\u0430\u0432\u043d\u043e \u043f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d \u0438 \u0441\u0431\u043e\u0440\u043e\u043a \u043f\u043e\u0434 \u043d\u043e\u0432\u044b\u043c \u0438\u043c\u0435\u043d\u0435\u043c \u0435\u0449\u0435 \u043d\u0435 \u0431\u044b\u043b\u043e.
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=\
- \u041f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u044b\u0439 \u0441\u0435\u0440\u0432\u0435\u0440, \u043d\u0430 \u043a\u043e\u0442\u043e\u0440\u043e\u043c \u0441\u043e\u0431\u0438\u0440\u0430\u043b\u0441\u044f \u044d\u0442\u043e\u0442 \u043f\u0440\u043e\u0435\u043a\u0442 \u0432 \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0439 \u0440\u0430\u0437, \u0431\u044b\u043b \u0443\u0434\u0430\u043b\u0435\u043d.
li3=\u0421\u0431\u043e\u0440\u043e\u0447\u043d\u0430\u044f \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f ({0}) \u0431\u044b\u043b\u0430 \u0443\u0434\u0430\u043b\u0435\u043d\u0430 \u0438\u0437 \u0440\u0430\u0431\u043e\u0447\u0435\u0433\u043e \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 Jenkins.
-text=\u0417\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u0435 \u0441\u0431\u043E\u0440\u043A\u0443, \u0447\u0442\u043E\u0431\u044B \u043F\u043E\u0437\u0432\u043E\u043B\u0438\u0442\u044C Jenkins \u0441\u043E\u0437\u0434\u0430\u0442\u044C \u0441\u0431\u043E\u0440\u043E\u0447\u043D\u0443\u044E \u0434\u0438\u0440\u0435\u043A\u0442\u043E\u0440\u0438\u044E.
+text=\u0417\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u0435 \u0441\u0431\u043e\u0440\u043a\u0443, \u0447\u0442\u043e\u0431\u044b \u043f\u043e\u0437\u0432\u043e\u043b\u0438\u0442\u044c Jenkins \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u0441\u0431\u043e\u0440\u043e\u0447\u043d\u0443\u044e \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044e.
+The\ agent\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=\
+ \u0410\u0433\u0435\u043d\u0442, \u043d\u0430 \u043a\u043e\u0442\u043e\u0440\u043e\u043c \u044d\u0442\u043e\u0442 \u043f\u0440\u043e\u0435\u043a\u0442 \u0431\u044b\u043b \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0439 \u0440\u0430\u0437 \u0437\u0430\u043f\u0443\u0449\u0435\u043d, \u0443\u0434\u0430\u043b\u0451\u043d.
+The\ workspace\ was\ wiped\ out\ and\ no\ build\ has\ been\ done\ since\ then.=\
+ \u0421\u0431\u043e\u0440\u043e\u0447\u043d\u0430\u044f \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f \u0431\u044b\u043b\u0430 \u043e\u0447\u0438\u0449\u0435\u043d\u0430, \u0438 \u0441\u0431\u043e\u0440\u043e\u043a \u0431\u043e\u043b\u044c\u0448\u0435 \u043d\u0435 \u0431\u044b\u043b\u043e.
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_sr.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_sr.properties
new file mode 100644
index 0000000000000000000000000000000000000000..7c8d5110c9a3b5178372ae471c316b880db75a70
--- /dev/null
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_sr.properties
@@ -0,0 +1,14 @@
+# This file is under the MIT License by authors
+
+Error\:\ no\ workspace=\u0413\u0440\u0435\u0448\u043A\u0430: \u043D\u0435\u043C\u0430 \u0440\u0430\u0434\u043D\u0438 \u043F\u0440\u043E\u0441\u0442\u043E\u0440
+A\ project\ won't\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ performed.=\u041F\u0440\u043E\u0458\u0435\u043A\u0430\u0442 \u043D\u0435\u045B\u0435 \u0438\u043C\u0430\u0442\u0438 \u0440\u0430\u0434\u043D\u0438 \u043F\u0440\u043E\u0441\u0442\u043E\u0440 \u0434\u043E\u043A \u0441\u0435 \u043D\u0435 \u0438\u0437\u0432\u0440\u0448\u0438 \u0458\u0435\u0434\u043D\u043E \u0438\u0437\u0433\u0440\u0430\u0434\u045A\u0435.
+There's\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=\u041D\u0435\u043C\u0430 \u0440\u0430\u0434\u043D\u0438 \u043F\u0440\u043E\u0441\u0442\u043E\u0440 \u0437\u0430 \u043E\u0432\u0430\u0458 \u043F\u0440\u043E\u0458\u0435\u043A\u0430\u0442. \u041C\u043E\u0433\u0443\u045B\u0435 \u0458\u0435:
+The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=\u041F\u0440\u043E\u0458\u0435\u043A\u0430\u0442 \u0458\u0435 \u0441\u043A\u043E\u0440\u043E \u043F\u0440\u0435\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D, \u0438 \u0458\u043E\u0448 \u043D\u0435\u043C\u0430 \u0438\u0437\u0433\u0440\u0430\u0434\u045A\u0435 \u043F\u043E \u043D\u043E\u0432\u0438\u043C \u0438\u043C\u0435\u043D\u043E\u043C.
+The\ agent\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=\u0410\u0433\u0435\u043D\u0442 \u043E\u0432\u043E\u043C \u043F\u0440\u043E\u0458\u0435\u043A\u0442\u0443 \u043D\u0430 \u043A\u043E\u043C \u0458\u0435 \u0437\u0430\u0434\u045A\u0435 \u0438\u0437\u0432\u0440\u0448\u0435\u043D\u043E \u0458\u0435 \u0438\u0437\u0431\u0440\u0438\u0441\u0430\u043D.
+li3=\u0420\u0430\u0434\u043D\u0438 \u043F\u0440\u043E\u0441\u0442\u043E\u0440 "{0}" \u0458\u0435 \u0438\u0437\u0431\u0430\u0447\u0435\u043D \u0438\u0437 Jenkins.
+The\ workspace\ was\ wiped\ out\ and\ no\ build\ has\ been\ done\ since\ then.=\u041D\u0438\u0458\u0435 \u0431\u0438\u043B\u043E \u0438\u0437\u0433\u0440\u0430\u0434\u045A\u0430 \u043E\u0442\u043A\u0430\u0434 \u0458\u0435 \u0440\u0430\u0434\u043D\u0438 \u043F\u0440\u043E\u0441\u0442\u043E\u0440 \u0438\u0437\u0431\u0440\u0438\u0441\u0430\u043D.
+text=\u041F\u043E\u043A\u0440\u0435\u043D\u0438\u0442\u0435 \u0438\u0437\u0433\u0440\u0430\u0434\u045A\u0443 \u0438 Jenkins \u045B\u0435 \u0441\u0442\u0432\u043E\u0440\u0438\u0442\u0438 \u0440\u0430\u0434\u043D\u0438 \u043F\u0440\u043E\u0441\u0442\u043E\u0440.
+Error=\ no workspace=\u0413\u0440\u0435\u0448\u043A\u0430: \u043D\u0435\u043C\u0430 \u0440\u0430\u0434\u043D\u043E\u0433 \u043F\u0440\u043E\u0441\u0442\u043E\u0440\u0430
+There''s\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=\u041D\u0435\u043C\u0430 \u0440\u0430\u0434\u043D\u043E\u0433 \u043F\u0440\u043E\u0441\u0442\u043E\u0440\u0430 \u0437\u0430 \u043E\u0432\u0430\u0458 \u043F\u0440\u043E\u0458\u0435\u043A\u0430\u0442. \u041C\u043E\u0433\u0443\u045B\u0435 \u0458\u0435:
+A\ project\ won''t\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ performed.=\u041F\u0440\u043E\u0458\u043A\u0442\u0438 \u043D\u0435\u045B\u0435 \u0438\u043C\u0430\u0442\u0438 \u0440\u0430\u0434\u043D\u0438\u0445 \u043F\u0440\u043E\u0441\u0442\u043E\u0440\u0430 \u0434\u043E\u043A \u0441\u0435 \u043D\u0435 \u0438\u0437\u0432\u0440\u0448\u0438 \u0458\u0435\u0434\u043D\u0430 \u0438\u0437\u0433\u0440\u0430\u0434\u045A\u0430.
+The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=\u041F\u043E\u043C\u043E\u045B\u043D\u0438\u043A \u043E\u0432\u043E\u043C \u043F\u0440\u043E\u0458\u0435\u043A\u0442\u0443 \u043D\u0430 \u043A\u043E\u043C \u0458\u0435 \u0437\u0430\u0434\u045A\u0435 \u0438\u0437\u0432\u0440\u0448\u0435\u043D\u043E \u0458\u0435 \u0438\u0437\u0431\u0440\u0438\u0441\u0430\u043D.
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_tr.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_tr.properties
index aa57c214494f22ee8d103a14c3b091187a290ce7..0696ad6f25a7fa52b16f4f59a5bd785acbdf810d 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_tr.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_tr.properties
@@ -26,4 +26,3 @@ Error\:\ no\ workspace=Hata\:\ \u00c7al\u0131\u015fma Alan\u0131 mevcut de\u011f
A\ project\ won't\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ performed.=Bir\ proje,\ en\ az\u0131ndan\ bir\ yap\u0131land\u0131rma\ \u00e7al\u0131\u015ft\u0131r\u0131lmadan\ bir\ \u00e7al\u0131\u015fma\ alan\u0131na\ sahip\ olamaz.
There's\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=Bu\ projenin\ bir\ \u00e7al\u0131\u015fma\ alan\u0131\ yok.\ Muhtemel\ sebepler\:
The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=Projenin\ ismi\ yeni\ de\u011fi\u015ftirildi\ ve\ yeni\ isim\ alt\u0131nda\ herhangi\ bir\ yap\u0131land\u0131rma\ \u00e7al\u0131\u015ft\u0131r\u0131lmad\u0131.
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=Bu projenin en son \u00fczerinde \u00e7al\u0131\u015ft\u0131\u011f\u0131 slave silinmi\u015f.
diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_zh_TW.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_zh_TW.properties
index 3c4872742177c70104723c802e207eb23c62d492..c3b0d8184ad556edeaf54658fa1d83df2032c57c 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_zh_TW.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_zh_TW.properties
@@ -26,7 +26,6 @@ A\ project\ won't\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ perfo
There's\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=\
\u5c08\u6848\u6c92\u6709\u5de5\u4f5c\u5340\u3002\u53ef\u80fd\u7684\u539f\u56e0\u6709:
The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=\u5C08\u6848\u6700\u8FD1\u6539\u540D\u4E86\uFF0C\u800C\u4E14\u6539\u540D\u5F8C\u9084\u6C92\u5EFA\u7F6E\u904E\u3002
-The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=\u6700\u5F8C\u4E00\u6B21\u5EFA\u7F6E\u672C\u5C08\u6848\u7684 Slave \u88AB\u79FB\u9664\u4E86\u3002
li3=\u5DE5\u4F5C\u5340\u76EE\u9304 ({0}) \u5728 Jenkins \u5916\u88AB\u522A\u9664\u4E86\u3002
The\ workspace\ was\ wiped\ out\ and\ no\ build\ has\ been\ done\ since\ then.=\u5DE5\u4F5C\u5340\u88AB\u6E05\u9664\uFF0C\u800C\u4E14\u5230\u76EE\u524D\u70BA\u6B62\u9084\u6C92\u6709\u5EFA\u7F6E\u904E\u3002
diff --git a/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm_bg.properties b/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm_bg.properties
new file mode 100644
index 0000000000000000000000000000000000000000..ce43fb6569eea3c2acd240ef64ac449ff8e66ff5
--- /dev/null
+++ b/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm_bg.properties
@@ -0,0 +1,24 @@
+# The MIT License
+#
+# Bulgarian translation: Copyright (c) 2015, 2016, Alexander Shopov
+#
+# 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.
+
+Submit=\
+ \u0417\u0430\u043f\u0430\u0437\u0432\u0430\u043d\u0435
diff --git a/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm_pl.properties b/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm_pl.properties
new file mode 100644
index 0000000000000000000000000000000000000000..6b45cc35e76b5226861cda595dd82768eda1ef82
--- /dev/null
+++ b/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm_pl.properties
@@ -0,0 +1,23 @@
+# The MIT License
+#
+# Copyright (c) 2016, Damian Szczepanik
+#
+# 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.
+
+Submit=Zapisz
diff --git a/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm_sr.properties b/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm_sr.properties
new file mode 100644
index 0000000000000000000000000000000000000000..c8e10fc8ec69e893059e2f2cc4ec087c5fc78321
--- /dev/null
+++ b/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm_sr.properties
@@ -0,0 +1,3 @@
+# This file is under the MIT License by authors
+
+Submit=\u041F\u043E\u0434\u043D\u0435\u0441\u0438
diff --git a/core/src/main/resources/hudson/model/AbstractModelObject/editDescription.jelly b/core/src/main/resources/hudson/model/AbstractModelObject/editDescription.jelly
index 2e211b6221287f49c065d8e7d40d580dc588c55c..91940efa8d4091a42d10887dea83310bc360ccbd 100644
--- a/core/src/main/resources/hudson/model/AbstractModelObject/editDescription.jelly
+++ b/core/src/main/resources/hudson/model/AbstractModelObject/editDescription.jelly
@@ -33,7 +33,9 @@ THE SOFTWARE.
major enhancement 
enhancement
- 
major bug fix 
bug fix
-
-
= I use it on my production site without major issues. 
= I don't recommend it. 
= I tried it but rolled back to a previous version.