From b1945fe6ecc62dc245cd77ec5e2d343db2ddd893 Mon Sep 17 00:00:00 2001 From: Googler Date: Wed, 20 Apr 2016 17:31:23 +0000 Subject: Switch from relying on the Guice-specific annotations to the JSR-330 standard annotations. -- MOS_MIGRATED_REVID=120351013 --- .../junitrunner/java/com/google/testing/junit/runner/junit4/BUILD | 1 + .../java/com/google/testing/junit/runner/junit4/TopLevelSuite.java | 6 +++--- .../java/com/google/testing/junit/runner/junit4/Xml.java | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4') 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 a9a1f8632d..0141b76a3c 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 @@ java_library( "//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 7f9d720daa..13b5b083bb 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 d531b2b288..1cff1de139 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 { } -- cgit v1.2.3