Manual pom.xml merge

Author: cowtowncoder

pom.xml

@@ -193,21 +193,6 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
         <groupId>com.google.code.maven-replacer-plugin</groupId>
         <artifactId>replacer</artifactId>
       </plugin>
-      <!--  Need to skip known-failing tests for build... -->
-      <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>${version.plugin.surefire}</version>
-          <configuration>
-            <excludes>
-              <exclude>**/failing/**/*.java</exclude>
-            </excludes>
-            <includes>
-              <include>**/Test*.java</include>
-              <include>**/*Test.java</include>
-            </includes>
-          </configuration>
-        </plugin>
       <!-- 05-Jul-2020, tatu: Add gradle module metadata -->
       <plugin>
         <groupId>de.jjohannes</groupId>