From 7a019e80fe4fa208a5e68caa109465df5101291e Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Mon, 5 Dec 2016 23:47:20 +0300
Subject: [PATCH] Exclude bundled org.jetbrains.annotations from
 kotlin-runtime. Add a dependency on org.jetbrains:annotations:13.0 instead.

---
 .../reference-public-api/kotlin-runtime.txt        | 14 --------------
 libraries/tools/runtime/pom.xml                    | 12 +++++++++++-
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-runtime.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-runtime.txt
index c1441472a76..d897578483f 100644
--- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-runtime.txt
+++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-runtime.txt
@@ -1251,17 +1251,3 @@ public final class kotlin/reflect/KVisibility : java/lang/Enum {
 	public static fun values ()[Lkotlin/reflect/KVisibility;
 }
 
-public abstract interface annotation class org/jetbrains/annotations/Mutable : java/lang/annotation/Annotation {
-}
-
-public abstract interface annotation class org/jetbrains/annotations/NotNull : java/lang/annotation/Annotation {
-	public abstract fun value ()Ljava/lang/String;
-}
-
-public abstract interface annotation class org/jetbrains/annotations/Nullable : java/lang/annotation/Annotation {
-	public abstract fun value ()Ljava/lang/String;
-}
-
-public abstract interface annotation class org/jetbrains/annotations/ReadOnly : java/lang/annotation/Annotation {
-}
-
diff --git a/libraries/tools/runtime/pom.xml b/libraries/tools/runtime/pom.xml
index fe26c11697c..3cc9a85f05a 100644
--- a/libraries/tools/runtime/pom.xml
+++ b/libraries/tools/runtime/pom.xml
@@ -15,6 +15,14 @@
     <artifactId>kotlin-runtime</artifactId>
     <packaging>jar</packaging>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>13.0</version>
+        </dependency>
+    </dependencies>
+
     <build>
         <sourceDirectory>target/copied-sources</sourceDirectory>
 
@@ -42,7 +50,9 @@
                                 <delete dir="${basedir}/target/copied-sources" failonerror="false"/>
                                 <copy todir="${basedir}/target/copied-sources">
                                     <fileset dir="${basedir}/../../../core/builtins/src"/>
-                                    <fileset dir="${basedir}/../../../core/runtime.jvm/src"/>
+                                    <fileset dir="${basedir}/../../../core/runtime.jvm/src">
+                                        <exclude name="org/jetbrains/annotations/**"/>
+                                    </fileset>
                                 </copy>
                             </target>
                         </configuration>