Merge branch 'master' into extensionmethod

Conflicts:
	build.xml

1 files changed, 12 insertions, 0 deletions

diff --git a/test/stubs/com/fasterxml/jackson/annotation/JsonAnySetter.java b/test/stubs/com/fasterxml/jackson/annotation/JsonAnySetter.java
new file mode 100644
index 00000000..51d2c3fa
--- /dev/null
+++ b/test/stubs/com/fasterxml/jackson/annotation/JsonAnySetter.java
@@ -0,0 +1,12 @@
+package com.fasterxml.jackson.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface JsonAnySetter {
+	boolean enabled() default true;
+}