From 1f87c90e5748f0fc76654ad4919e5edfba3cb702 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Mon, 16 Apr 2018 11:33:37 +0300
Subject: [PATCH] maven tests: correct pom.xml for aggregator project

To avoid "Packaging 'jar' is invalid. Aggregator projects require 'pom' as packaging" error on importing.
---
 .../idea/maven/importing/StructureImportingTest.java       | 3 ++-
 .../maven/project/importing/MavenProjectsManagerTest.java  | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/StructureImportingTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/StructureImportingTest.java
index e64421a1f57e..0bc6b534f340 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/StructureImportingTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/StructureImportingTest.java
@@ -217,7 +217,8 @@ public class StructureImportingTest extends MavenImportingTestCase {
 
     createModulePom("../parent", "<groupId>test</groupId>" +
                                  "<artifactId>parent</artifactId>" +
-                                 "<version>1</version>");
+                                 "<version>1</version>" +
+                                 "<packaging>pom</packaging>");
 
     importProject();
     assertModules("project");
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/importing/MavenProjectsManagerTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/importing/MavenProjectsManagerTest.java
index 85c06fc6850b..0277ee8587aa 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/importing/MavenProjectsManagerTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/importing/MavenProjectsManagerTest.java
@@ -62,6 +62,7 @@ public class MavenProjectsManagerTest extends MavenImportingTestCase {
     importProject("<groupId>test</groupId>" +
                   "<artifactId>parent</artifactId>" +
                   "<version>1</version>" +
+                  "<packaging>pom</packaging>" +
 
                   "<modules>" +
                   "  <module>m</module>" +
@@ -191,6 +192,7 @@ public class MavenProjectsManagerTest extends MavenImportingTestCase {
     importProject("<groupId>test</groupId>" +
                   "<artifactId>parent</artifactId>" +
                   "<version>1</version>" +
+                  "<packaging>pom</packaging>" +
 
                   "<modules>" +
                   "  <module>m</module>" +
@@ -281,6 +283,7 @@ public class MavenProjectsManagerTest extends MavenImportingTestCase {
     importProject("<groupId>test</groupId>" +
                   "<artifactId>parent</artifactId>" +
                   "<version>1</version>" +
+                  "<packaging>pom</packaging>" +
 
                   "<modules>" +
                   "  <module>m</module>" +
@@ -303,7 +306,9 @@ public class MavenProjectsManagerTest extends MavenImportingTestCase {
 
     createProjectPom("<groupId>test</groupId>" +
                      "<artifactId>parent</artifactId>" +
-                     "<version>1</version>");
+                     "<version>1</version>" +
+                     "<packaging>pom</packaging>" +
+                     "");
     waitForReadingCompletion();
 
     assertEquals(2, myProjectsTree.getRootProjects().size());