From ccf1cbbaa7ea4582b7ed6ae3e589f5b423f2f035 Mon Sep 17 00:00:00 2001
From: Alex Panchenko <alex.panchenko@gmail.com>
Date: Tue, 21 May 2019 22:34:56 +0200
Subject: [PATCH 1/3] @Target(ANNOTATION_TYPE) for ValidateWith, fixes #1611

---
 src/main/java/org/junit/validator/ValidateWith.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/junit/validator/ValidateWith.java b/src/main/java/org/junit/validator/ValidateWith.java
index 03d790670f75..3725db81f954 100644
--- a/src/main/java/org/junit/validator/ValidateWith.java
+++ b/src/main/java/org/junit/validator/ValidateWith.java
@@ -1,8 +1,10 @@
 package org.junit.validator;
 
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Allows for an {@link AnnotationValidator} to be attached to an annotation.
@@ -13,6 +15,7 @@
  * @since 4.12
  */
 @Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.ANNOTATION_TYPE)
 @Inherited
 public @interface ValidateWith {
     Class<? extends AnnotationValidator> value();

From af20d85d60b5a4ef30e4a11186a23a38c22097a5 Mon Sep 17 00:00:00 2001
From: Alex Panchenko <alex.panchenko@gmail.com>
Date: Tue, 21 May 2019 22:49:31 +0200
Subject: [PATCH 2/3] fix compilation AnnotationValidatorFactoryTest

---
 .../org/junit/validator/AnnotationValidatorFactoryTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/junit/validator/AnnotationValidatorFactoryTest.java b/src/test/java/org/junit/validator/AnnotationValidatorFactoryTest.java
index 4003ff347280..938f9c9384c8 100644
--- a/src/test/java/org/junit/validator/AnnotationValidatorFactoryTest.java
+++ b/src/test/java/org/junit/validator/AnnotationValidatorFactoryTest.java
@@ -20,7 +20,7 @@ public void createAnnotationValidator() {
     }
 
     @ValidateWith(value = Validator.class)
-    public static class SampleTestWithValidator {
+    public @interface SampleTestWithValidator {
     }
 
     public static class Validator extends AnnotationValidator {
@@ -36,7 +36,7 @@ public void exceptionWhenAnnotationValidatorCantBeCreated() {
     }
 
     @ValidateWith(value = ValidatorThatThrowsException.class)
-    public static class SampleTestWithValidatorThatThrowsException {
+    public @interface SampleTestWithValidatorThatThrowsException {
     }
 
     public static class ValidatorThatThrowsException extends AnnotationValidator {

From e2ed1d6f6e44f0068c730a045b2afa73773ddf9c Mon Sep 17 00:00:00 2001
From: Alex Panchenko <alex.panchenko@gmail.com>
Date: Thu, 23 May 2019 17:19:49 +0200
Subject: [PATCH 3/3] rename things

---
 .../junit/validator/AnnotationValidatorFactoryTest.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/junit/validator/AnnotationValidatorFactoryTest.java b/src/test/java/org/junit/validator/AnnotationValidatorFactoryTest.java
index 938f9c9384c8..6e8135d97406 100644
--- a/src/test/java/org/junit/validator/AnnotationValidatorFactoryTest.java
+++ b/src/test/java/org/junit/validator/AnnotationValidatorFactoryTest.java
@@ -14,13 +14,13 @@ public class AnnotationValidatorFactoryTest {
 
     @Test
     public void createAnnotationValidator() {
-        ValidateWith validateWith = SampleTestWithValidator.class.getAnnotation(ValidateWith.class);
+        ValidateWith validateWith = SampleAnnotationWithValidator.class.getAnnotation(ValidateWith.class);
         AnnotationValidator annotationValidator = new AnnotationValidatorFactory().createAnnotationValidator(validateWith);
         assertThat(annotationValidator, is(instanceOf(Validator.class)));
     }
 
     @ValidateWith(value = Validator.class)
-    public @interface SampleTestWithValidator {
+    public @interface SampleAnnotationWithValidator {
     }
 
     public static class Validator extends AnnotationValidator {
@@ -28,7 +28,7 @@ public static class Validator extends AnnotationValidator {
 
     @Test
     public void exceptionWhenAnnotationValidatorCantBeCreated() {
-        ValidateWith validateWith = SampleTestWithValidatorThatThrowsException.class.getAnnotation(ValidateWith.class);
+        ValidateWith validateWith = SampleAnnotationWithValidatorThatThrowsException.class.getAnnotation(ValidateWith.class);
         exception.expect(RuntimeException.class);
         exception.expectMessage("Exception received when creating AnnotationValidator class " +
                 "org.junit.validator.AnnotationValidatorFactoryTest$ValidatorThatThrowsException");
@@ -36,7 +36,7 @@ public void exceptionWhenAnnotationValidatorCantBeCreated() {
     }
 
     @ValidateWith(value = ValidatorThatThrowsException.class)
-    public @interface SampleTestWithValidatorThatThrowsException {
+    public @interface SampleAnnotationWithValidatorThatThrowsException {
     }
 
     public static class ValidatorThatThrowsException extends AnnotationValidator {