Switch from relying on the Guice-specific annotations to the JSR-330 standard annotations.
--
MOS_MIGRATED_REVID=120351013
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/BUILD
index 696fd36..149420b 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/BUILD
@@ -5,9 +5,9 @@
srcs = glob(["*.java"]),
deps = [
"//third_party:guava",
- "//third_party:guice",
"//third_party:joda_time",
"//third_party:jsr305",
+ "//third_party:jsr330_inject",
"//third_party:junit4",
],
)
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/SignalHandlers.java b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/SignalHandlers.java
index c1573d5..fb146ea 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/SignalHandlers.java
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/SignalHandlers.java
@@ -14,13 +14,13 @@
package com.google.testing.junit.runner.internal;
-import com.google.inject.Inject;
-
import sun.misc.Signal;
import sun.misc.SignalHandler;
import java.util.concurrent.atomic.AtomicReference;
+import javax.inject.Inject;
+
/**
* Helper class to install signal handlers.
*/
@@ -74,7 +74,7 @@
*/
public interface HandlerInstaller {
/**
- * @see sun.misc.Signal#handle(sun.misc.Signal, sun.misc.SignalHandler)
+ * @see sun.misc.Signal#handle(sun.misc.Signal, sun.misc.SignalHandler)
*/
SignalHandler install(Signal signal, SignalHandler handler);
}
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/Stderr.java b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/Stderr.java
index 80b37eb..d7c7db9 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/Stderr.java
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/Stderr.java
@@ -14,18 +14,18 @@
package com.google.testing.junit.runner.internal;
-import com.google.inject.BindingAnnotation;
-
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import javax.inject.Qualifier;
+
/**
* Binding annotation for a {@link java.io.PrintStream} printing to stderr.
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.PARAMETER, ElementType.METHOD})
-@BindingAnnotation
+@Qualifier
public @interface Stderr {
}
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/Stdout.java b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/Stdout.java
index 051968b..3f8174d 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/Stdout.java
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/Stdout.java
@@ -14,18 +14,18 @@
package com.google.testing.junit.runner.internal;
-import com.google.inject.BindingAnnotation;
-
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import javax.inject.Qualifier;
+
/**
* Binding annotation for a {@link java.io.PrintStream} printing to stdout.
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.PARAMETER, ElementType.METHOD})
-@BindingAnnotation
+@Qualifier
public @interface Stdout {
}
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD
index a9a1f86..0141b76 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD
@@ -25,6 +25,7 @@
"//third_party:guice",
"//third_party:joda_time",
"//third_party:jsr305",
+ "//third_party:jsr330_inject",
"//third_party:junit4",
],
)
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/TopLevelSuite.java b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/TopLevelSuite.java
index 7f9d720..13b5b08 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/TopLevelSuite.java
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/TopLevelSuite.java
@@ -14,18 +14,18 @@
package com.google.testing.junit.runner.junit4;
-import com.google.inject.BindingAnnotation;
-
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import javax.inject.Qualifier;
+
/**
* Binding annotation for an object that represents the top-level suite.
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.PARAMETER, ElementType.METHOD})
-@BindingAnnotation
+@Qualifier
@interface TopLevelSuite {
}
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/Xml.java b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/Xml.java
index d531b2b..1cff1de 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/Xml.java
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/Xml.java
@@ -14,19 +14,19 @@
package com.google.testing.junit.runner.junit4;
-import com.google.inject.BindingAnnotation;
-
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import javax.inject.Qualifier;
+
/**
* Binding annotation that indicates that the given {@code String} or stream
* represents XML.
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.PARAMETER, ElementType.METHOD})
-@BindingAnnotation
+@Qualifier
@interface Xml {
}
