diff options
| author | Allen Hair <allenhair@google.com> | 2018-01-05 15:26:10 -0800 |
|---|---|---|
| committer | Allen Hair <allenhair@google.com> | 2018-01-05 15:30:31 -0800 |
| commit | 8922af5540d7e7587de647df3875b3fac244f0a4 (patch) | |
| tree | 02e651f1bb9087c27fa14dfe4e7fcb11ccbfdc40 /org.jacoco.cli/src | |
| parent | b760c4765ce42102cda379f1cbcb164c9fa80b41 (diff) | |
| parent | 6a0c097ff42ff114b1efb0a7d264aaf1b290345e (diff) | |
| download | jacoco-8922af5540d7e7587de647df3875b3fac244f0a4.tar.gz | |
Merge tag 'v0.8.0' from 'aosp/upstream-master' into master.android-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7
* 6a0c097f (tag: v0.8.0) Prepare release v0.8.0
* b9d1b54e Happy New Year 2018!
* 6f375769 Consolidate change log for 0.8.0 release (#632)
* 0c50b210 Restore exec files compatibility regarding Java 9 class files (#636)
* 7f7c246f Offline instrumentation should not damage module-info (#634)
* e050f194 Instrumentation should not damage structured locking (#627)
* 4c0b93e8 Fix ExecutionData.merge JavaDoc (#630)
* ff001947 Add filter for duplicates of finally blocks (#604)
* 00f06ecc Fix typos
Bug: 69463998
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests
Change-Id: I00f3079bdbb0618141b4414cac0b83dcf9c0c2d5
Diffstat (limited to 'org.jacoco.cli/src')
13 files changed, 13 insertions, 13 deletions
diff --git a/org.jacoco.cli/src/org/jacoco/cli/internal/Command.java b/org.jacoco.cli/src/org/jacoco/cli/internal/Command.java index 7c4f5c15..5b1a2c66 100644 --- a/org.jacoco.cli/src/org/jacoco/cli/internal/Command.java +++ b/org.jacoco.cli/src/org/jacoco/cli/internal/Command.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 Mountainminds GmbH & Co. KG and Contributors + * Copyright (c) 2009, 2018 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 diff --git a/org.jacoco.cli/src/org/jacoco/cli/internal/CommandHandler.java b/org.jacoco.cli/src/org/jacoco/cli/internal/CommandHandler.java index 3c6a2a54..25d72e51 100644 --- a/org.jacoco.cli/src/org/jacoco/cli/internal/CommandHandler.java +++ b/org.jacoco.cli/src/org/jacoco/cli/internal/CommandHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 Mountainminds GmbH & Co. KG and Contributors + * Copyright (c) 2009, 2018 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 diff --git a/org.jacoco.cli/src/org/jacoco/cli/internal/CommandParser.java b/org.jacoco.cli/src/org/jacoco/cli/internal/CommandParser.java index 0e31093b..3c11001e 100644 --- a/org.jacoco.cli/src/org/jacoco/cli/internal/CommandParser.java +++ b/org.jacoco.cli/src/org/jacoco/cli/internal/CommandParser.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 Mountainminds GmbH & Co. KG and Contributors + * Copyright (c) 2009, 2018 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 diff --git a/org.jacoco.cli/src/org/jacoco/cli/internal/Main.java b/org.jacoco.cli/src/org/jacoco/cli/internal/Main.java index 1c02127f..7028a0e0 100644 --- a/org.jacoco.cli/src/org/jacoco/cli/internal/Main.java +++ b/org.jacoco.cli/src/org/jacoco/cli/internal/Main.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 Mountainminds GmbH & Co. KG and Contributors + * Copyright (c) 2009, 2018 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 diff --git a/org.jacoco.cli/src/org/jacoco/cli/internal/XmlDocumentation.java b/org.jacoco.cli/src/org/jacoco/cli/internal/XmlDocumentation.java index 83241c9a..3ed83e02 100644 --- a/org.jacoco.cli/src/org/jacoco/cli/internal/XmlDocumentation.java +++ b/org.jacoco.cli/src/org/jacoco/cli/internal/XmlDocumentation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 Mountainminds GmbH & Co. KG and Contributors + * Copyright (c) 2009, 2018 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 diff --git a/org.jacoco.cli/src/org/jacoco/cli/internal/commands/AllCommands.java b/org.jacoco.cli/src/org/jacoco/cli/internal/commands/AllCommands.java index e0df1d91..13a9a396 100644 --- a/org.jacoco.cli/src/org/jacoco/cli/internal/commands/AllCommands.java +++ b/org.jacoco.cli/src/org/jacoco/cli/internal/commands/AllCommands.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 Mountainminds GmbH & Co. KG and Contributors + * Copyright (c) 2009, 2018 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 diff --git a/org.jacoco.cli/src/org/jacoco/cli/internal/commands/ClassInfo.java b/org.jacoco.cli/src/org/jacoco/cli/internal/commands/ClassInfo.java index 5542d192..ee35033a 100644 --- a/org.jacoco.cli/src/org/jacoco/cli/internal/commands/ClassInfo.java +++ b/org.jacoco.cli/src/org/jacoco/cli/internal/commands/ClassInfo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 Mountainminds GmbH & Co. KG and Contributors + * Copyright (c) 2009, 2018 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 diff --git a/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Dump.java b/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Dump.java index 3c1575d9..9ca7df80 100644 --- a/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Dump.java +++ b/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Dump.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 Mountainminds GmbH & Co. KG and Contributors + * Copyright (c) 2009, 2018 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 diff --git a/org.jacoco.cli/src/org/jacoco/cli/internal/commands/ExecInfo.java b/org.jacoco.cli/src/org/jacoco/cli/internal/commands/ExecInfo.java index 211be983..48cff207 100644 --- a/org.jacoco.cli/src/org/jacoco/cli/internal/commands/ExecInfo.java +++ b/org.jacoco.cli/src/org/jacoco/cli/internal/commands/ExecInfo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 Mountainminds GmbH & Co. KG and Contributors + * Copyright (c) 2009, 2018 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 diff --git a/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Instrument.java b/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Instrument.java index bb3a8ff6..05c4c7c2 100644 --- a/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Instrument.java +++ b/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Instrument.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 Mountainminds GmbH & Co. KG and Contributors + * Copyright (c) 2009, 2018 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 diff --git a/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Merge.java b/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Merge.java index d4262abc..2076889b 100644 --- a/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Merge.java +++ b/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Merge.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 Mountainminds GmbH & Co. KG and Contributors + * Copyright (c) 2009, 2018 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 diff --git a/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Report.java b/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Report.java index eaa78842..2e20a66a 100644 --- a/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Report.java +++ b/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Report.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 Mountainminds GmbH & Co. KG and Contributors + * Copyright (c) 2009, 2018 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 diff --git a/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Version.java b/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Version.java index ef1e33a1..6bb5de7c 100644 --- a/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Version.java +++ b/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Version.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 Mountainminds GmbH & Co. KG and Contributors + * Copyright (c) 2009, 2018 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 |