Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update list of maintainers in pom.xml files

Change-Id: I7626d8934e3f4cfd8fc027ba80c051e8ac8de567

5 files changed, 20 insertions, 83 deletions

diff --git a/tools/maven/gerrit-acceptance-framework_pom.xml b/tools/maven/gerrit-acceptance-framework_pom.xml
index ef427b699f..0b0326f3c2 100644
--- a/tools/maven/gerrit-acceptance-framework_pom.xml
+++ b/tools/maven/gerrit-acceptance-framework_pom.xml
@@ -26,10 +26,7 @@
       <name>Alice Kober-Sotzek</name>
     </developer>
     <developer>
-      <name>Andrew Bonventre</name>
-    </developer>
-    <developer>
-      <name>Becky Siegel</name>
+      <name>Ben Rohlfs</name>
     </developer>
     <developer>
       <name>Dave Borowitz</name>
@@ -50,12 +47,6 @@
       <name>Hugo Arès</name>
     </developer>
     <developer>
-      <name>Kasper Nilsson</name>
-    </developer>
-    <developer>
-      <name>Logan Hanks</name>
-    </developer>
-    <developer>
       <name>Luca Milanesio</name>
     </developer>
     <developer>
@@ -65,16 +56,13 @@
       <name>Martin Fick</name>
     </developer>
     <developer>
-      <name>Saša Živkov</name>
+      <name>Ole Rehmsen</name>
     </developer>
     <developer>
-      <name>Shawn Pearce</name>
+      <name>Patrick Hiesel</name>
     </developer>
     <developer>
-      <name>Viktar Donich</name>
-    </developer>
-    <developer>
-      <name>Wyatt Allen</name>
+      <name>Saša Živkov</name>
     </developer>
   </developers>
 
diff --git a/tools/maven/gerrit-extension-api_pom.xml b/tools/maven/gerrit-extension-api_pom.xml
index 00c1e22884..457c983670 100644
--- a/tools/maven/gerrit-extension-api_pom.xml
+++ b/tools/maven/gerrit-extension-api_pom.xml
@@ -26,10 +26,7 @@
       <name>Alice Kober-Sotzek</name>
     </developer>
     <developer>
-      <name>Andrew Bonventre</name>
-    </developer>
-    <developer>
-      <name>Becky Siegel</name>
+      <name>Ben Rohlfs</name>
     </developer>
     <developer>
       <name>Dave Borowitz</name>
@@ -50,12 +47,6 @@
       <name>Hugo Arès</name>
     </developer>
     <developer>
-      <name>Kasper Nilsson</name>
-    </developer>
-    <developer>
-      <name>Logan Hanks</name>
-    </developer>
-    <developer>
       <name>Luca Milanesio</name>
     </developer>
     <developer>
@@ -65,19 +56,13 @@
       <name>Martin Fick</name>
     </developer>
     <developer>
-      <name>Patrick Hiesel</name>
-    </developer>
-    <developer>
-      <name>Saša Živkov</name>
+      <name>Ole Rehmsen</name>
     </developer>
     <developer>
-      <name>Shawn Pearce</name>
-    </developer>
-    <developer>
-      <name>Viktar Donich</name>
+      <name>Patrick Hiesel</name>
     </developer>
     <developer>
-      <name>Wyatt Allen</name>
+      <name>Saša Živkov</name>
     </developer>
   </developers>
 
diff --git a/tools/maven/gerrit-plugin-api_pom.xml b/tools/maven/gerrit-plugin-api_pom.xml
index ad9b32a6f5..4beae42f49 100644
--- a/tools/maven/gerrit-plugin-api_pom.xml
+++ b/tools/maven/gerrit-plugin-api_pom.xml
@@ -26,10 +26,7 @@
       <name>Alice Kober-Sotzek</name>
     </developer>
     <developer>
-      <name>Andrew Bonventre</name>
-    </developer>
-    <developer>
-      <name>Becky Siegel</name>
+      <name>Ben Rohlfs</name>
     </developer>
     <developer>
       <name>Dave Borowitz</name>
