Merge branch '2.17' into issue-FasterXML#93

Shounaks · Feb 21, 2024 · 33ce437 · 33ce437
2 parents 2ea10d9 + e352cac
commit 33ce437
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 46 deletions.
diff --git a/jr-annotation-support/pom.xml b/jr-annotation-support/pom.xml
@@ -66,16 +66,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
-          <excludes>
-            <exclude>**/failing/*.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
       <!-- 11-Mar-2019, tatu: Add basic JDK8-includable module-info, generated by Moditect -->
       <plugin>
         <groupId>org.moditect</groupId>

diff --git a/jr-extension-javatime/pom.xml b/jr-extension-javatime/pom.xml
@@ -45,16 +45,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
-                    <excludes>
-                        <exclude>**/failing/*.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
             <!-- 11-Mar-2019, tatu: Add basic JDK8-includable module-info, generated by Moditect -->
             <plugin>
                 <groupId>org.moditect</groupId>

diff --git a/jr-retrofit2/pom.xml b/jr-retrofit2/pom.xml
@@ -59,16 +59,6 @@ ${project.groupId}.retrofit2;version=${project.version}
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
-          <excludes>
-            <exclude>**/failing/*.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
       <!-- 11-Mar-2019, tatu: Add basic JDK8-includable module-info, generated by Moditect -->
       <plugin>
         <groupId>org.moditect</groupId>

diff --git a/jr-stree/pom.xml b/jr-stree/pom.xml
@@ -61,22 +61,6 @@ has no other dependencies.
         <!-- Inherited from oss-base. Generate PackageVersion.java.-->
         <groupId>com.google.code.maven-replacer-plugin</groupId>
         <artifactId>replacer</artifactId>
-        <executions>
-          <execution>
-            <id>process-packageVersion</id>
-            <phase>generate-sources</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
-          <excludes>
-            <exclude>**/failing/*.java</exclude>
-          </excludes>
-        </configuration>
       </plugin>
       <!-- 11-Mar-2019, tatu: Add basic JDK8-includable module-info, generated by Moditect -->
       <plugin>

diff --git a/pom.xml b/pom.xml
@@ -66,6 +66,15 @@
   <build>
     <plugins>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>com/fasterxml/jackson/**/failing/*.java</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>