diff --git a/Jenkinsfile b/Jenkinsfile
index 508614244620..4cd19525f6e9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,6 +10,8 @@ def buildNumber = BUILD_NUMBER as int; if (buildNumber > 1) milestone(buildNumbe
// 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
+// Same memory sizing for both builds and ATH
+def javaOpts = ["JAVA_OPTS=-Xmx1536m -Xms512m","MAVEN_OPTS=-Xmx1536m -Xms512m"]
properties([
buildDiscarder(logRotator(numToKeepStr: '50', artifactNumToKeepStr: '3')),
@@ -40,20 +42,13 @@ for(j = 0; j < jdks.size(); j++) {
// Now run the actual build.
stage("${buildType} Build / Test") {
timeout(time: 300, 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"], buildType, jdk) {
- // 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 -Pjapicmp -U -Dset.changelist help:evaluate -Dexpression=changelist -Doutput=$changelistF clean install ${runTests ? '-Dmaven.test.failure.ignore' : '-DskipTests'} -V -B -ntp -Dmaven.repo.local=$m2repo -Dspotbugs.failOnError=false -Dcheckstyle.failOnViolation=false -e"
+ // -Dmaven.repo.local=… tells Maven to create a subdir in the temporary directory for the local Maven repository
+ // -ntp requires Maven >= 3.6.1
+ def mvnCmd = "mvn -Pdebug -Pjapicmp -U -Dset.changelist help:evaluate -Dexpression=changelist -Doutput=$changelistF clean install ${runTests ? '-Dmaven.test.failure.ignore' : '-DskipTests'} -V -B -ntp -Dmaven.repo.local=$m2repo -Dspotbugs.failOnError=false -Dcheckstyle.failOnViolation=false -e"
+ infra.runWithMaven(mvnCmd, jdk.toString(), javaOpts, true)
- if(isUnix()) {
- sh mvnCmd
- sh 'git add . && git diff --exit-code HEAD'
- } else {
- bat mvnCmd
- }
+ if(isUnix()) {
+ sh 'git add . && git diff --exit-code HEAD'
}
}
}
@@ -124,10 +119,8 @@ builds.ath = {
def metadataPath
dir("sources") {
checkout scm
- withMavenEnv(["JAVA_OPTS=-Xmx1536m -Xms512m",
- "MAVEN_OPTS=-Xmx1536m -Xms512m"], 8) {
- sh "mvn --batch-mode --show-version -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -DskipTests -am -pl war package -Dmaven.repo.local=${pwd tmp: true}/m2repo"
- }
+ def mvnCmd = 'mvn --batch-mode --show-version -ntp -Pquick-build -am -pl war package -Dmaven.repo.local=$WORKSPACE_TMP/m2repo'
+ infra.runWithMaven(mvnCmd, "8", javaOpts, true)
dir("war/target") {
fileUri = "file://" + pwd() + "/jenkins.war"
}
@@ -142,34 +135,3 @@ builds.ath = {
builds.failFast = failFast
parallel builds
infra.maybePublishIncrementals()
-
-// 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 buildType, def javaVersion, def body) {
- if (buildType == 'Linux') {
- // I.e., a Maven container using ACI. No need to install tools.
- return withEnv(envVars) {
- body.call()
- }
- }
-
- // 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: "jdk${javaVersion}", 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()
- }
-}
diff --git a/bom/pom.xml b/bom/pom.xml
index 6f64b8747692..2e356c35918e 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -49,7 +49,7 @@ THE SOFTWARE.
org.springframework.security
spring-security-bom
- 5.5.2
+ 5.5.3
pom
import
@@ -66,7 +66,7 @@ THE SOFTWARE.
org.apache.ant
ant
- 1.10.11
+ 1.10.12
commons-io
diff --git a/core/src/main/java/hudson/org/apache/tools/tar/TarInputStream.java b/core/src/main/java/hudson/org/apache/tools/tar/TarInputStream.java
deleted file mode 100644
index eab21900f609..000000000000
--- a/core/src/main/java/hudson/org/apache/tools/tar/TarInputStream.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-/*
- * This package is based on the work done by Timothy Gerard Endres
- * (time@ice.com) to whom the Ant project is very grateful for his great code.
- */
-
-package hudson.org.apache.tools.tar;
-
-import hudson.RestrictedSince;
-import java.io.ByteArrayOutputStream;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import org.apache.tools.tar.TarBuffer;
-import org.apache.tools.tar.TarEntry;
-import org.kohsuke.accmod.Restricted;
-import org.kohsuke.accmod.restrictions.NoExternalUse;
-
-/**
- * The TarInputStream reads a UNIX tar archive as an InputStream.
- * methods are provided to position at each successive entry in
- * the archive, and the read each entry as a normal input stream
- * using read().
- * @deprecated Use {@link org.apache.commons.compress.archivers.tar.TarArchiveInputStream} instead
- */
-@Deprecated
-@Restricted(NoExternalUse.class)
-@RestrictedSince("2.200")
-public class TarInputStream extends FilterInputStream {
-
- // CheckStyle:VisibilityModifier OFF - bc
- protected boolean debug;
- protected boolean hasHitEOF;
- protected long entrySize;
- protected long entryOffset;
- protected byte[] readBuf;
- protected TarBuffer buffer;
- protected TarEntry currEntry;
-
- /**
- * This contents of this array is not used at all in this class,
- * it is only here to avoid repeated object creation during calls
- * to the no-arg read method.
- */
- protected byte[] oneBuf;
-
- // CheckStyle:VisibilityModifier ON
-
- /**
- * Constructor for TarInputStream.
- * @param is the input stream to use
- */
- public TarInputStream(InputStream is) {
- this(is, TarBuffer.DEFAULT_BLKSIZE, TarBuffer.DEFAULT_RCDSIZE);
- }
-
- /**
- * Constructor for TarInputStream.
- * @param is the input stream to use
- * @param blockSize the block size to use
- */
- public TarInputStream(InputStream is, int blockSize) {
- this(is, blockSize, TarBuffer.DEFAULT_RCDSIZE);
- }
-
- /**
- * Constructor for TarInputStream.
- * @param is the input stream to use
- * @param blockSize the block size to use
- * @param recordSize the record size to use
- */
- public TarInputStream(InputStream is, int blockSize, int recordSize) {
- super(is);
-
- this.buffer = new TarBuffer(is, blockSize, recordSize);
- this.readBuf = null;
- this.oneBuf = new byte[1];
- this.debug = false;
- this.hasHitEOF = false;
- }
-
- /**
- * Sets the debugging flag.
- *
- * @param debug True to turn on debugging.
- */
- public void setDebug(boolean debug) {
- this.debug = debug;
- this.buffer.setDebug(debug);
- }
-
- /**
- * Closes this stream. Calls the TarBuffer's close() method.
- * @throws IOException on error
- */
- @Override
- public void close() throws IOException {
- this.buffer.close();
- }
-
- /**
- * Get the record size being used by this stream's TarBuffer.
- *
- * @return The TarBuffer record size.
- */
- public int getRecordSize() {
- return this.buffer.getRecordSize();
- }
-
- /**
- * Get the available data that can be read from the current
- * entry in the archive. This does not indicate how much data
- * is left in the entire archive, only in the current entry.
- * This value is determined from the entry's size header field
- * and the amount of data already read from the current entry.
- * Integer.MAX_VALUE is returned in case more than Integer.MAX_VALUE
- * bytes are left in the current entry in the archive.
- *
- * @return The number of available bytes for the current entry.
- * @throws IOException for signature
- */
- @Override
- public int available() throws IOException {
- if (this.entrySize - this.entryOffset > Integer.MAX_VALUE) {
- return Integer.MAX_VALUE;
- }
- return (int) (this.entrySize - this.entryOffset);
- }
-
- /**
- * Skip bytes in the input buffer. This skips bytes in the
- * current entry's data, not the entire archive, and will
- * stop at the end of the current entry's data if the number
- * to skip extends beyond that point.
- *
- * @param numToSkip The number of bytes to skip.
- * @return the number actually skipped
- * @throws IOException on error
- */
- @Override
- public long skip(long numToSkip) throws IOException {
- // REVIEW
- // This is horribly inefficient, but it ensures that we
- // properly skip over bytes via the TarBuffer...
- //
- byte[] skipBuf = new byte[8 * 1024];
- long skip = numToSkip;
- while (skip > 0) {
- int realSkip = (int) (skip > skipBuf.length ? skipBuf.length : skip);
- int numRead = this.read(skipBuf, 0, realSkip);
- if (numRead == -1) {
- break;
- }
- skip -= numRead;
- }
- return numToSkip - skip;
- }
-
- /**
- * Since we do not support marking just yet, we return false.
- *
- * @return False.
- */
- @Override
- public boolean markSupported() {
- return false;
- }
-
- /**
- * Since we do not support marking just yet, we do nothing.
- *
- * @param markLimit The limit to mark.
- */
- @Override
- public void mark(int markLimit) {
- }
-
- /**
- * Since we do not support marking just yet, we do nothing.
- */
- @Override
- public void reset() {
- }
-
- /**
- * Get the next entry in this tar archive. This will skip
- * over any remaining data in the current entry, if there
- * is one, and place the input stream at the header of the
- * next entry, and read the header and instantiate a new
- * TarEntry from the header bytes and return that entry.
- * If there are no more entries in the archive, null will
- * be returned to indicate that the end of the archive has
- * been reached.
- *
- * @return The next TarEntry in the archive, or null.
- * @throws IOException on error
- */
- public TarEntry getNextEntry() throws IOException {
- if (this.hasHitEOF) {
- return null;
- }
-
- if (this.currEntry != null) {
- long numToSkip = this.entrySize - this.entryOffset;
-
- if (this.debug) {
- System.err.println("TarInputStream: SKIP currENTRY '"
- + this.currEntry.getName() + "' SZ "
- + this.entrySize + " OFF "
- + this.entryOffset + " skipping "
- + numToSkip + " bytes");
- }
-
- if (numToSkip > 0) {
- this.skip(numToSkip);
- }
-
- this.readBuf = null;
- }
-
- byte[] headerBuf = this.buffer.readRecord();
-
- if (headerBuf == null) {
- if (this.debug) {
- System.err.println("READ NULL RECORD");
- }
- this.hasHitEOF = true;
- } else if (this.buffer.isEOFRecord(headerBuf)) {
- if (this.debug) {
- System.err.println("READ EOF RECORD");
- }
- this.hasHitEOF = true;
- }
-
- if (this.hasHitEOF) {
- this.currEntry = null;
- } else {
- this.currEntry = new TarEntry(headerBuf);
-
- if (this.debug) {
- System.err.println("TarInputStream: SET currENTRY '"
- + this.currEntry.getName()
- + "' size = "
- + this.currEntry.getSize());
- }
-
- this.entryOffset = 0;
-
- this.entrySize = this.currEntry.getSize();
- }
-
- if (this.currEntry != null && this.currEntry.isGNULongNameEntry()) {
- // read in the name
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- byte[] buf = new byte[256];
- int length;
- while ((length = read(buf)) >= 0) {
- baos.write(buf,0,length);
- }
- getNextEntry();
- if (this.currEntry == null) {
- // Bugzilla: 40334
- // Malformed tar file - long entry name not followed by entry
- return null;
- }
- String longName = baos.toString("UTF-8");
- // remove trailing null terminator
- if (longName.length() > 0
- && longName.charAt(longName.length() - 1) == 0) {
- longName = longName.substring(0,longName.length()-1);
- }
- this.currEntry.setName(longName);
- }
-
- return this.currEntry;
- }
-
- /**
- * Reads a byte from the current tar archive entry.
- *
- * This method simply calls read( byte[], int, int ).
- *
- * @return The byte read, or -1 at EOF.
- * @throws IOException on error
- */
- @Override
- public int read() throws IOException {
- int num = this.read(this.oneBuf, 0, 1);
- return num == -1 ? -1 : ((int) this.oneBuf[0]) & 0xFF;
- }
-
- /**
- * Reads bytes from the current tar archive entry.
- *
- * This method is aware of the boundaries of the current
- * entry in the archive and will deal with them as if they
- * were this stream's start and EOF.
- *
- * @param buf The buffer into which to place bytes read.
- * @param offset The offset at which to place bytes read.
- * @param numToRead The number of bytes to read.
- * @return The number of bytes read, or -1 at EOF.
- * @throws IOException on error
- */
- @Override
- public int read(byte[] buf, int offset, int numToRead) throws IOException {
- int totalRead = 0;
-
- if (this.entryOffset >= this.entrySize) {
- return -1;
- }
-
- if (numToRead + this.entryOffset > this.entrySize) {
- numToRead = (int) (this.entrySize - this.entryOffset);
- }
-
- if (this.readBuf != null) {
- int sz = Math.min(numToRead, this.readBuf.length);
-
- System.arraycopy(this.readBuf, 0, buf, offset, sz);
-
- if (sz >= this.readBuf.length) {
- this.readBuf = null;
- } else {
- int newLen = this.readBuf.length - sz;
- byte[] newBuf = new byte[newLen];
-
- System.arraycopy(this.readBuf, sz, newBuf, 0, newLen);
-
- this.readBuf = newBuf;
- }
-
- totalRead += sz;
- numToRead -= sz;
- offset += sz;
- }
-
- while (numToRead > 0) {
- byte[] rec = this.buffer.readRecord();
-
- if (rec == null) {
- // Unexpected EOF!
- throw new IOException("unexpected EOF with " + numToRead
- + " bytes unread");
- }
-
- int sz = numToRead;
- int recLen = rec.length;
-
- if (recLen > sz) {
- System.arraycopy(rec, 0, buf, offset, sz);
-
- this.readBuf = new byte[recLen - sz];
-
- System.arraycopy(rec, sz, this.readBuf, 0, recLen - sz);
- } else {
- sz = recLen;
-
- System.arraycopy(rec, 0, buf, offset, recLen);
- }
-
- totalRead += sz;
- numToRead -= sz;
- offset += sz;
- }
-
- this.entryOffset += totalRead;
-
- return totalRead;
- }
-
- /**
- * Copies the contents of the current tar archive entry directly into
- * an output stream.
- *
- * @param out The OutputStream into which to write the entry's data.
- * @throws IOException on error
- */
- public void copyEntryContents(OutputStream out) throws IOException {
- byte[] buf = new byte[32 * 1024];
-
- while (true) {
- int numRead = this.read(buf, 0, buf.length);
-
- if (numRead == -1) {
- break;
- }
-
- out.write(buf, 0, numRead);
- }
- }
-}
diff --git a/core/src/main/java/hudson/org/apache/tools/tar/TarOutputStream.java b/core/src/main/java/hudson/org/apache/tools/tar/TarOutputStream.java
deleted file mode 100644
index c4b87c9160d3..000000000000
--- a/core/src/main/java/hudson/org/apache/tools/tar/TarOutputStream.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-/*
- * This package is based on the work done by Timothy Gerard Endres
- * (time@ice.com) to whom the Ant project is very grateful for his great code.
- */
-
-package hudson.org.apache.tools.tar;
-
-import hudson.RestrictedSince;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import org.apache.tools.tar.TarBuffer;
-import org.apache.tools.tar.TarConstants;
-import org.apache.tools.tar.TarEntry;
-import org.kohsuke.accmod.Restricted;
-import org.kohsuke.accmod.restrictions.NoExternalUse;
-
-/**
- * The TarOutputStream writes a UNIX tar archive as an OutputStream.
- * Methods are provided to put entries, and then write their contents
- * by writing to this stream using write().
- *
- * @deprecated Use {@link org.apache.commons.compress.archivers.tar.TarArchiveOutputStream} instead
- *
- */
-@Deprecated
-@Restricted(NoExternalUse.class)
-@RestrictedSince("2.200")
-public class TarOutputStream extends FilterOutputStream {
- /** Fail if a long file name is required in the archive. */
- public static final int LONGFILE_ERROR = 0;
-
- /** Long paths will be truncated in the archive. */
- public static final int LONGFILE_TRUNCATE = 1;
-
- /** GNU tar extensions are used to store long file names in the archive. */
- public static final int LONGFILE_GNU = 2;
-
- // CheckStyle:VisibilityModifier OFF - bc
- protected boolean debug;
- protected long currSize;
- protected String currName;
- protected long currBytes;
- protected byte[] oneBuf;
- protected byte[] recordBuf;
- protected int assemLen;
- protected byte[] assemBuf;
- protected TarBuffer buffer;
- protected int longFileMode = LONGFILE_ERROR;
- // CheckStyle:VisibilityModifier ON
-
- private boolean closed = false;
-
- /**
- * Constructor for TarInputStream.
- * @param os the output stream to use
- */
- public TarOutputStream(OutputStream os) {
- this(os, TarBuffer.DEFAULT_BLKSIZE, TarBuffer.DEFAULT_RCDSIZE);
- }
-
- /**
- * Constructor for TarInputStream.
- * @param os the output stream to use
- * @param blockSize the block size to use
- */
- public TarOutputStream(OutputStream os, int blockSize) {
- this(os, blockSize, TarBuffer.DEFAULT_RCDSIZE);
- }
-
- /**
- * Constructor for TarInputStream.
- * @param os the output stream to use
- * @param blockSize the block size to use
- * @param recordSize the record size to use
- */
- public TarOutputStream(OutputStream os, int blockSize, int recordSize) {
- super(os);
-
- this.buffer = new TarBuffer(os, blockSize, recordSize);
- this.debug = false;
- this.assemLen = 0;
- this.assemBuf = new byte[recordSize];
- this.recordBuf = new byte[recordSize];
- this.oneBuf = new byte[1];
- }
-
- /**
- * Set the long file mode.
- * This can be LONGFILE_ERROR(0), LONGFILE_TRUNCATE(1) or LONGFILE_GNU(2).
- * This specifies the treatment of long file names (names ≥ TarConstants.NAMELEN).
- * Default is LONGFILE_ERROR.
- * @param longFileMode the mode to use
- */
- public void setLongFileMode(int longFileMode) {
- this.longFileMode = longFileMode;
- }
-
-
- /**
- * Sets the debugging flag.
- *
- * @param debugF True to turn on debugging.
- */
- public void setDebug(boolean debugF) {
- this.debug = debugF;
- }
-
- /**
- * Sets the debugging flag in this stream's TarBuffer.
- *
- * @param debug True to turn on debugging.
- */
- public void setBufferDebug(boolean debug) {
- this.buffer.setDebug(debug);
- }
-
- /**
- * Ends the TAR archive without closing the underlying OutputStream.
- * The result is that the two EOF records of nulls are written.
- * @throws IOException on error
- */
- public void finish() throws IOException {
- // See Bugzilla 28776 for a discussion on this
- // https://bz.apache.org/bugzilla/show_bug.cgi?id=28776
- this.writeEOFRecord();
- this.writeEOFRecord();
- }
-
- /**
- * Ends the TAR archive and closes the underlying OutputStream.
- * This means that finish() is called followed by calling the
- * TarBuffer's close().
- * @throws IOException on error
- */
- @Override
- public void close() throws IOException {
- if (!closed) {
- this.finish();
- this.buffer.close();
- out.close();
- closed = true;
- }
- }
-
- /**
- * Get the record size being used by this stream's TarBuffer.
- *
- * @return The TarBuffer record size.
- */
- public int getRecordSize() {
- return this.buffer.getRecordSize();
- }
-
- /**
- * Put an entry on the output stream. This writes the entry's
- * header record and positions the output stream for writing
- * the contents of the entry. Once this method is called, the
- * stream is ready for calls to write() to write the entry's
- * contents. Once the contents are written, closeEntry()
- * MUST be called to ensure that all buffered data
- * is completely written to the output stream.
- *
- * @param entry The TarEntry to be written to the archive.
- * @throws IOException on error
- */
- public void putNextEntry(TarEntry entry) throws IOException {
- if (entry.getName().length() >= TarConstants.NAMELEN) {
-
- if (longFileMode == LONGFILE_GNU) {
- // create a TarEntry for the LongLink, the contents
- // of which are the entry's name
- TarEntry longLinkEntry = new TarEntry(TarConstants.GNU_LONGLINK,
- TarConstants.LF_GNUTYPE_LONGNAME);
-
- byte[] name = entry.getName().getBytes(StandardCharsets.UTF_8);
- longLinkEntry.setSize(name.length + 1);
- putNextEntry(longLinkEntry);
- write(name);
- write(0);
- closeEntry();
- } else if (longFileMode != LONGFILE_TRUNCATE) {
- throw new RuntimeException("file name '" + entry.getName()
- + "' is too long ( > "
- + TarConstants.NAMELEN + " bytes)");
- }
- }
-
- entry.writeEntryHeader(this.recordBuf);
- this.buffer.writeRecord(this.recordBuf);
-
- this.currBytes = 0;
-
- if (entry.isDirectory()) {
- this.currSize = 0;
- } else {
- this.currSize = entry.getSize();
- }
- currName = entry.getName();
- }
-
- /**
- * Close an entry. This method MUST be called for all file
- * entries that contain data. The reason is that we must
- * buffer data written to the stream in order to satisfy
- * the buffer's record based writes. Thus, there may be
- * data fragments still being assembled that must be written
- * to the output stream before this entry is closed and the
- * next entry written.
- * @throws IOException on error
- */
- public void closeEntry() throws IOException {
- if (this.assemLen > 0) {
- for (int i = this.assemLen; i < this.assemBuf.length; ++i) {
- this.assemBuf[i] = 0;
- }
-
- this.buffer.writeRecord(this.assemBuf);
-
- this.currBytes += this.assemLen;
- this.assemLen = 0;
- }
-
- if (this.currBytes < this.currSize) {
- throw new IOException("entry '" + currName + "' closed at '"
- + this.currBytes
- + "' before the '" + this.currSize
- + "' bytes specified in the header were written");
- }
- }
-
- /**
- * Writes a byte to the current tar archive entry.
- *
- * This method simply calls read( byte[], int, int ).
- *
- * @param b The byte written.
- * @throws IOException on error
- */
- @Override
- public void write(int b) throws IOException {
- this.oneBuf[0] = (byte) b;
-
- this.write(this.oneBuf, 0, 1);
- }
-
- /**
- * Writes bytes to the current tar archive entry.
- *
- * This method simply calls write( byte[], int, int ).
- *
- * @param wBuf The buffer to write to the archive.
- * @throws IOException on error
- */
- @Override
- public void write(byte[] wBuf) throws IOException {
- this.write(wBuf, 0, wBuf.length);
- }
-
- /**
- * Writes bytes to the current tar archive entry. This method
- * is aware of the current entry and will throw an exception if
- * you attempt to write bytes past the length specified for the
- * current entry. The method is also (painfully) aware of the
- * record buffering required by TarBuffer, and manages buffers
- * that are not a multiple of recordsize in length, including
- * assembling records from small buffers.
- *
- * @param wBuf The buffer to write to the archive.
- * @param wOffset The offset in the buffer from which to get bytes.
- * @param numToWrite The number of bytes to write.
- * @throws IOException on error
- */
- @Override
- public void write(byte[] wBuf, int wOffset, int numToWrite) throws IOException {
- if (this.currBytes + numToWrite > this.currSize) {
- throw new IOException("request to write '" + numToWrite
- + "' bytes exceeds size in header of '"
- + this.currSize + "' bytes for entry '"
- + currName + "'");
-
- //
- // We have to deal with assembly!!!
- // The programmer can be writing little 32 byte chunks for all
- // we know, and we must assemble complete records for writing.
- // REVIEW Maybe this should be in TarBuffer? Could that help to
- // eliminate some of the buffer copying.
- //
- }
-
- if (this.assemLen > 0) {
- if (this.assemLen + numToWrite >= this.recordBuf.length) {
- int aLen = this.recordBuf.length - this.assemLen;
-
- System.arraycopy(this.assemBuf, 0, this.recordBuf, 0,
- this.assemLen);
- System.arraycopy(wBuf, wOffset, this.recordBuf,
- this.assemLen, aLen);
- this.buffer.writeRecord(this.recordBuf);
-
- this.currBytes += this.recordBuf.length;
- wOffset += aLen;
- numToWrite -= aLen;
- this.assemLen = 0;
- } else {
- System.arraycopy(wBuf, wOffset, this.assemBuf, this.assemLen,
- numToWrite);
-
- wOffset += numToWrite;
- this.assemLen += numToWrite;
- numToWrite = 0;
- }
- }
-
- //
- // When we get here we have EITHER:
- // o An empty "assemble" buffer.
- // o No bytes to write (numToWrite == 0)
- //
- while (numToWrite > 0) {
- if (numToWrite < this.recordBuf.length) {
- System.arraycopy(wBuf, wOffset, this.assemBuf, this.assemLen,
- numToWrite);
-
- this.assemLen += numToWrite;
-
- break;
- }
-
- this.buffer.writeRecord(wBuf, wOffset);
-
- int num = this.recordBuf.length;
-
- this.currBytes += num;
- numToWrite -= num;
- wOffset += num;
- }
- }
-
- /**
- * Write an EOF (end of archive) record to the tar archive.
- * An EOF record consists of a record of all zeros.
- */
- private void writeEOFRecord() throws IOException {
- Arrays.fill(this.recordBuf, (byte) 0);
-
- this.buffer.writeRecord(this.recordBuf);
- }
-}
diff --git a/core/src/main/resources/hudson/model/AbstractBuild/tasks_fr.properties b/core/src/main/resources/hudson/model/AbstractBuild/tasks_fr.properties
index b995d2133600..5eb454b36e5d 100644
--- a/core/src/main/resources/hudson/model/AbstractBuild/tasks_fr.properties
+++ b/core/src/main/resources/hudson/model/AbstractBuild/tasks_fr.properties
@@ -22,8 +22,8 @@
Back\ to\ Project=Retour au projet
Changes=Modifications
-Console\ Output=Sortie console
-View\ as\ plain\ text=Voir en tant que texte seulement
+Console\ Output=Sortie de la console
+View\ as\ plain\ text=Voir en texte brut
Edit\ Build\ Information=Informations de la construction
Status=\u00C9tat
View\ Build\ Information=Voir les informations du build
diff --git a/core/src/main/resources/hudson/model/AbstractProject/sidepanel_fr.properties b/core/src/main/resources/hudson/model/AbstractProject/sidepanel_fr.properties
index e453af67e8ce..27af159a3b9d 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/sidepanel_fr.properties
+++ b/core/src/main/resources/hudson/model/AbstractProject/sidepanel_fr.properties
@@ -26,3 +26,4 @@ Changes=Modifications
Workspace=R\u00e9pertoire de travail
Wipe\ Out\ Workspace=Effacer l''espace de travail
wipe.out.confirm=Voulez-vous vraiment effacer le r\u00e9pertoire de travail\u00a0?
+Rename=Renommer
diff --git a/core/src/main/resources/hudson/model/Run/console_fr.properties b/core/src/main/resources/hudson/model/Run/console_fr.properties
index ecf28ef26d4b..79988c043de1 100644
--- a/core/src/main/resources/hudson/model/Run/console_fr.properties
+++ b/core/src/main/resources/hudson/model/Run/console_fr.properties
@@ -21,5 +21,5 @@
# THE SOFTWARE.
Console\ Output=Sortie de la console
-View\ as\ plain\ text=Afficher ous forme de texte simple
+View\ as\ plain\ text=Voir en texte brut
skipSome=Ignore {0,number,integer} Ko. Log complet
diff --git a/core/src/main/resources/hudson/model/Run/delete_fr.properties b/core/src/main/resources/hudson/model/Run/delete_fr.properties
index b9f4b5857168..f4480b69a862 100644
--- a/core/src/main/resources/hudson/model/Run/delete_fr.properties
+++ b/core/src/main/resources/hudson/model/Run/delete_fr.properties
@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-Delete\ this\ build=Supprimer le build
+delete.build=Supprimer le build "{0}"
diff --git a/core/src/main/resources/hudson/triggers/SCMTrigger/BuildAction/index_fr.properties b/core/src/main/resources/hudson/triggers/SCMTrigger/BuildAction/index_fr.properties
index 8f0d3e034aed..6f74dfeb3062 100644
--- a/core/src/main/resources/hudson/triggers/SCMTrigger/BuildAction/index_fr.properties
+++ b/core/src/main/resources/hudson/triggers/SCMTrigger/BuildAction/index_fr.properties
@@ -21,5 +21,5 @@
# THE SOFTWARE.
Polling\ Log=Journal de d\u00E9clenchement
-View\ as\ plain\ text=Voir en texte
+View\ as\ plain\ text=Voir en texte brut
blurb=Cette page affiche le journal de ce qui a d\u00E9clench\u00E9 cette construction.
diff --git a/core/src/main/resources/lib/hudson/buildHealth.jelly b/core/src/main/resources/lib/hudson/buildHealth.jelly
index 88001756754b..f1f29481b54a 100644
--- a/core/src/main/resources/lib/hudson/buildHealth.jelly
+++ b/core/src/main/resources/lib/hudson/buildHealth.jelly
@@ -65,8 +65,8 @@ THE SOFTWARE.
-