diff --git a/core/src/main/java/jenkins/PluginSubtypeMarker.java b/core/src/main/java/jenkins/PluginSubtypeMarker.java
index 559df55a3c..e8cc8b3992 100644
--- a/core/src/main/java/jenkins/PluginSubtypeMarker.java
+++ b/core/src/main/java/jenkins/PluginSubtypeMarker.java
@@ -58,7 +58,6 @@ import java.util.Set;
@SupportedSourceVersion(SourceVersion.RELEASE_6)
@SupportedAnnotationTypes("*")
@MetaInfServices(Processor.class)
-// TODO: needs to pick up animal-sniffer 1.9 for this to take effect at a class (JENKINS-15426)
@IgnoreJRERequirement
@SuppressWarnings({"Since15"})
public class PluginSubtypeMarker extends AbstractProcessor {
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 1dc725a570..42f4bffda3 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -90,7 +90,7 @@
org.codehaus.mojo
animal-sniffer-annotations
- 1.7
+ 1.9
provided
true
@@ -297,7 +297,7 @@
org.codehaus.mojo
animal-sniffer-maven-plugin
- 1.7
+ 1.9
diff --git a/pom.xml b/pom.xml
index ae1d7c56f4..5be522dea7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,7 @@ THE SOFTWARE.
1.6.2
none
+ ${skipTests}
@@ -241,7 +242,7 @@ THE SOFTWARE.
org.codehaus.mojo
animal-sniffer-annotations
- 1.8
+ 1.9
provided
true
@@ -556,7 +557,7 @@ THE SOFTWARE.
org.codehaus.mojo
animal-sniffer-maven-plugin
- 1.8
+ 1.9
@@ -573,7 +574,7 @@ THE SOFTWARE.
-P release,sign
clean install
- -DskipTests javadoc:javadoc animal-sniffer:check deploy javadoc:aggregate
+ -DskipTests -Danimal.sniffer.skip=false javadoc:javadoc deploy javadoc:aggregate
false
true
jenkins-@{project.version}
@@ -598,6 +599,13 @@ THE SOFTWARE.
org.codehaus.mojo
animal-sniffer-maven-plugin
+
+
+
+ check
+
+
+
org.codehaus.mojo.signature
diff --git a/test/src/main/java/org/jvnet/hudson/test/ThreadPoolImpl.java b/test/src/main/java/org/jvnet/hudson/test/ThreadPoolImpl.java
index 4807f66363..3bbdbc5710 100644
--- a/test/src/main/java/org/jvnet/hudson/test/ThreadPoolImpl.java
+++ b/test/src/main/java/org/jvnet/hudson/test/ThreadPoolImpl.java
@@ -25,7 +25,7 @@ public class ThreadPoolImpl extends AbstractLifeCycle implements ThreadPool {
}
public void join() throws InterruptedException {
- while(!es.awaitTermination(999, TimeUnit.DAYS))
+ while(!es.awaitTermination(999 * 60 * 60 * 24, TimeUnit.SECONDS))
;
}