Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/jenkinsci/jenkins into JE…
Browse files Browse the repository at this point in the history 
…NKINS-3539

Conflicts:
	test/src/test/java/hudson/model/ParametersTest.java
  • Loading branch information
@daniel-beck
daniel-beck committed Oct 14, 2014
2 parents 190f0b6 + d6f758a commit d5d47ed
Show file tree
Hide file tree
Showing 243 changed files with 3,403 additions and 558 deletions.
106 changes: 100 additions & 6 deletions changelog.html
View file
Expand Up @@ -54,6 +54,102 @@

<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
<li class=>
</ul>
</div><!--=TRUNK-END=-->

<!-- these changes are controlled by the release process. DO NOT MODIFY -->
<div id="rc" style="display:none;"><!--=BEGIN=-->
<h3><a name=v1.585>What's new in 1.585</a> <!--=DATE=--></h3>
<ul class=image>
<li class=bug>
Build health computed repeatedly for a single Weather column cell.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-25074">issue 25074</a>)
<li class=rfe>
Missing workspace page should use 404 status code.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-10450">issue 10450</a>)
<li class=bug>
Fixed memory leak occurring on pages producing incremental output with a progress bar.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-25081">issue 25081</a>)
<li class=bug>
Updated SSH Slaves plugin to 1.8.
<li class=bug>
Due to the reaction, default umask in debian package is set back to 022
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-25065">issue 25065</a>)
<li class=bug>
Greater-than characters are not escaped in HTML outputs like e-mails
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-16184">issue 16184</a>)
<li class=bug>
Thread starvation from <code>OldDataMonitor</code>.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-24763">issue 24763</a>)
<li class=bug>
Integer overflow in quiet-down timeout calculation
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-24914">issue 24914</a>)
<li class=bug>
Don't put session IDs in URLs even when cookies are disabled.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-22358">issue 22358</a>)
<li class=rfe>
Show keep build log reason in tool tips
(<a href="https://github.com/jenkinsci/jenkins/pull/1422">pull request 1422</a>)
<li class=bug>
Do not disable projects, which do not support such operation (like Matrix configurations)
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-24340">issue 24340</a>)
<li class=rfe>
Improved the scalability of SSH slaves plugin caused by global lock in <tt>SecureRandom</tt>
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-20108">issue 20108</a>)
</ul>
</div><!--=END=-->
<h3><a name=v1.584>What's new in 1.584</a> (2014/10/12)</h3>
<ul class=image>
<li class=rfe>
Diagnostic thread names are now available while requests are still in filters
<li class=rfe>
When killing Windows processes, check its critical flag to avoid BSoD
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-24453">issue 24453</a>)
<li class=bug>
When a user could not see a view, but could delete/move/rename jobs contained in it, the view was not properly updated.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-22769">issue 22769</a>)
</ul>
<h3><a name=v1.583>What's new in 1.583</a> (2014/10/01)</h3>
<ul class=image>
<li class='major bug'>
Fixes to multiple security vulnerabilities.
(<a href="https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2014-10-01">security advisory</a>)
</ul>
<h3><a name=v1.582>What's new in 1.582</a> (2014/09/28)</h3>
<ul class=image>
<li class=bug>
Channel reader thread can end up consuming 100% CPU.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-23471">issue 23471</a>)
<li class=bug>
CancelledKeyException can cause all JNLP slaves to disconnect (and the problem remains until restart).
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-24050">issue 24050</a>)
<li class=bug>
Consider dynamic label assignments for label load statistics.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-15576">issue 15576</a>)
<li class=bug>
Use Windows line endings for batch file build steps.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-7478">issue 7478</a>)
<li class=bug>
Reduced the logging clutter about the lack of @ExportedBean.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-24458">issue 24458</a>)
<li class=bug>
Character encoding problem in form submission when file parameters are present.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-11543">issue 11543</a>)
<li class=rfe>
Improved error handling and "in-progress" UI feedback in JNLP slave to service installation.
<li class=rfe>
Winstone 2.4: reverse proxy support in the logging, request header size limit control, and different private key password from keystore password.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-23665">issue 23665</a>)
<li class=bug>
umask setting on Debian did not work.
(<a href="https://github.com/jenkinsci/jenkins/pull/1397">pull 1397</a>)
<li class=bug>
handle job move when buildDir is configured to a custom location.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-24825">issue 24825</a>)
</ul>
<h3><a name=v1.581>What's new in 1.581</a> (2014/09/21)</h3>
<ul class=image>
<li class=rfe>
Use slightly larger Jenkins head icon.
Expand All @@ -64,12 +160,11 @@
<li class=bug>
Explicitly set background color of various UI elements to white.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-24625">issue 24625</a>)
<li class=bug>
Wrong Hebrew localization resulted in broken console output since 1.539.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-24614">issue 24614</a>)
</ul>
</div><!--=TRUNK-END=-->

