Snap for 8340624 from 18a980206d62b715d1bb9a0b411413b2d0d5ee6f to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r19android-security-13.0.0_r18android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r2android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-gsi

Change-Id: I596a76395ec27bce4a99fd5315b7d4057cd5193d

10 files changed, 133 insertions, 121 deletions

diff --git a/org.jacoco.core/src/org/jacoco/core/data/ExecutionData.java b/org.jacoco.core/src/org/jacoco/core/data/ExecutionData.java
index a728e033..a22c0235 100644
--- a/org.jacoco.core/src/org/jacoco/core/data/ExecutionData.java
+++ b/org.jacoco.core/src/org/jacoco/core/data/ExecutionData.java
@@ -1,13 +1,14 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2009, 2021 Mountainminds GmbH & Co. KG and Contributors
+ * This program and the accompanying materials are made available under
+ * the terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    Marc R. Hoffmann - initial API and implementation
- *    
+ *
  *******************************************************************************/
 package org.jacoco.core.data;
 
@@ -32,7 +33,7 @@ public final class ExecutionData implements IExecutionData {
 
 	/**
 	 * Creates a new {@link ExecutionData} object with the given probe data.
-	 * 
+	 *
 	 * @param id
 	 *            class identifier
 	 * @param name
@@ -50,7 +51,7 @@ public final class ExecutionData implements IExecutionData {
 	/**
 	 * Creates a new {@link ExecutionData} object with the given probe data
 	 * length. All probes are set to <code>false</code>.
-	 * 
+	 *
 	 * @param id
 	 *            class identifier
 	 * @param name
@@ -58,7 +59,8 @@ public final class ExecutionData implements IExecutionData {
 	 * @param probeCount
 	 *            probe count
 	 */
-	public ExecutionData(final long id, final String name, final int probeCount) {
+	public ExecutionData(final long id, final String name,
+			final int probeCount) {
 		this.id = id;
 		this.name = name;
 		this.probes = new boolean[probeCount];
@@ -67,7 +69,7 @@ public final class ExecutionData implements IExecutionData {
 	/**
 	 * Return the unique identifier for this class. The identifier is the CRC64
 	 * checksum of the raw class file definition.
-	 * 
+	 *
 	 * @return class identifier
 	 */
 	public long getId() {
@@ -76,7 +78,7 @@ public final class ExecutionData implements IExecutionData {
 
 	/**
 	 * The VM name of the class.
-	 * 
+	 *
 	 * @return VM name
 	 */
 	public String getName() {
@@ -103,10 +105,9 @@ public final class ExecutionData implements IExecutionData {
 	}
 
 	/**
-	 * Returns the execution data probe for a given index. A value of
-	 * <code>true</code> indicates that the corresponding probe was
-	 * executed.
-	 * 
+	 * Returns the execution data probes. A value of <code>true</code> indicates
+	 * that the corresponding probe was executed.
+	 *
 	 * @return probe data
 	 */
 	public boolean getProbe(final int index) {
@@ -130,7 +131,7 @@ public final class ExecutionData implements IExecutionData {
 
 	/**
 	 * Checks whether any probe has been hit.
-	 * 
+	 *
 	 * @return <code>true</code>, if at least one probe has been hit
 	 */
 	public boolean hasHits() {
@@ -147,13 +148,13 @@ public final class ExecutionData implements IExecutionData {
 	 * a probe entry in this object is marked as executed (<code>true</code>) if
 	 * this probe or the corresponding other probe was executed. So the result
 	 * is
-	 * 
+	 *
 	 * <pre>
 	 * A or B
 	 * </pre>
-	 * 
+	 *
 	 * The probe array of the other object is not modified.
-	 * 
+	 *
 	 * @param other
 	 *            execution data to merge
 	 */
@@ -168,19 +169,19 @@ public final class ExecutionData implements IExecutionData {
 	 * probe in this object is set to the value of <code>flag</code> if the
 	 * corresponding other probe was executed. For <code>flag==true</code> this
 	 * corresponds to
-	 * 
+	 *
 	 * <pre>
 	 * A or B
 	 * </pre>
-	 * 
+	 *
 	 * For <code>flag==false</code> this can be considered as a subtraction
-	 * 
+	 *
 	 * <pre>
 	 * A and not B
 	 * </pre>
-	 * 
+	 *
 	 * The probe array of the other object is not modified.
-	 * 
+	 *
 	 * @param other
 	 *            execution data to merge
 	 * @param flag
@@ -203,7 +204,7 @@ public final class ExecutionData implements IExecutionData {
 	 * Asserts that this execution data object is compatible with the given
 	 * parameters. The purpose of this check is to detect a very unlikely class
 	 * id collision.
-	 * 
+	 *
 	 * @param id
 	 *            other class id, must be the same
 	 * @param name
@@ -216,14 +217,14 @@ public final class ExecutionData implements IExecutionData {
 	public void assertCompatibility(final long id, final String name,
 			final int probecount) throws IllegalStateException {
 		if (this.id != id) {
-			throw new IllegalStateException(format(
-					"Different ids (%016x and %016x).", Long.valueOf(this.id),
-					Long.valueOf(id)));
+			throw new IllegalStateException(
+					format("Different ids (%016x and %016x).",
+							Long.valueOf(this.id), Long.valueOf(id)));
 		}
 		if (!this.name.equals(name)) {
-			throw new IllegalStateException(format(
-					"Different class names %s and %s for id %016x.", this.name,
-					name, Long.valueOf(id)));
+			throw new IllegalStateException(
+					format("Different class names %s and %s for id %016x.",
+							this.name, name, Long.valueOf(id)));
 		}
 		if (this.probes.length != probecount) {
 			throw new IllegalStateException(format(
diff --git a/org.jacoco.core/src/org/jacoco/core/data/ExecutionDataReader.java b/org.jacoco.core/src/org/jacoco/core/data/ExecutionDataReader.java
index dd8519b5..e7b7d816 100644
--- a/org.jacoco.core/src/org/jacoco/core/data/ExecutionDataReader.java
+++ b/org.jacoco.core/src/org/jacoco/core/data/ExecutionDataReader.java
@@ -1,13 +1,14 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2009, 2021 Mountainminds GmbH & Co. KG and Contributors
+ * This program and the accompanying materials are made available under
+ * the terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    Marc R. Hoffmann - initial API and implementation
- *    
+ *
  *******************************************************************************/
 package org.jacoco.core.data;
 
@@ -36,7 +37,7 @@ public class ExecutionDataReader {
 	 * Creates a new reader based on the given input stream input. Depending on
 	 * the nature of the underlying stream input should be buffered as most data
 	 * is read in single bytes.
-	 * 
+	 *
 	 * @param input
 	 *            input stream to read execution data from
 	 */
@@ -46,7 +47,7 @@ public class ExecutionDataReader {
 
 	/**
 	 * Sets an listener for session information.
-	 * 
+	 *
 	 * @param visitor
 	 *            visitor to retrieve session info events
 	 */
@@ -56,7 +57,7 @@ public class ExecutionDataReader {
 
 	/**
 	 * Sets an listener for execution data.
-	 * 
+	 *
 	 * @param visitor
 	 *            visitor to retrieve execution data events
 	 */
@@ -67,7 +68,7 @@ public class ExecutionDataReader {
 	/**
 	 * Reads all data and reports it to the corresponding visitors. The stream
 	 * is read until its end or a command confirmation has been sent.
-	 * 
+	 *
 	 * @return <code>true</code> if additional data can be expected after a
 	 *         command has been executed. <code>false</code> if the end of the
 	 *         stream has been reached.
@@ -76,8 +77,8 @@ public class ExecutionDataReader {
 	 * @throws IncompatibleExecDataVersionException
 	 *             incompatible data version from different JaCoCo release
 	 */
-	public boolean read() throws IOException,
-			IncompatibleExecDataVersionException {
+	public boolean read()
+			throws IOException, IncompatibleExecDataVersionException {
 		byte type;
 		do {
 			int i = in.read();
@@ -96,7 +97,7 @@ public class ExecutionDataReader {
 	/**
 	 * Reads a block of data identified by the given id. Subclasses may
 	 * overwrite this method to support additional block types.
-	 * 
+	 *
 	 * @param blocktype
 	 *            block type
 	 * @return <code>true</code> if there are more blocks to read
@@ -115,8 +116,8 @@ public class ExecutionDataReader {
 			readExecutionData();
 			return true;
 		default:
-			throw new IOException(format("Unknown block type %x.",
-					Byte.valueOf(blocktype)));
+			throw new IOException(
+					format("Unknown block type %x.", Byte.valueOf(blocktype)));
 		}
 	}
 
@@ -147,8 +148,8 @@ public class ExecutionDataReader {
 		final long id = in.readLong();
 		final String name = in.readUTF();
 		final boolean[] probes = in.readBooleanArray();
-		executionDataVisitor.visitClassExecution(new ExecutionData(id, name,
-				probes));
+		executionDataVisitor
+				.visitClassExecution(new ExecutionData(id, name, probes));
 	}
 
 }
diff --git a/org.jacoco.core/src/org/jacoco/core/data/ExecutionDataStore.java b/org.jacoco.core/src/org/jacoco/core/data/ExecutionDataStore.java
index ce0bec47..2291fd58 100644
--- a/org.jacoco.core/src/org/jacoco/core/data/ExecutionDataStore.java
+++ b/org.jacoco.core/src/org/jacoco/core/data/ExecutionDataStore.java
@@ -1,13 +1,14 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2009, 2021 Mountainminds GmbH & Co. KG and Contributors
+ * This program and the accompanying materials are made available under
+ * the terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    Marc R. Hoffmann - initial API and implementation
- *    
+ *
  *******************************************************************************/
 package org.jacoco.core.data;
 
@@ -38,7 +39,7 @@ public final class ExecutionDataStore implements IExecutionDataVisitor {
 	 * Adds the given {@link ExecutionData} object into the store. If there is
 	 * already execution data with this same class id, this structure is merged
 	 * with the given one.
-	 * 
+	 *
 	 * @param data
 	 *            execution data to add or merge
 	 * @throws IllegalStateException
@@ -64,7 +65,7 @@ public final class ExecutionDataStore implements IExecutionDataVisitor {
 	 * store. I.e. for all set probes in the given data object the corresponding
 	 * probes in this store will be unset. If there is no execution data with id
 	 * of the given data object this operation will have no effect.
-	 * 
+	 *
 	 * @param data
 	 *            execution data to subtract
 	 * @throws IllegalStateException
@@ -84,7 +85,7 @@ public final class ExecutionDataStore implements IExecutionDataVisitor {
 
 	/**
 	 * Subtracts all probes in the given execution data store from this store.
-	 * 
+	 *
 	 * @param store
 	 *            execution data store to subtract
 	 * @see #subtract(ExecutionData)
@@ -100,7 +101,7 @@ public final class ExecutionDataStore implements IExecutionDataVisitor {
 	/**
 	 * Returns the {@link ExecutionData} entry with the given id if it exists in
 	 * this store.
-	 * 
+	 *
 	 * @param id
 	 *            class id
 	 * @return execution data or <code>null</code>
@@ -114,7 +115,7 @@ public final class ExecutionDataStore implements IExecutionDataVisitor {
 	/**
 	 * Checks whether execution data for classes with the given name are
 	 * contained in the store.
-	 * 
+	 *
 	 * @param name
 	 *            VM name
 	 * @return <code>true</code> if at least one class with the name is
@@ -127,7 +128,7 @@ public final class ExecutionDataStore implements IExecutionDataVisitor {
 	/**
 	 * Returns the coverage data for the class with the given identifier. If
 	 * there is no data available under the given id a new entry is created.
-	 * 
+	 *
 	 * @param id
 	 *            class identifier
 	 * @param name
@@ -176,7 +177,7 @@ public final class ExecutionDataStore implements IExecutionDataVisitor {
 
 	/**
 	 * Writes the content of the store to the given visitor interface.
-	 * 
+	 *
 	 * @param visitor
 	 *            interface to write content to
 	 */
diff --git a/org.jacoco.core/src/org/jacoco/core/data/ExecutionDataWriter.java b/org.jacoco.core/src/org/jacoco/core/data/ExecutionDataWriter.java
index bdf3445d..c92073c1 100644
--- a/org.jacoco.core/src/org/jacoco/core/data/ExecutionDataWriter.java
+++ b/org.jacoco.core/src/org/jacoco/core/data/ExecutionDataWriter.java
@@ -1,13 +1,14 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2009, 2021 Mountainminds GmbH & Co. KG and Contributors
+ * This program and the accompanying materials are made available under
+ * the terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    Marc R. Hoffmann - initial API and implementation
- *    
+ *
  *******************************************************************************/
 package org.jacoco.core.data;
 
@@ -20,10 +21,12 @@ import org.jacoco.core.internal.data.CompactDataOutput;
 /**
  * Serialization of execution data into binary streams.
  */
-public class ExecutionDataWriter implements ISessionInfoVisitor,
-		IExecutionDataVisitor {
+public class ExecutionDataWriter
+		implements ISessionInfoVisitor, IExecutionDataVisitor {
 
-	/** File format version, will be incremented for each incompatible change. */
+	/**
+	 * File format version, will be incremented for each incompatible change.
+	 */
 	public static final char FORMAT_VERSION;
 
 	static {
@@ -50,7 +53,7 @@ public class ExecutionDataWriter implements ISessionInfoVisitor,
 	 * Creates a new writer based on the given output stream. Depending on the
 	 * nature of the underlying stream output should be buffered as most data is
 	 * written in single bytes.
-	 * 
+	 *
 	 * @param output
 	 *            binary stream to write execution data to
 	 * @throws IOException
@@ -63,7 +66,7 @@ public class ExecutionDataWriter implements ISessionInfoVisitor,
 
 	/**
 	 * Writes an file header to identify the stream and its protocol version.
-	 * 
+	 *
 	 * @throws IOException
 	 *             if the header can't be written
 	 */
@@ -75,7 +78,7 @@ public class ExecutionDataWriter implements ISessionInfoVisitor,
 
 	/**
 	 * Flushes the underlying stream.
-	 * 
+	 *
 	 * @throws IOException
 	 *             if the underlying stream can't be flushed
 	 */
@@ -115,7 +118,7 @@ public class ExecutionDataWriter implements ISessionInfoVisitor,
 	 * Returns the first bytes of a file that represents a valid execution data
 	 * file. In any case every execution data file starts with the three bytes
 	 * <code>0x01 0xC0 0xC0</code>.
-	 * 
+	 *
 	 * @return first bytes of a execution data file
 	 */
 	public static final byte[] getFileHeader() {
diff --git a/org.jacoco.core/src/org/jacoco/core/data/IExecutionDataVisitor.java b/org.jacoco.core/src/org/jacoco/core/data/IExecutionDataVisitor.java
index 14eabbe7..b65ed2a7 100644
--- a/org.jacoco.core/src/org/jacoco/core/data/IExecutionDataVisitor.java
+++ b/org.jacoco.core/src/org/jacoco/core/data/IExecutionDataVisitor.java
@@ -1,13 +1,14 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2009, 2021 Mountainminds GmbH & Co. KG and Contributors
+ * This program and the accompanying materials are made available under
+ * the terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    Marc R. Hoffmann - initial API and implementation
- *    
+ *
  *******************************************************************************/
 package org.jacoco.core.data;
 
@@ -20,7 +21,7 @@ public interface IExecutionDataVisitor {
 
 	/**
 	 * Provides execution data for a class.
-	 * 
+	 *
 	 * @param data
 	 *            execution data for a class
 	 */
diff --git a/org.jacoco.core/src/org/jacoco/core/data/ISessionInfoVisitor.java b/org.jacoco.core/src/org/jacoco/core/data/ISessionInfoVisitor.java
index b80797a9..5f6a9375 100644
--- a/org.jacoco.core/src/org/jacoco/core/data/ISessionInfoVisitor.java
+++ b/org.jacoco.core/src/org/jacoco/core/data/ISessionInfoVisitor.java
@@ -1,13 +1,14 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2009, 2021 Mountainminds GmbH & Co. KG and Contributors
+ * This program and the accompanying materials are made available under
+ * the terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    Marc R. Hoffmann - initial API and implementation
- *    
+ *
  *******************************************************************************/
 package org.jacoco.core.data;
 
@@ -21,7 +22,7 @@ public interface ISessionInfoVisitor {
 	/**
 	 * Provides session information for the subsequent execution data calls. In
 	 * case of merged sessions this method might be called multiple times.
-	 * 
+	 *
 	 * @param info
 	 *            session information
 	 */
diff --git a/org.jacoco.core/src/org/jacoco/core/data/IncompatibleExecDataVersionException.java b/org.jacoco.core/src/org/jacoco/core/data/IncompatibleExecDataVersionException.java
index cc508e73..30e61e2d 100644
--- a/org.jacoco.core/src/org/jacoco/core/data/IncompatibleExecDataVersionException.java
+++ b/org.jacoco.core/src/org/jacoco/core/data/IncompatibleExecDataVersionException.java
@@ -1,13 +1,14 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2009, 2021 Mountainminds GmbH & Co. KG and Contributors
+ * This program and the accompanying materials are made available under
+ * the terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    Marc R. Hoffmann, somechris - initial API and implementation
- *    
+ *
  *******************************************************************************/
 package org.jacoco.core.data;
 
@@ -24,7 +25,7 @@ public class IncompatibleExecDataVersionException extends IOException {
 
 	/**
 	 * Creates a new exception to flag version mismatches in execution data.
-	 * 
+	 *
 	 * @param actualVersion
 	 *            version found in the exec data
 	 */
@@ -39,7 +40,7 @@ public class IncompatibleExecDataVersionException extends IOException {
 	/**
 	 * Gets the version expected in the execution data which can be read by this
 	 * version of JaCoCo.
-	 * 
+	 *
 	 * @return expected version in execution data
 	 */
 	public int getExpectedVersion() {
@@ -48,7 +49,7 @@ public class IncompatibleExecDataVersionException extends IOException {
 
 	/**
 	 * Gets the actual version found in the execution data.
-	 * 
+	 *
 	 * @return actual version in execution data
 	 */
 	public int getActualVersion() {
diff --git a/org.jacoco.core/src/org/jacoco/core/data/SessionInfo.java b/org.jacoco.core/src/org/jacoco/core/data/SessionInfo.java
index 31f7b5e3..f6e77597 100644
--- a/org.jacoco.core/src/org/jacoco/core/data/SessionInfo.java
+++ b/org.jacoco.core/src/org/jacoco/core/data/SessionInfo.java
@@ -1,13 +1,14 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2009, 2021 Mountainminds GmbH & Co. KG and Contributors
+ * This program and the accompanying materials are made available under
+ * the terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    Marc R. Hoffmann - initial API and implementation
- *    
+ *
  *******************************************************************************/
 package org.jacoco.core.data;
 
@@ -26,7 +27,7 @@ public class SessionInfo implements Comparable<SessionInfo> {
 
 	/**
 	 * Create a immutable session info with the given data.
-	 * 
+	 *
 	 * @param id
 	 *            arbitrary session identifier, must not be <code>null</code>
 	 * @param start
diff --git a/org.jacoco.core/src/org/jacoco/core/data/SessionInfoStore.java b/org.jacoco.core/src/org/jacoco/core/data/SessionInfoStore.java
index 568dcc96..20fb872b 100644
--- a/org.jacoco.core/src/org/jacoco/core/data/SessionInfoStore.java
+++ b/org.jacoco.core/src/org/jacoco/core/data/SessionInfoStore.java
@@ -1,13 +1,14 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2009, 2021 Mountainminds GmbH & Co. KG and Contributors
+ * This program and the accompanying materials are made available under
+ * the terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    Marc R. Hoffmann - initial API and implementation
- *    
+ *
  *******************************************************************************/
 package org.jacoco.core.data;
 
@@ -28,7 +29,7 @@ public class SessionInfoStore implements ISessionInfoVisitor {
 
 	/**
 	 * Tests whether the store is empty.
-	 * 
+	 *
 	 * @return <code>true</code> if the store is empty
 	 */
 	public boolean isEmpty() {
@@ -39,7 +40,7 @@ public class SessionInfoStore implements ISessionInfoVisitor {
 	 * Returns all {@link SessionInfo} objects currently contained in the store.
 	 * The info objects are ordered by its natural ordering (i.e. by the dump
 	 * time stamp).
-	 * 
+	 *
 	 * @return list of stored {@link SessionInfo} objects
 	 */
 	public List<SessionInfo> getInfos() {
@@ -54,11 +55,11 @@ public class SessionInfoStore implements ISessionInfoVisitor {
 	 * all contained sessions, the dump timestamp the maximum of all contained
 	 * sessions. If no session is currently contained both timestamps are set to
 	 * <code>0</code>.
-	 * 
+	 *
 	 * @param id
 	 *            identifier for the merged session info
 	 * @return new {@link SessionInfo} object
-	 * 
+	 *
 	 */
 	public SessionInfo getMerged(final String id) {
 		if (infos.isEmpty()) {
@@ -76,7 +77,7 @@ public class SessionInfoStore implements ISessionInfoVisitor {
 	/**
 	 * Writes all contained {@link SessionInfo} objects into the given visitor.
 	 * The info objects are emitted in chronological order by dump timestamp.
-	 * 
+	 *
 	 * @param visitor
 	 *            visitor to emit {@link SessionInfo} objects to
 	 */
diff --git a/org.jacoco.core/src/org/jacoco/core/data/package-info.java b/org.jacoco.core/src/org/jacoco/core/data/package-info.java
index 6e2f37bf..b7f33fe0 100644
--- a/org.jacoco.core/src/org/jacoco/core/data/package-info.java
+++ b/org.jacoco.core/src/org/jacoco/core/data/package-info.java
@@ -1,13 +1,14 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2009, 2021 Mountainminds GmbH & Co. KG and Contributors
+ * This program and the accompanying materials are made available under
+ * the terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    Marc R. Hoffmann - initial API and implementation
- *    
+ *
  *******************************************************************************/
 
 /**