From 21b7e2bf82abfd494f6c84e5ee3a1d4f9a8ee6e9 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Fri, 11 Feb 2022 18:45:46 +0100
Subject: [PATCH] [SUREFIRE-2008] Upgrade animal-sniffer-maven-plugin to 1.21

---
 pom.xml                                                     | 6 ++++--
 .../surefire/api/stream/AbstractStreamDecoderTest.java      | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 579d550154..6e86c8cc19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -452,11 +452,10 @@
             <proc>none</proc>
           </configuration>
         </plugin>
-        <!-- NOTE: animal sniffer does not check test classes: https://jira.codehaus.org/browse/MANIMALSNIFFER-40 -->
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>animal-sniffer-maven-plugin</artifactId>
-          <version>1.17</version>
+          <version>1.21</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
@@ -632,10 +631,13 @@
         <executions>
           <execution>
             <id>signature-check</id>
+            <!-- we use offline jacoco instrumentation so check must be done after restoring original classes -->
+            <phase>verify</phase>
             <goals>
               <goal>check</goal>
             </goals>
             <configuration>
+              <checkTestClasses>true</checkTestClasses>
               <signature>
                 <groupId>org.codehaus.mojo.signature</groupId>
                 <artifactId>java18</artifactId>
diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoderTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoderTest.java
index 4c54df3731..2dd9c72722 100644
--- a/surefire-api/src/test/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoderTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoderTest.java
@@ -318,7 +318,7 @@ public void shouldReadMultipleStringsAndShiftedInput() throws Exception
 
         Memento memento = thread.new Memento();
         // whatever position will be compacted to 0
-        ( (Buffer) ( (Buffer) memento.getByteBuffer().limit( 974 ) ) ).position( 974 );
+        ( (Buffer) memento.getByteBuffer() ).limit( 974 ).position( 974 );
 
         StringBuilder expected = new StringBuilder( "789" );
         for ( int i = 0; i < 11; i++ )