<!-- these changes are controlled by the release process. DO NOT MODIFY -->
<div id="rc" style="display:none;"><!--=BEGIN=-->
<h3><a name=v1.580>What's new in 1.580</a> <!--=DATE=--></h3>
<h3><a name=v1.580>What's new in 1.580</a> (2014/09/14)</h3>
<ul class=image>
<li class=bug>
Health reports saved to disk before 1.576 showed no weather icon since that version.
Expand All @@ -81,7 +176,6 @@ <h3><a name=v1.580>What's new in 1.580</a> <!--=DATE=--></h3>
Add editable descriptions for label atoms.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-6153">issue 6153</a>)
</ul>
</div><!--=END=-->
<h3><a name=v1.579>What's new in 1.579</a> (2014/09/06)</h3>
<ul class=image>
<li class=bug>
Expand Down
2 changes: 1 addition & 1 deletion cli/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>pom</artifactId>
<groupId>org.jenkins-ci.main</groupId>
<version>1.581-SNAPSHOT</version>
<version>1.586-SNAPSHOT</version>
</parent>

<artifactId>cli</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cli/src/main/resources/hudson/cli/client/Messages_pt_BR.properties
View file
Expand Up @@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

CLI.VersionMismatch=A vers\u00e3o n\u00e3o coincide. Esta CLI n\u00e3o pode funcionar com este servidor Hudson
CLI.VersionMismatch=A vers\u00e3o n\u00e3o coincide. Esta CLI n\u00e3o pode funcionar com este servidor Jenkins
CLI.Usage=Jenkins CLI\n\
Uso: java -jar jenkins-cli.jar [-s URL] comando [op\u00e7\u00f5es...] par\u00e2metros...\n\
Op\u00e7\u00f5es:\n\
Expand Down
16 changes: 11 additions & 5 deletions core/pom.xml
View file
Expand Up @@ -29,7 +29,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>pom</artifactId>
<version>1.581-SNAPSHOT</version>
<version>1.586-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -42,7 +42,7 @@ THE SOFTWARE.

<properties>
<staplerFork>true</staplerFork>
<stapler.version>1.228</stapler.version>
<stapler.version>1.231</stapler.version>
<spring.version>2.5.6.SEC03</spring.version>
<groovy.version>1.8.9</groovy.version>
</properties>
Expand Down Expand Up @@ -117,7 +117,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>trilead-ssh2</artifactId>
<version>build217-jenkins-5</version>
<version>build217-jenkins-7</version>
</dependency>
<dependency>
<groupId>org.kohsuke.stapler</groupId>
Expand Down Expand Up @@ -156,7 +156,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>stapler-adjunct-zeroclipboard</artifactId>
<version>1.1.7-1</version>
<version>1.3.5-1</version>
</dependency>
<dependency>
<groupId>org.kohsuke.stapler</groupId>
Expand Down Expand Up @@ -484,7 +484,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jvnet.winp</groupId>
<artifactId>winp</artifactId>
<version>1.21</version>
<version>1.22</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
Expand Down Expand Up @@ -568,6 +568,12 @@ THE SOFTWARE.
<scope>provided</scope>
</dependency>

<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.1-jenkins-1</version>
</dependency>

