From 832a99b6e1533033421a23529531c99183dc7bc0 Mon Sep 17 00:00:00 2001
From: Nicolas Glayre <nicolas.glayre@nespresso.com>
Date: Mon, 21 Dec 2015 13:26:07 +0100
Subject: [PATCH] Removing perModuleEmail paramater management

In the maven-plugin, its usage is deprecated since version
2.0.1 and later (back in october 2013), causing errors on
/administrativeMonitor/OldData/manage webpage.
Before deprecation, default value was already true. To support
the plugin before it was deprecated the best would be to have
it parametrizable

Change-Id: Ic049e961983e9d5b25c5a2b0d32be5b3f717e923
---
 jenkins_jobs/modules/project_maven.py       | 1 -
 tests/general/fixtures/project-maven001.xml | 1 -
 tests/general/fixtures/project-maven002.xml | 1 -
 tests/general/fixtures/project-maven003.xml | 1 -
 tests/general/fixtures/project-maven004.xml | 1 -
 5 files changed, 5 deletions(-)

diff --git a/jenkins_jobs/modules/project_maven.py b/jenkins_jobs/modules/project_maven.py
index f2bd3315b..599589552 100755
--- a/jenkins_jobs/modules/project_maven.py
+++ b/jenkins_jobs/modules/project_maven.py
@@ -144,7 +144,6 @@ class Maven(jenkins_jobs.modules.base.Base):
             not data['maven'].get('automatic-site-archiving', True)).lower()
         XML.SubElement(xml_parent, 'fingerprintingDisabled').text = str(
             not data['maven'].get('automatic-fingerprinting', True)).lower()
-        XML.SubElement(xml_parent, 'perModuleEmail').text = 'true'
         XML.SubElement(xml_parent, 'archivingDisabled').text = str(
             not data['maven'].get('automatic-archiving', True)).lower()
         XML.SubElement(xml_parent, 'resolveDependencies').text = str(
diff --git a/tests/general/fixtures/project-maven001.xml b/tests/general/fixtures/project-maven001.xml
index db8eba827..06d41ce71 100644
--- a/tests/general/fixtures/project-maven001.xml
+++ b/tests/general/fixtures/project-maven001.xml
@@ -11,7 +11,6 @@
   <incrementalBuild>true</incrementalBuild>
   <siteArchivingDisabled>true</siteArchivingDisabled>
   <fingerprintingDisabled>false</fingerprintingDisabled>
-  <perModuleEmail>true</perModuleEmail>
   <archivingDisabled>true</archivingDisabled>
   <resolveDependencies>true</resolveDependencies>
   <processPlugins>true</processPlugins>
diff --git a/tests/general/fixtures/project-maven002.xml b/tests/general/fixtures/project-maven002.xml
index d2283c546..2ea65b09f 100644
--- a/tests/general/fixtures/project-maven002.xml
+++ b/tests/general/fixtures/project-maven002.xml
@@ -8,7 +8,6 @@
   <incrementalBuild>false</incrementalBuild>
   <siteArchivingDisabled>false</siteArchivingDisabled>
   <fingerprintingDisabled>false</fingerprintingDisabled>
-  <perModuleEmail>true</perModuleEmail>
   <archivingDisabled>false</archivingDisabled>
   <resolveDependencies>false</resolveDependencies>
   <processPlugins>false</processPlugins>
diff --git a/tests/general/fixtures/project-maven003.xml b/tests/general/fixtures/project-maven003.xml
index a72e5e982..b52b5e0fc 100644
--- a/tests/general/fixtures/project-maven003.xml
+++ b/tests/general/fixtures/project-maven003.xml
@@ -7,7 +7,6 @@
   <incrementalBuild>false</incrementalBuild>
   <siteArchivingDisabled>false</siteArchivingDisabled>
   <fingerprintingDisabled>false</fingerprintingDisabled>
-  <perModuleEmail>true</perModuleEmail>
   <archivingDisabled>false</archivingDisabled>
   <resolveDependencies>false</resolveDependencies>
   <processPlugins>false</processPlugins>
diff --git a/tests/general/fixtures/project-maven004.xml b/tests/general/fixtures/project-maven004.xml
index 0136006fc..1faa8421a 100644
--- a/tests/general/fixtures/project-maven004.xml
+++ b/tests/general/fixtures/project-maven004.xml
@@ -7,7 +7,6 @@
   <incrementalBuild>false</incrementalBuild>
   <siteArchivingDisabled>false</siteArchivingDisabled>
   <fingerprintingDisabled>false</fingerprintingDisabled>
-  <perModuleEmail>true</perModuleEmail>
   <archivingDisabled>false</archivingDisabled>
   <resolveDependencies>false</resolveDependencies>
   <processPlugins>false</processPlugins>