Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update resource of the generated effective pom #10635

Merged
merged 1 commit into from
Aug 2, 2018
+13 −43
Merged

Update resource of the generated effective pom #10635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...n/java/org/eclipse/che/plugin/java/languageserver/JavaLanguageServerExtensionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 0 additions & 2 deletions ...src/test/java/org/eclipse/che/selenium/mavenplugin/CheckGeneratingMavenArchetypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,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;
Expand Down Expand Up @@ -69,7 +68,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");
Expand Down
2 changes: 1 addition & 1 deletion ...ium-test/src/test/java/org/eclipse/che/selenium/mavenplugin/GenerateEffectivePomTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down
17 changes: 4 additions & 13 deletions ...nium/che-selenium-test/src/test/resources/org/eclipse/che/selenium/mavenplugin/jar-module
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
14 changes: 2 additions & 12 deletions selenium/che-selenium-test/src/test/resources/org/eclipse/che/selenium/mavenplugin/main
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
19 changes: 5 additions & 14 deletions ...nium/che-selenium-test/src/test/resources/org/eclipse/che/selenium/mavenplugin/war-module
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -26,4 +17,4 @@
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency>
</dependency>