<dependency>
<groupId>org.mindrot</groupId>
<artifactId>jbcrypt</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/hudson/ClassicPluginStrategy.java
View file
Expand Up @@ -340,7 +340,7 @@ public <T> List<ExtensionComponent<T>> findComponents(Class<T> type, Hudson huds
List<ExtensionComponent<T>> r = Lists.newArrayList();
for (ExtensionFinder finder : finders) {
try {
r.addAll(finder._find(type, hudson));
r.addAll(finder.find(type, hudson));
} catch (AbstractMethodError e) {
// backward compatibility
for (T t : finder.findExtensions(type, hudson))
Expand Down
5 changes: 1 addition & 4 deletions core/src/main/java/hudson/ExtensionFinder.java
View file
Expand Up @@ -143,10 +143,7 @@ public boolean isRefreshable() {
*/
public abstract <T> Collection<ExtensionComponent<T>> find(Class<T> type, Hudson jenkins);

/**
* A pointless function to work around what appears to be a HotSpot problem. See JENKINS-5756 and bug 6933067
* on BugParade for more details.
*/
@Deprecated
public <T> Collection<ExtensionComponent<T>> _find(Class<T> type, Hudson hudson) {
return find(type, hudson);
}
Expand Down
84 changes: 74 additions & 10 deletions core/src/main/java/hudson/FilePath.java
View file
Expand Up @@ -84,6 +84,7 @@
import java.io.ObjectOutputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.RandomAccessFile;
import java.io.Serializable;
import java.io.Writer;
import java.lang.reflect.Field;
Expand Down Expand Up @@ -1653,7 +1654,7 @@ public Void call() throws IOException {
FileInputStream fis=null;
try {
fis = new FileInputStream(new File(remote));
Util.copyStream(fis,p.getOut());
Util.copyStream(fis, p.getOut());
return null;
} finally {
org.apache.commons.io.IOUtils.closeQuietly(fis);
Expand All @@ -1665,6 +1666,77 @@ public Void call() throws IOException {
return p.getIn();
}

/**
* Reads this file from the specific offset.
*/
public InputStream readFromOffset(final long offset) throws IOException {
if(channel ==null) {
final RandomAccessFile raf = new RandomAccessFile(new File(remote), "r");
try {
raf.seek(offset);
} catch (IOException e) {
try {
raf.close();
} catch (IOException e1) {
// ignore
}
throw e;
}
return new InputStream() {
@Override
public int read() throws IOException {
return raf.read();
}

@Override
public void close() throws IOException {
raf.close();
}

@Override
public int read(byte[] b, int off, int len) throws IOException {
return raf.read(b, off, len);
}

@Override
public int read(byte[] b) throws IOException {
return raf.read(b);
}
};
}

final Pipe p = Pipe.createRemoteToLocal();
channel.callAsync(new Callable<Void, IOException>() {
private static final long serialVersionUID = 1L;

public Void call() throws IOException {
final OutputStream out = new java.util.zip.GZIPOutputStream(p.getOut(), 8192);
RandomAccessFile raf = null;
try {
raf = new RandomAccessFile(new File(remote), "r");
raf.seek(offset);
byte[] buf = new byte[8192];
int len;
while ((len = raf.read(buf)) >= 0) {
out.write(buf, 0, len);
}
return null;
} finally {
IOUtils.closeQuietly(out);
if (raf != null) {
try {
raf.close();
} catch (IOException e) {
// ignore
}
}
}
}
});

return new java.util.zip.GZIPInputStream(p.getIn());
}

/**
* Reads this file into a string, by using the current system encoding.
*/
Expand Down Expand Up @@ -1856,7 +1928,7 @@ public Void invoke(File f, VirtualChannel channel) throws IOException {
private void syncIO() throws InterruptedException {
try {
if (channel!=null)
_syncIO();
channel.syncLocalIO();
} catch (AbstractMethodError e) {
// legacy slave.jar. Handle this gracefully
try {
Expand All @@ -1867,14 +1939,6 @@ private void syncIO() throws InterruptedException {
}
}

/**
* A pointless function to work around what appears to be a HotSpot problem. See JENKINS-5756 and bug 6933067
* on BugParade for more details.
*/
private void _syncIO() throws InterruptedException {
channel.syncLocalIO();
}

/**
* Remoting interface used for {@link FilePath#copyRecursiveTo(String, FilePath)}.
*
Expand Down

0 comments on commit d5d47ed

Please sign in to comment.