63 files changed, 235 insertions, 32 deletions

diff --git a/Android.bp b/Android.bp
index 5e5cca0..04a67c1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5,11 +5,13 @@ java_import {
     sdk_version: "core_current",
 }
 
+// exclude_dirs is used to remove META-INF resources that causes issues for jarjar builds
 java_import {
     name: "kotlin-reflect",
     host_supported: true,
     jars: ["lib/kotlin-reflect.jar"],
     sdk_version: "core_current",
+    exclude_dirs: ["META-INF/versions"],
 }
 
 java_import {
diff --git a/METADATA b/METADATA
index efea123..c409a11 100644
--- a/METADATA
+++ b/METADATA
@@ -7,17 +7,17 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://github.com/JetBrains/kotlin/releases/download/v1.3.72/kotlin-compiler-1.3.72.zip"
+    value: "https://github.com/JetBrains/kotlin/releases/download/v1.4.0/kotlin-compiler-1.4.0.zip"
   }
   url {
     type: ARCHIVE
     value: "https://github.com/JetBrains/intellij-community/raw/171/lib/src/trove4j_src.jar"
   }
-  version: "v1.3.72"
+  version: "v1.4.0"
   license_type: RECIPROCAL
   last_upgrade_date {
     year: 2020
-    month: 4
-    day: 15
+    month: 8
+    day: 18
   }
 }
diff --git a/bin/kotlinc.bat b/bin/kotlinc.bat
index 55e5c15..93c695c 100644
--- a/bin/kotlinc.bat
+++ b/bin/kotlinc.bat
@@ -27,11 +27,29 @@ if "%_JAVACMD%"=="" set _JAVACMD=java
 rem We use the value of the JAVA_OPTS environment variable if defined

 if "%JAVA_OPTS%"=="" set JAVA_OPTS=-Xmx256M -Xms32M

 

