diff --git a/.idea/artifacts/InjectorGenerator.xml b/.idea/artifacts/InjectorGenerator.xml
index bdf1aa759bf..954880694b4 100644
--- a/.idea/artifacts/InjectorGenerator.xml
+++ b/.idea/artifacts/InjectorGenerator.xml
@@ -3,6 +3,7 @@
     <output-path>$PROJECT_DIR$/out/artifacts/InjectorGenerator</output-path>
     <root id="archive" name="injector-generator.jar">
       <element id="module-output" name="injector-generator" />
+      <element id="dir-copy" path="$PROJECT_DIR$/injector-generator" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 148f1c6e14c..6149fd3a870 100644
--- a/build.xml
+++ b/build.xml
@@ -447,6 +447,10 @@
                         public protected *;
                     }
 
+                    -keep class javax.inject.** {
+                        public protected *;
+                    }
+
                     -keep class org.jetbrains.k2js.** {
                         public protected *;
                     }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java
index 81e8e9e0e51..4b786de2482 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java
@@ -43,7 +43,7 @@ import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
 /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */
-@SuppressWarnings("ALL")
+@SuppressWarnings("all")
 public class InjectorForJavaDescriptorResolver {
     
     private final Project project;
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java
index ca5e6806cdb..9210af7f15b 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java
@@ -66,7 +66,7 @@ import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
 /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */
-@SuppressWarnings("ALL")
+@SuppressWarnings("all")
 public class InjectorForLazyResolveWithJava {
     
     private final Project project;
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
index a6c5ecca7e5..5283f31accf 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
@@ -76,7 +76,7 @@ import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
 /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */
-@SuppressWarnings("ALL")
+@SuppressWarnings("all")
 public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnalyzer {
     
     private final Project project;
diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java
index caa424c7acf..e8fe434058e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java
+++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java
@@ -48,7 +48,7 @@ import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
 /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */
-@SuppressWarnings("ALL")
+@SuppressWarnings("all")
 public class InjectorForBodyResolve {
     
     private final Project project;
diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java
index 573e6504b50..01d442d9259 100644
--- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java
+++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java
@@ -48,7 +48,7 @@ import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
 /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */
-@SuppressWarnings("ALL")
+@SuppressWarnings("all")
 public class InjectorForLazyResolve {
     
     private final Project project;
diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java
index d05e83c250d..644dfd6e9c3 100644
--- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java
+++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java
@@ -42,7 +42,7 @@ import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
 /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */
-@SuppressWarnings("ALL")
+@SuppressWarnings("all")
 public class InjectorForMacros {
     
     private final Project project;
diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
index 116af37b823..023cfb1d74d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
+++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
@@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
 /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */
-@SuppressWarnings("ALL")
+@SuppressWarnings("all")
 public class InjectorForTopDownAnalyzerBasic {
     
     private final Project project;
diff --git a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java
index d82dcb18b14..5ba0e110090 100644
--- a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java
+++ b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java
@@ -42,7 +42,7 @@ import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
 /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */
-@SuppressWarnings("ALL")
+@SuppressWarnings("all")
 public class InjectorForTests {
     
     private final Project project;
diff --git a/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java b/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java
index e79c3014e43..198a02213f4 100644
--- a/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java
+++ b/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java
@@ -91,7 +91,7 @@ public class DependencyInjectorGenerator {
         p.println();
 
         p.println("/* This file is generated by " + generatedBy + ". DO NOT EDIT! */");
-        p.println("@SuppressWarnings(\"ALL\")");
+        p.println("@SuppressWarnings(\"all\")");
         p.print("public class " + injectorClassName);
         generateImplementsList(p);
         p.println(" {");
diff --git a/js/js.frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java b/js/js.frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
index 4a4032b92fe..6af343815d9 100644
--- a/js/js.frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
+++ b/js/js.frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
@@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
 /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */
-@SuppressWarnings("ALL")
+@SuppressWarnings("all")
 public class InjectorForTopDownAnalyzerForJs {
     
     private final Project project;