From 520bcb96cbc2e545d9fc5d52f00d69c6fbda63ca Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 26 Feb 2018 10:15:47 -0500
Subject: [PATCH] =?UTF-8?q?Choose=20more=20mnemonic=20artifactId=E2=80=99s?=
 =?UTF-8?q?=20for=20modules=20not=20consumed=20externally.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cli/pom.xml  | 2 +-
 core/pom.xml | 2 +-
 pom.xml      | 3 ++-
 test/pom.xml | 4 ++--
 war/pom.xml  | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cli/pom.xml b/cli/pom.xml
index 006f183ac1..1c492221be 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -4,7 +4,7 @@
 
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
-    <artifactId>pom</artifactId>
+    <artifactId>jenkins-parent</artifactId>
     <version>2.110-SNAPSHOT</version>
   </parent>
 
diff --git a/core/pom.xml b/core/pom.xml
index 6f03e81ca2..b9ed1f99e7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
 
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
-    <artifactId>pom</artifactId>
+    <artifactId>jenkins-parent</artifactId>
     <version>2.110-SNAPSHOT</version>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 5915c55d00..e4f3707dca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,10 +29,11 @@ THE SOFTWARE.
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
     <version>1.39</version>
+    <relativePath />
   </parent>
 
   <groupId>org.jenkins-ci.main</groupId>
-  <artifactId>pom</artifactId>
+  <artifactId>jenkins-parent</artifactId>
   <version>2.110-SNAPSHOT</version>
   <packaging>pom</packaging>
 
diff --git a/test/pom.xml b/test/pom.xml
index 9d17a1f4e1..376dc24db3 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -27,11 +27,11 @@ THE SOFTWARE.
 
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
-    <artifactId>pom</artifactId>
+    <artifactId>jenkins-parent</artifactId>
     <version>2.110-SNAPSHOT</version>
   </parent>
 
-  <artifactId>test</artifactId>
+  <artifactId>jenkins-test</artifactId>
 
   <name>Tests for Jenkins core</name>
   <description>Functional tests for Jenkins core</description>
diff --git a/war/pom.xml b/war/pom.xml
index 0bad2fee7d..afe79caf96 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
 
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
-    <artifactId>pom</artifactId>
+    <artifactId>jenkins-parent</artifactId>
     <version>2.110-SNAPSHOT</version>
   </parent>