diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsSanityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsSanityTest.java
index 4b1cf4ef6ee..ca4034f2930 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsSanityTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsSanityTest.java
@@ -118,6 +118,7 @@ public class JdkAnnotationsSanityTest extends KotlinTestWithEnvironment {
for (FqName classFqName : getAffectedClasses(ideaAnnotationsRoot)) {
if (new FqName("org.jdom").equals(classFqName.parent())) continue; // filter unrelated jdom annotations
+ if (new FqName("java.util.concurrent.TransferQueue").equals(classFqName)) continue; // filter JDK7-specific class
PsiClass psiClass = javaPsiFacade.findClass(classFqName.getFqName(), allScope);
assertNotNull("Class has annotation, but it is not found: " + classFqName, psiClass);
diff --git a/jdk-annotations/java/util/annotations.xml b/jdk-annotations/java/util/annotations.xml
index b9ee30bfec8..49ffd919f5c 100644
--- a/jdk-annotations/java/util/annotations.xml
+++ b/jdk-annotations/java/util/annotations.xml
@@ -938,11 +938,21 @@
-
+ -
+
+
+
+
-
-
+
+
+
-
@@ -952,12 +962,20 @@
-
+
+
+
-
-
+
+
+
-
@@ -967,6 +985,10 @@
-
+
+
+
-
@@ -1181,6 +1203,170 @@
-
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
-
diff --git a/jdk-annotations/java/util/concurrent/annotations.xml b/jdk-annotations/java/util/concurrent/annotations.xml
index 8e4dfbe27cf..1c3df413c31 100644
--- a/jdk-annotations/java/util/concurrent/annotations.xml
+++ b/jdk-annotations/java/util/concurrent/annotations.xml
@@ -150,4 +150,232 @@
-
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
\ No newline at end of file
diff --git a/jdk-annotations/java/util/concurrent/locks/annotations.xml b/jdk-annotations/java/util/concurrent/locks/annotations.xml
index c8951f5d66d..7bb24a67486 100644
--- a/jdk-annotations/java/util/concurrent/locks/annotations.xml
+++ b/jdk-annotations/java/util/concurrent/locks/annotations.xml
@@ -1,29 +1,45 @@
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
\ No newline at end of file