From 5e85ef26eeeb91610d5c9fdb477dd15598941f09 Mon Sep 17 00:00:00 2001 From: "nikita.movshin" Date: Tue, 23 Apr 2019 20:15:03 +0300 Subject: [PATCH] Update copyright. Fix 2 lines comments after rebase Change the copyright from "JetBrains s.r.o." to "JetBrains s.r.o. and Kotlin Project contributors" Original commit: deb416484c5128a6f4bc76c39a3d9878b38cec8c --- .../org/jetbrains/kotlin/config/KotlinResourceRootType.kt.183 | 4 ++-- .../org/jetbrains/kotlin/config/KotlinSourceRootType.kt.183 | 4 ++-- .../kotlin/jps/build/AbstractIncrementalJvmJpsTest.kt | 4 ++-- .../kotlin/jps/build/IncrementalJvmJpsTestGenerated.java | 4 ++-- .../org/jetbrains/kotlin/jps/build/JpsFileToPathConverter.kt | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.183 b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.183 index 1ebd0ae647e..1a67d5e8766 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.183 +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.183 @@ -1,6 +1,6 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. + * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.config diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.183 b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.183 index f517867f2c3..2636a916213 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.183 +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.183 @@ -1,6 +1,6 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. + * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.config diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJvmJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJvmJpsTest.kt index 6681dcaf615..e6ba8b3195f 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJvmJpsTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJvmJpsTest.kt @@ -1,6 +1,6 @@ /* - * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.jps.build diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java index e3c7a2b19cb..0ca6c312067 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java @@ -1,6 +1,6 @@ /* - * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.jps.build; diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsFileToPathConverter.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsFileToPathConverter.kt index 27bebc0467c..c8fe4555df7 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsFileToPathConverter.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsFileToPathConverter.kt @@ -1,6 +1,6 @@ /* - * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.jps.build