-if not "%_KOTLIN_RUNNER%"=="" (

+rem Iterate through arguments and split them into java and kotlin ones

+:loop

+set _arg=%~1

+if "%_arg%" == "" goto loopend

+

+if "%_arg:~0,2%"=="-J" (

+  set JAVA_OPTS=%JAVA_OPTS% "%_arg:~2%"

+) else (

+  if "%_arg:~0,2%"=="-D" (

+    set JAVA_OPTS=%JAVA_OPTS% "%_arg%"

+  ) else (

+    set KOTLIN_OPTS=%KOTLIN_OPTS% "%_arg%"

+  )

+)

+shift

+goto loop

+:loopend

+

+if "%_KOTLIN_RUNNER%"=="1" (

   "%_JAVACMD%" %JAVA_OPTS% "-Dkotlin.home=%_KOTLIN_HOME%" -cp "%_KOTLIN_HOME%\lib\kotlin-runner.jar" ^

-    org.jetbrains.kotlin.runner.Main %*

+    org.jetbrains.kotlin.runner.Main %KOTLIN_OPTS%

 ) else (

-  SET _ADDITIONAL_CLASSPATH=""

+  SET _ADDITIONAL_CLASSPATH=

 

   if not "%_KOTLIN_TOOL%"=="" (

     set _ADDITIONAL_CLASSPATH=;%_KOTLIN_HOME%\lib\%_KOTLIN_TOOL%

@@ -39,7 +57,7 @@ if not "%_KOTLIN_RUNNER%"=="" (
 

   "%_JAVACMD%" %JAVA_OPTS% -noverify -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^

     org.jetbrains.kotlin.preloading.Preloader -cp "%_KOTLIN_HOME%\lib\kotlin-compiler.jar%_ADDITIONAL_CLASSPATH%" ^

-    %_KOTLIN_COMPILER% %*

+    %_KOTLIN_COMPILER% %KOTLIN_OPTS%

 )

 

 exit /b %ERRORLEVEL%

diff --git a/build.txt b/build.txt
index 1617a38..786f81e 100644
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-1.3.72-release-468
\ No newline at end of file
+1.4.0-release-329
\ No newline at end of file
diff --git a/lib/allopen-compiler-plugin.jar b/lib/allopen-compiler-plugin.jar
index 1954634..9fac3e6 100644
--- a/lib/allopen-compiler-plugin.jar
+++ b/lib/allopen-compiler-plugin.jar
diff --git a/lib/android-extensions-compiler.jar b/lib/android-extensions-compiler.jar
index d064cb7..3d5ff36 100644
--- a/lib/android-extensions-compiler.jar
+++ b/lib/android-extensions-compiler.jar
diff --git a/lib/android-extensions-runtime.jar b/lib/android-extensions-runtime.jar
index ca86346..1458c45 100644
--- a/lib/android-extensions-runtime.jar
+++ b/lib/android-extensions-runtime.jar
diff --git a/lib/js.engines.jar b/lib/js.engines.jar
index 7eb4418..36b28de 100644
--- a/lib/js.engines.jar
+++ b/lib/js.engines.jar
diff --git a/lib/jvm-abi-gen.jar b/lib/jvm-abi-gen.jar
index b6ee1c6..57b7d09 100644
--- a/lib/jvm-abi-gen.jar
+++ b/lib/jvm-abi-gen.jar
diff --git a/lib/kotlin-annotation-processing-cli.jar b/lib/kotlin-annotation-processing-cli.jar
index 15f1591..dcb4c64 100644
--- a/lib/kotlin-annotation-processing-cli.jar
+++ b/lib/kotlin-annotation-processing-cli.jar
diff --git a/lib/kotlin-annotation-processing-runtime.jar b/lib/kotlin-annotation-processing-runtime.jar
index 7f7cbf3..e401c2e 100644
--- a/lib/kotlin-annotation-processing-runtime.jar
+++ b/lib/kotlin-annotation-processing-runtime.jar
diff --git a/lib/kotlin-annotation-processing.jar b/lib/kotlin-annotation-processing.jar
index 549a4d3..3be73f6 100644
--- a/lib/kotlin-annotation-processing.jar
+++ b/lib/kotlin-annotation-processing.jar
diff --git a/lib/kotlin-annotations-android.jar b/lib/kotlin-annotations-android.jar
index df7599c..8d3e135 100644
--- a/lib/kotlin-annotations-android.jar
+++ b/lib/kotlin-annotations-android.jar
diff --git a/lib/kotlin-annotations-jvm-sources.jar b/lib/kotlin-annotations-jvm-sources.jar
index bec64f6..1f42581 100644
--- a/lib/kotlin-annotations-jvm-sources.jar
+++ b/lib/kotlin-annotations-jvm-sources.jar
diff --git a/lib/kotlin-annotations-jvm.jar b/lib/kotlin-annotations-jvm.jar
index cb171c3..f5063cf 100644
--- a/lib/kotlin-annotations-jvm.jar
+++ b/lib/kotlin-annotations-jvm.jar
diff --git a/lib/kotlin-ant.jar b/lib/kotlin-ant.jar
index d055402..1b2b15c 100644
--- a/lib/kotlin-ant.jar
+++ b/lib/kotlin-ant.jar
diff --git a/lib/kotlin-compiler.jar b/lib/kotlin-compiler.jar
index 2cd468d..8f0ff03 100644
--- a/lib/kotlin-compiler.jar
+++ b/lib/kotlin-compiler.jar
diff --git a/lib/kotlin-coroutines-experimental-compat-sources.jar b/lib/kotlin-coroutines-experimental-compat-sources.jar
new file mode 100644
index 0000000..9746779
--- /dev/null
+++ b/lib/kotlin-coroutines-experimental-compat-sources.jar
diff --git a/lib/kotlin-coroutines-experimental-compat.jar b/lib/kotlin-coroutines-experimental-compat.jar
new file mode 100644
index 0000000..c0f6971
--- /dev/null
+++ b/lib/kotlin-coroutines-experimental-compat.jar
diff --git a/lib/kotlin-daemon-client.jar b/lib/kotlin-daemon-client.jar
index 69c566f..438c393 100644
--- a/lib/kotlin-daemon-client.jar
+++ b/lib/kotlin-daemon-client.jar
diff --git a/lib/kotlin-daemon.jar b/lib/kotlin-daemon.jar
index 672a981..dee4b6b 100644
--- a/lib/kotlin-daemon.jar
+++ b/lib/kotlin-daemon.jar
diff --git a/lib/kotlin-imports-dumper-compiler-plugin.jar b/lib/kotlin-imports-dumper-compiler-plugin.jar
index 8937600..734e4db 100644
--- a/lib/kotlin-imports-dumper-compiler-plugin.jar
+++ b/lib/kotlin-imports-dumper-compiler-plugin.jar
diff --git a/lib/kotlin-main-kts.jar b/lib/kotlin-main-kts.jar
index 6c9c682..d818894 100644
--- a/lib/kotlin-main-kts.jar
+++ b/lib/kotlin-main-kts.jar
diff --git a/lib/kotlin-preloader.jar b/lib/kotlin-preloader.jar
index a3cf3c6..548e757 100644
--- a/lib/kotlin-preloader.jar
+++ b/lib/kotlin-preloader.jar
diff --git a/lib/kotlin-reflect-sources.jar b/lib/kotlin-reflect-sources.jar
index a733ae7..8e086eb 100644
--- a/lib/kotlin-reflect-sources.jar
+++ b/lib/kotlin-reflect-sources.jar
diff --git a/lib/kotlin-reflect.jar b/lib/kotlin-reflect.jar
index 400bd60..05e0f04 100644
--- a/lib/kotlin-reflect.jar
+++ b/lib/kotlin-reflect.jar
diff --git a/lib/kotlin-runner.jar b/lib/kotlin-runner.jar
index 7edd122..eb9373a 100644
--- a/lib/kotlin-runner.jar
+++ b/lib/kotlin-runner.jar
diff --git a/lib/kotlin-script-runtime-sources.jar b/lib/kotlin-script-runtime-sources.jar
index 5480b13..e661487 100644
--- a/lib/kotlin-script-runtime-sources.jar
+++ b/lib/kotlin-script-runtime-sources.jar
diff --git a/lib/kotlin-script-runtime.jar b/lib/kotlin-script-runtime.jar
index ccaf11d..f8e8474 100644
--- a/lib/kotlin-script-runtime.jar
+++ b/lib/kotlin-script-runtime.jar
diff --git a/lib/kotlin-scripting-common.jar b/lib/kotlin-scripting-common.jar
index 6b4e0a5..ff76c77 100644
--- a/lib/kotlin-scripting-common.jar
+++ b/lib/kotlin-scripting-common.jar
diff --git a/lib/kotlin-scripting-compiler-impl.jar b/lib/kotlin-scripting-compiler-impl.jar
index 338a323..2f08a00 100644
--- a/lib/kotlin-scripting-compiler-impl.jar
+++ b/lib/kotlin-scripting-compiler-impl.jar
diff --git a/lib/kotlin-scripting-compiler.jar b/lib/kotlin-scripting-compiler.jar
index 072f2f0..01af9ca 100644
--- a/lib/kotlin-scripting-compiler.jar
+++ b/lib/kotlin-scripting-compiler.jar
diff --git a/lib/kotlin-scripting-js.jar b/lib/kotlin-scripting-js.jar
index 2df6c59..2340888 100644
--- a/lib/kotlin-scripting-js.jar
+++ b/lib/kotlin-scripting-js.jar
diff --git a/lib/kotlin-scripting-jvm.jar b/lib/kotlin-scripting-jvm.jar
index e8b5e4c..2ba39e2 100644
--- a/lib/kotlin-scripting-jvm.jar
+++ b/lib/kotlin-scripting-jvm.jar
diff --git a/lib/kotlin-stdlib-jdk7-sources.jar b/lib/kotlin-stdlib-jdk7-sources.jar
index 629540f..4767d1a 100644
--- a/lib/kotlin-stdlib-jdk7-sources.jar
+++ b/lib/kotlin-stdlib-jdk7-sources.jar
diff --git a/lib/kotlin-stdlib-jdk7.jar b/lib/kotlin-stdlib-jdk7.jar
index cb2568b..03c5e64 100644
--- a/lib/kotlin-stdlib-jdk7.jar
+++ b/lib/kotlin-stdlib-jdk7.jar
diff --git a/lib/kotlin-stdlib-jdk8-sources.jar b/lib/kotlin-stdlib-jdk8-sources.jar
index 1580b59..14174f1 100644
--- a/lib/kotlin-stdlib-jdk8-sources.jar
+++ b/lib/kotlin-stdlib-jdk8-sources.jar
diff --git a/lib/kotlin-stdlib-jdk8.jar b/lib/kotlin-stdlib-jdk8.jar
index 7ca1ed8..eac9465 100644
--- a/lib/kotlin-stdlib-jdk8.jar
+++ b/lib/kotlin-stdlib-jdk8.jar
diff --git a/lib/kotlin-stdlib-js-sources.jar b/lib/kotlin-stdlib-js-sources.jar
index 9c7adac..165cd75 100644
--- a/lib/kotlin-stdlib-js-sources.jar
+++ b/lib/kotlin-stdlib-js-sources.jar
diff --git a/lib/kotlin-stdlib-js.jar b/lib/kotlin-stdlib-js.jar
index 26926e9..2a36a0c 100644
--- a/lib/kotlin-stdlib-js.jar
+++ b/lib/kotlin-stdlib-js.jar
diff --git a/lib/kotlin-stdlib-sources.jar b/lib/kotlin-stdlib-sources.jar
index d54da21..5c4a8e2 100644
--- a/lib/kotlin-stdlib-sources.jar
+++ b/lib/kotlin-stdlib-sources.jar
diff --git a/lib/kotlin-stdlib.jar b/lib/kotlin-stdlib.jar
index 4830a41..d4c19ae 100644
--- a/lib/kotlin-stdlib.jar
+++ b/lib/kotlin-stdlib.jar
diff --git a/lib/kotlin-test-js-sources.jar b/lib/kotlin-test-js-sources.jar
index 524bac9..5493d36 100644
--- a/lib/kotlin-test-js-sources.jar
+++ b/lib/kotlin-test-js-sources.jar
diff --git a/lib/kotlin-test-js.jar b/lib/kotlin-test-js.jar
index 3bf843e..2bdcbbf 100644
--- a/lib/kotlin-test-js.jar
+++ b/lib/kotlin-test-js.jar
diff --git a/lib/kotlin-test-junit-sources.jar b/lib/kotlin-test-junit-sources.jar
index 9ac56bc..edaa13e 100644
--- a/lib/kotlin-test-junit-sources.jar
+++ b/lib/kotlin-test-junit-sources.jar
diff --git a/lib/kotlin-test-junit.jar b/lib/kotlin-test-junit.jar
index 069cf07..d876680 100644
--- a/lib/kotlin-test-junit.jar
+++ b/lib/kotlin-test-junit.jar
diff --git a/lib/kotlin-test-junit5-sources.jar b/lib/kotlin-test-junit5-sources.jar
index a2daec2..09d78e8 100644
--- a/lib/kotlin-test-junit5-sources.jar
+++ b/lib/kotlin-test-junit5-sources.jar
diff --git a/lib/kotlin-test-junit5.jar b/lib/kotlin-test-junit5.jar
index 3c406ba..21b1328 100644
--- a/lib/kotlin-test-junit5.jar
+++ b/lib/kotlin-test-junit5.jar
diff --git a/lib/kotlin-test-sources.jar b/lib/kotlin-test-sources.jar
index 9a22d96..a4e895b 100644
--- a/lib/kotlin-test-sources.jar
+++ b/lib/kotlin-test-sources.jar
diff --git a/lib/kotlin-test-testng-sources.jar b/lib/kotlin-test-testng-sources.jar
index 46d1cee..d4fd54e 100644
--- a/lib/kotlin-test-testng-sources.jar
+++ b/lib/kotlin-test-testng-sources.jar
diff --git a/lib/kotlin-test-testng.jar b/lib/kotlin-test-testng.jar
index d2662c5..8757155 100644
--- a/lib/kotlin-test-testng.jar
+++ b/lib/kotlin-test-testng.jar
diff --git a/lib/kotlin-test.jar b/lib/kotlin-test.jar
index 610d169..efdbe3b 100644
--- a/lib/kotlin-test.jar
+++ b/lib/kotlin-test.jar
diff --git a/lib/kotlinx-coroutines-core.jar b/lib/kotlinx-coroutines-core.jar
new file mode 100644
index 0000000..6b45f79
--- /dev/null
+++ b/lib/kotlinx-coroutines-core.jar
diff --git a/lib/kotlinx-serialization-compiler-plugin.jar b/lib/kotlinx-serialization-compiler-plugin.jar
index ae207e5..75222b9 100644
--- a/lib/kotlinx-serialization-compiler-plugin.jar
+++ b/lib/kotlinx-serialization-compiler-plugin.jar
diff --git a/lib/mutability-annotations-compat.jar b/lib/mutability-annotations-compat.jar
index bbd9b32..1b88519 100644
--- a/lib/mutability-annotations-compat.jar
+++ b/lib/mutability-annotations-compat.jar
diff --git a/lib/noarg-compiler-plugin.jar b/lib/noarg-compiler-plugin.jar
index bd46efc..5b31567 100644
--- a/lib/noarg-compiler-plugin.jar
+++ b/lib/noarg-compiler-plugin.jar
diff --git a/lib/sam-with-receiver-compiler-plugin.jar b/lib/sam-with-receiver-compiler-plugin.jar
index 3d6228d..9c06c9a 100644
--- a/lib/sam-with-receiver-compiler-plugin.jar
+++ b/lib/sam-with-receiver-compiler-plugin.jar
diff --git a/license/COPYRIGHT.txt b/license/COPYRIGHT.txt
index 73d6407..71198e0 100644
--- a/license/COPYRIGHT.txt
+++ b/license/COPYRIGHT.txt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/license/LICENSE.txt b/license/LICENSE.txt
index 103098e..9c308d9 100644
--- a/license/LICENSE.txt
+++ b/license/LICENSE.txt
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2000-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+   Copyright 2000-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/license/NOTICE.txt b/license/NOTICE.txt
index 4edcb1a..035b9dc 100644
--- a/license/NOTICE.txt
+++ b/license/NOTICE.txt
@@ -5,4 +5,4 @@
    =========================================================================
 
    Kotlin Compiler
-   Copyright 2010-2019 JetBrains s.r.o and respective authors and developers
+   Copyright 2010-2020 JetBrains s.r.o and respective authors and developers
diff --git a/license/README.md b/license/README.md
index f9c31bb..9ed8495 100644
--- a/license/README.md
+++ b/license/README.md
@@ -204,10 +204,6 @@ any distributions of the tools or libraries:
       - License: MIT ([license/third_party/mocha-teamcity-reporter_LICENSE.txt](third_party/mocha-teamcity-reporter_LICENSE.txt)
              and [license/third_party/teamcity-service-messages_LICENSE.txt](third_party/teamcity-service-messages_LICENSE.txt))
       - Origin: Copyright (c) 2016 Jamie Sherriff and Copyright (c) 2013 Aaron Forsander
-      
- - Path: libraries/tools/kotlin-source-map-loader/kotlin-source-map-loader.js
-      - License: MIT ([license/third_party/source-map-loader_LICENSE.txt](third_party/source-map-loader_LICENSE.txt))
-      - Origin: Copyright JS Foundation and other contributors
 
 ## Example Code
 
diff --git a/license/third_party/fastutil_licence b/license/third_party/fastutil_licence
new file mode 100644
index 0000000..a976d48
--- /dev/null
+++ b/license/third_party/fastutil_licence
@@ -0,0 +1,203 @@
+http://fastutil.di.unimi.it/
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
\ No newline at end of file
diff --git a/license/third_party/testdata/findbugs_license.txt b/license/third_party/testdata/findbugs_license.txt
index 40a0ab7..4362b49 100644
--- a/license/third_party/testdata/findbugs_license.txt
+++ b/license/third_party/testdata/findbugs_license.txt
@@ -136,22 +136,6 @@ included without limitation in the term "modification".)
   "Source code" for a work means the preferred form of the work for
 making modifications to it.  For a library, complete source code means
 all the source code for all modules it contains, plus any associated
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed 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.
- */
-
 interface definition files, plus the scripts used to control compilation
 and installation of the library.