@@ -50,12 +47,6 @@
       <name>Hugo Arès</name>
     </developer>
     <developer>
-      <name>Kasper Nilsson</name>
-    </developer>
-    <developer>
-      <name>Logan Hanks</name>
-    </developer>
-    <developer>
       <name>Luca Milanesio</name>
     </developer>
     <developer>
@@ -65,16 +56,13 @@
       <name>Martin Fick</name>
     </developer>
     <developer>
-      <name>Saša Živkov</name>
+      <name>Ole Rehmsen</name>
     </developer>
     <developer>
-      <name>Shawn Pearce</name>
+      <name>Patrick Hiesel</name>
     </developer>
     <developer>
-      <name>Viktar Donich</name>
-    </developer>
-    <developer>
-      <name>Wyatt Allen</name>
+      <name>Saša Živkov</name>
     </developer>
   </developers>
 
diff --git a/tools/maven/gerrit-plugin-gwtui_pom.xml b/tools/maven/gerrit-plugin-gwtui_pom.xml
index 1da9324eed..3f190ebd88 100644
--- a/tools/maven/gerrit-plugin-gwtui_pom.xml
+++ b/tools/maven/gerrit-plugin-gwtui_pom.xml
@@ -26,10 +26,7 @@
       <name>Alice Kober-Sotzek</name>
     </developer>
     <developer>
-      <name>Andrew Bonventre</name>
-    </developer>
-    <developer>
-      <name>Becky Siegel</name>
+      <name>Ben Rohlfs</name>
     </developer>
     <developer>
       <name>Dave Borowitz</name>
@@ -50,12 +47,6 @@
       <name>Hugo Arès</name>
     </developer>
     <developer>
-      <name>Kasper Nilsson</name>
-    </developer>
-    <developer>
-      <name>Logan Hanks</name>
-    </developer>
-    <developer>
       <name>Luca Milanesio</name>
     </developer>
     <developer>
@@ -65,16 +56,13 @@
       <name>Martin Fick</name>
     </developer>
     <developer>
-      <name>Saša Živkov</name>
+      <name>Ole Rehmsen</name>
     </developer>
     <developer>
-      <name>Shawn Pearce</name>
+      <name>Patrick Hiesel</name>
     </developer>
     <developer>
-      <name>Viktar Donich</name>
-    </developer>
-    <developer>
-      <name>Wyatt Allen</name>
+      <name>Saša Živkov</name>
     </developer>
   </developers>
 
diff --git a/tools/maven/gerrit-war_pom.xml b/tools/maven/gerrit-war_pom.xml
index 60db010cc4..09a0255a74 100644
--- a/tools/maven/gerrit-war_pom.xml
+++ b/tools/maven/gerrit-war_pom.xml
@@ -26,10 +26,7 @@
       <name>Alice Kober-Sotzek</name>
     </developer>
     <developer>
-      <name>Andrew Bonventre</name>
-    </developer>
-    <developer>
-      <name>Becky Siegel</name>
+      <name>Ben Rohlfs</name>
     </developer>
     <developer>
       <name>Dave Borowitz</name>
@@ -50,12 +47,6 @@
       <name>Hugo Arès</name>
     </developer>
     <developer>
-      <name>Kasper Nilsson</name>
-    </developer>
-    <developer>
-      <name>Logan Hanks</name>
-    </developer>
-    <developer>
       <name>Luca Milanesio</name>
     </developer>
     <developer>
@@ -65,16 +56,13 @@
       <name>Martin Fick</name>
     </developer>
     <developer>
-      <name>Saša Živkov</name>
+      <name>Ole Rehmsen</name>
     </developer>
     <developer>
-      <name>Shawn Pearce</name>
+      <name>Patrick Hiesel</name>
     </developer>
     <developer>
-      <name>Viktar Donich</name>
-    </developer>
-    <developer>
-      <name>Wyatt Allen</name>
+      <name>Saša Živkov</name>
     </developer>
   </developers>