Most PRs merged and all conflicts fixed

common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages.properties

@@ -109,3 +109,5 @@ ReloadMojo.reloadingApp = Reloading application at {0}
 #
 
 tomcatHttpStatusError = Tomcat return http status error: {0}, Reason Phrase: {1}
+tomcatHttpDeployBodyError = FAIL
+tomcatHttpBodyError = Tomcat return http body error: {0}

common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages_fr.properties

@@ -106,4 +106,6 @@ UndeployMojo.undeployError = N'a pas pu retirer l'application : {0}
 
 ReloadMojo.reloadingApp = Rechargement de l'application sur {0}
 
-tomcatHttpStatusError = Tomcat a retourn\u00E9 un code HTTP en erreur: {0}, raison: {1}
+tomcatHttpStatusError = Tomcat a retourn\u00E9 un code HTTP en erreur : {0}, raison : {1}
+tomcatHttpDeployBodyError = ECHEC
+tomcatHttpBodyError = Tomcat a retourn\u00E9 un corps HTTP en erreur : {0}

common-tomcat-maven-plugin/src/test/java/org/apache/tomcat/maven/common/TomcatManagerTest.java

@@ -35,6 +35,7 @@
 import java.io.IOException;
 import java.io.StringWriter;
 import java.net.URL;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -220,7 +221,7 @@ protected void doPut( HttpServletRequest req, HttpServletResponse resp )
             throws ServletException, IOException
         {
             System.out.println( "put ok:" + req.getRequestURI() );
-            File file = File.createTempFile( "tomcat-unit-test", "tmp" );
+            File file = Files.createTempFile( "tomcat-unit-test", "tmp" ).toFile();
             uploadedResources.add( new UploadedResource( req.getRequestURI(), file ) );
             IOUtils.copy( req.getInputStream(), new FileOutputStream( file ) );
         }
@@ -242,7 +243,7 @@ protected void doPut( HttpServletRequest req, HttpServletResponse resp )
             System.out.println( "RedirectServlet put ok:" + req.getRequestURI() );
             if ( req.getRequestURI().contains( "redirectrelative" ) )
             {
-                File file = File.createTempFile( "tomcat-unit-test", "tmp" );
+                File file = Files.createTempFile( "tomcat-unit-test", "tmp" ).toFile();
                 uploadedResources.add( new UploadedResource( req.getRequestURI(), file ) );
                 IOUtils.copy( req.getInputStream(), new FileOutputStream( file ) );
                 return;