Update generated effective pom (#10635)

Signed-off-by: Valeriy Svydenko <[email protected]>
eclipse-che · Oct 5, 2018 · 0d5242c · 0d5242c
1 parent 6064cc0
commit 0d5242c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 43 deletions.
diff --git a/...n/java/org/eclipse/che/plugin/java/languageserver/JavaLanguageServerExtensionService.java b/...n/java/org/eclipse/che/plugin/java/languageserver/JavaLanguageServerExtensionService.java
@@ -660,7 +660,7 @@ public List<String> reImportMavenProjects(ReImportMavenProjectsCommandParameters
 
   private void reComputeDiagnostics(String pomPath) {
     String pomUri = prefixURI(pomPath);
-    executeCommand(RECOMPUTE_POM_DIAGNOSTICS, singletonList(pomUri));
+    executeCommand(Commands.RECOMPUTE_POM_DIAGNOSTICS, singletonList(pomUri));
   }
 
   private List<Jar> getProjectExternalLibraries(ExternalLibrariesParameters params) {

diff --git a/...src/test/java/org/eclipse/che/selenium/mavenplugin/CheckGeneratingMavenArchetypeTest.java b/...src/test/java/org/eclipse/che/selenium/mavenplugin/CheckGeneratingMavenArchetypeTest.java
@@ -14,7 +14,6 @@
 import java.util.stream.Stream;
 import javax.inject.Inject;
 import org.eclipse.che.commons.lang.NameGenerator;
-import org.eclipse.che.selenium.core.constant.TestBuildConstants;
 import org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants;
 import org.eclipse.che.selenium.core.workspace.TestWorkspace;
 import org.eclipse.che.selenium.pageobject.CodenvyEditor;
@@ -74,7 +73,6 @@ public void createMavenArchetypeStartProjectByWizard() throws Exception {
     projectWizard.clickCreateButton();
     projectExplorer.waitItem(PROJECT_NAME);
     consoles.waitJDTLSProjectResolveFinishedMessage(PROJECT_NAME);
-    console.waitExpectedTextIntoConsole(TestBuildConstants.BUILD_SUCCESS);
     projectExplorer.quickExpandWithJavaScript();
     expectedItems.forEach(projectExplorer::waitItem);
     projectExplorer.openItemByPath(PROJECT_NAME + "/pom.xml");

diff --git a/...ium-test/src/test/java/org/eclipse/che/selenium/mavenplugin/GenerateEffectivePomTest.java b/...ium-test/src/test/java/org/eclipse/che/selenium/mavenplugin/GenerateEffectivePomTest.java
@@ -88,7 +88,7 @@ public void generateEffectivePomTest() throws Exception {
     editor.closeAllTabsByContextMenu();
     Assert.assertTrue(
         checkCurrentEffectivePom(
-            WAR_MODULE_PATH, expectedWarEffectivePom, "qa-multimodule [effective pom]"),
+            WAR_MODULE_PATH, expectedWarEffectivePom, "my-webapp [effective pom]"),
         "Check Effective Pom for war maven module");
   }
 

diff --git a/...nium/che-selenium-test/src/test/resources/org/eclipse/che/selenium/mavenplugin/jar-module b/...nium/che-selenium-test/src/test/resources/org/eclipse/che/selenium/mavenplugin/jar-module
@@ -1,15 +1,6 @@
-<!-- See: http://maven.apache.org/plugins/maven-help-plugin/                -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Effective POM for project                                              -->
-<!-- 'org.eclipse.che.examples:my-lib:jar:1.0-SNAPSHOT'                     -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.che.examples</groupId>
@@ -21,9 +12,9 @@
   <version>1.0-SNAPSHOT</version>
   <name>sample-lib</name>
   <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.6</maven.compiler.source>
     <maven.compiler.target>1.6</maven.compiler.target>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <dependencies>
     <dependency>
diff --git a/selenium/che-selenium-test/src/test/resources/org/eclipse/che/selenium/mavenplugin/main b/selenium/che-selenium-test/src/test/resources/org/eclipse/che/selenium/mavenplugin/main
@@ -1,15 +1,5 @@
-<!-- See: http://maven.apache.org/plugins/maven-help-plugin/                -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Effective POM for project                                              -->
-<!-- 'org.eclipse.che.examples:qa-multimodule:pom:1.0-SNAPSHOT'             -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.che.examples</groupId>
   <artifactId>qa-multimodule</artifactId>

diff --git a/...nium/che-selenium-test/src/test/resources/org/eclipse/che/selenium/mavenplugin/war-module b/...nium/che-selenium-test/src/test/resources/org/eclipse/che/selenium/mavenplugin/war-module
@@ -1,18 +1,9 @@
-<!-- See: http://maven.apache.org/plugins/maven-help-plugin/                -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Effective POM for project                                              -->
-<!-- 'org.eclipse.che.examples:qa-multimodule:war:1.0-SNAPSHOT'             -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.che.examples</groupId>
-  <artifactId>qa-multimodule</artifactId>
+  <artifactId>my-webapp</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>qa-spring-sample</name>
@@ -26,4 +17,4 @@
       <artifactId>servlet-api</artifactId>
       <version>2.5</version>
       <scope>provided</scope>
-    </dependency>
+    </dependency>