diff --git a/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProvider.java b/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProvider.java index 1abc9069a71..46d7c0b7e06 100644 --- a/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProvider.java +++ b/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProvider.java @@ -68,14 +68,12 @@ public List getValues(String attributeName) throws ValueStorageException return readFromPom(attributeName); } - //Temporary commented due to incorrect resolving maven project attributes from project model, instead of resolving project - //attributes from the maven server, we'll read and parse pom.xml directly by our own. -// final MavenProject mavenProject = mavenProjectManager.getMavenProject(projectFolder.getPath().toString()); -// if (mavenProject != null) { -// return getFromMavenProject(mavenProject, attributeName); -// } else { + final MavenProject mavenProject = mavenProjectManager.getMavenProject(projectFolder.getPath().toString()); + if (mavenProject != null) { + return getFromMavenProject(mavenProject, attributeName); + } else { return readFromPom(attributeName); -// } + } } catch (ServerException | ForbiddenException | IOException e) { throwReadException(e); } catch (XMLTreeException e) { diff --git a/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProviderTest.java b/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProviderTest.java index 72b30562227..4432a9a1f59 100644 --- a/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProviderTest.java +++ b/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProviderTest.java @@ -84,7 +84,7 @@ public void setUp() { } - @Test(enabled=false) + @Test public void getArtifactIdFromMavenProject() throws Exception { String artifactId = NameGenerator.generate("artifactId-", 6); when(mavenKey.getArtifactId()).thenReturn(artifactId); @@ -98,7 +98,7 @@ public void getArtifactIdFromMavenProject() throws Exception { } - @Test(enabled=false) + @Test public void getGroupIdFromMavenProject() throws Exception { String groupId = NameGenerator.generate("groupId-", 6); when(mavenKey.getGroupId()).thenReturn(groupId); @@ -112,7 +112,7 @@ public void getGroupIdFromMavenProject() throws Exception { } - @Test(enabled=false) + @Test public void getVersionFromMavenProject() throws Exception { String versionId = NameGenerator.generate("version-", 6); when(mavenKey.getVersion()).thenReturn(versionId); @@ -126,7 +126,7 @@ public void getVersionFromMavenProject() throws Exception { } - @Test(enabled=false) + @Test public void getPackagingFromMavenProject() throws Exception { when(mavenProjectManager.getMavenProject(anyString())).thenReturn(mavenProject); when(mavenProject.getPackaging()).thenReturn("war"); @@ -138,7 +138,7 @@ public void getPackagingFromMavenProject() throws Exception { Assert.assertEquals(pkgs.get(0), "war"); } - @Test(enabled=false) + @Test public void getPackagingFromMavenProjectIfNotSet() throws Exception { when(mavenProjectManager.getMavenProject(anyString())).thenReturn(mavenProject); List pkgs = mavenValueProvider.getValues(MavenAttributes.PACKAGING); @@ -150,7 +150,7 @@ public void getPackagingFromMavenProjectIfNotSet() throws Exception { } - @Test(enabled=false) + @Test public void getParentArtifactFromMavenProject() throws Exception { String parentArtifact = NameGenerator.generate("parentArtifact", 6); when(parentKey.getArtifactId()).thenReturn(parentArtifact); @@ -164,7 +164,7 @@ public void getParentArtifactFromMavenProject() throws Exception { } - @Test(enabled=false) + @Test public void getParentVersionFromMavenProject() throws Exception { String parentVersionId = NameGenerator.generate("parent-version-", 6); when(parentKey.getVersion()).thenReturn(parentVersionId); @@ -177,7 +177,7 @@ public void getParentVersionFromMavenProject() throws Exception { Assert.assertEquals(versions.get(0), parentVersionId); } - @Test(enabled=false) + @Test public void getParentGroupFromMavenProject() throws Exception { String groupId = NameGenerator.generate("parent-group-", 6); when(parentKey.getGroupId()).thenReturn(groupId); @@ -190,7 +190,7 @@ public void getParentGroupFromMavenProject() throws Exception { Assert.assertEquals(values.get(0), groupId); } - @Test(enabled=false) + @Test public void getSourceFromMavenProject() throws Exception { final List strings = singletonList("src"); when(mavenProject.getSources()).thenReturn(strings); @@ -202,7 +202,7 @@ public void getSourceFromMavenProject() throws Exception { Assert.assertEquals(sources, strings); } - @Test(enabled=false) + @Test public void getSourceFromMavenProjectIfNotSet() throws Exception { when(mavenProjectManager.getMavenProject(anyString())).thenReturn(mavenProject); List sources = mavenValueProvider.getValues(Constants.SOURCE_FOLDER); @@ -212,7 +212,7 @@ public void getSourceFromMavenProjectIfNotSet() throws Exception { Assert.assertEquals(sources, singletonList(MavenAttributes.DEFAULT_SOURCE_FOLDER)); } - @Test(enabled=false) + @Test public void getTestSourceFromMavenProject() throws Exception { List strings = singletonList("src/test"); when(mavenProject.getTestSources()).thenReturn(strings); @@ -224,7 +224,7 @@ public void getTestSourceFromMavenProject() throws Exception { Assert.assertEquals(sources, strings); } - @Test(enabled=false) + @Test public void getTestSourceFromMavenProjectIfNotSet() throws Exception { when(mavenProjectManager.getMavenProject(anyString())).thenReturn(mavenProject); List sources = mavenValueProvider.getValues(MavenAttributes.TEST_SOURCE_FOLDER); diff --git a/plugins/plugin-maven/maven-server/maven-server-impl/src/main/java/org/eclipse/che/maven/server/MavenModelUtil.java b/plugins/plugin-maven/maven-server/maven-server-impl/src/main/java/org/eclipse/che/maven/server/MavenModelUtil.java index f67933e1f62..0d55d056bc6 100644 --- a/plugins/plugin-maven/maven-server/maven-server-impl/src/main/java/org/eclipse/che/maven/server/MavenModelUtil.java +++ b/plugins/plugin-maven/maven-server/maven-server-impl/src/main/java/org/eclipse/che/maven/server/MavenModelUtil.java @@ -56,7 +56,8 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.stream.Collectors; + +import static java.util.stream.Collectors.toList; /** * Util methods for converting maven model objects into maven-server objects @@ -69,7 +70,7 @@ public static MavenKey keyFor(Artifact artifact) { return new MavenKey(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion()); } - public static MavenModel convertModel(Model model) { + public static MavenModel convertModel(Model model, File projectDir) { Build build = model.getBuild(); List sources = new ArrayList<>(); List testSources = new ArrayList<>(); @@ -84,10 +85,10 @@ public static MavenModel convertModel(Model model) { } } - return convertModel(model, sources, testSources, Collections.emptyList(), Collections.emptyList(), null); + return convertModel(model, projectDir, sources, testSources, Collections.emptyList(), Collections.emptyList(), null); } - public static MavenModel convertModel(Model model, List sources, List testSources, Collection dependencies, + public static MavenModel convertModel(Model model, File projectDir, List sources, List testSources, Collection dependencies, Collection extensions, File localRepo) { MavenModel result = new MavenModel(); @@ -111,28 +112,32 @@ public static MavenModel convertModel(Model model, List sources, List dependencyNodes, File localRepository) { Model model = project.getModel(); - return convertModel(model, project.getCompileSourceRoots(), project.getTestCompileSourceRoots(), project.getArtifacts(), + return convertModel(model, project.getBasedir(), project.getCompileSourceRoots(), project.getTestCompileSourceRoots(), project.getArtifacts(), project.getExtensionArtifacts(), localRepository); } - private static void convertBuild(MavenBuild mavenBuild, Build build, List compileSourceRoots, + private static void convertBuild(MavenBuild mavenBuild, Build build, File projectDir, List compileSourceRoots, List testCompileSourceRoots) { - convertBaseBuild(build, mavenBuild); - mavenBuild.setOutputDirectory(build.getOutputDirectory()); - mavenBuild.setTestOutputDirectory(build.getTestOutputDirectory()); - mavenBuild.setSources(compileSourceRoots); - mavenBuild.setTestSources(testCompileSourceRoots); - } - - private static List convertProfiles(List profiles) { + convertBaseBuild(build, mavenBuild, projectDir); + mavenBuild.setOutputDirectory(relativize(projectDir, build.getOutputDirectory())); + mavenBuild.setTestOutputDirectory(relativize(projectDir, build.getTestOutputDirectory())); + mavenBuild.setSources(compileSourceRoots.stream() + .map(path -> relativize(projectDir, path)) + .collect(toList())); + mavenBuild.setTestSources(testCompileSourceRoots.stream() + .map(path -> relativize(projectDir, path)) + .collect(toList())); + } + + private static List convertProfiles(List profiles, File projectDir) { List result = new ArrayList<>(); if (profiles != null) { @@ -151,7 +156,7 @@ private static List convertProfiles(List profiles) { mavenProfile.setActivation(convertActivation(profile.getActivation())); if (profile.getBuild() != null) { - convertBaseBuild(profile.getBuild(), mavenProfile.getBuild()); + convertBaseBuild(profile.getBuild(), mavenProfile.getBuild(), projectDir); } result.add(mavenProfile); } @@ -160,12 +165,12 @@ private static List convertProfiles(List profiles) { return result; } - private static void convertBaseBuild(BuildBase build, MavenBuildBase mavenBuild) { + private static void convertBaseBuild(BuildBase build, MavenBuildBase mavenBuild, File projectDir) { mavenBuild.setDefaultGoal(build.getDefaultGoal()); - mavenBuild.setDirectory(build.getDirectory()); + mavenBuild.setDirectory(relativize(projectDir, build.getDirectory())); mavenBuild.setFinalName(build.getFinalName()); - mavenBuild.setResources(convenrtResources(build.getResources())); - mavenBuild.setTestResources(convenrtResources(build.getTestResources())); + mavenBuild.setResources(convenrtResources(build.getResources(), projectDir)); + mavenBuild.setTestResources(convenrtResources(build.getTestResources(), projectDir)); List filters = build.getFilters(); if (filters == null) { mavenBuild.setFilters(Collections.emptyList()); @@ -174,11 +179,11 @@ private static void convertBaseBuild(BuildBase build, MavenBuildBase mavenBuild) } } - private static List convenrtResources(List resources) { + private static List convenrtResources(List resources, File projectDir) { List result = new ArrayList<>(); if (resources != null) { for (Resource res : resources) { - result.add(new MavenResource(res.getDirectory(), + result.add(new MavenResource(relativize(projectDir, res.getDirectory()), res.isFiltering(), res.getTargetPath(), patternsOrEmptyList(res.getIncludes()), @@ -262,7 +267,7 @@ private static List convertArtifacts(Collection artifac ArrayList result = new ArrayList<>(); if (artifacts != null) { result.addAll(artifacts.stream().map(artifact -> convertArtifact(artifact, convertedArtifacts, localRepository)) - .collect(Collectors.toList())); + .collect(toList())); } return result; @@ -304,7 +309,7 @@ private static List convertPlugins(Model model) { if (build != null) { List plugins = build.getPlugins(); if (plugins != null) { - result.addAll(plugins.stream().map(MavenModelUtil::convertPlugin).collect(Collectors.toList())); + result.addAll(plugins.stream().map(MavenModelUtil::convertPlugin).collect(toList())); } } @@ -314,13 +319,13 @@ private static List convertPlugins(Model model) { private static MavenPlugin convertPlugin(Plugin plugin) { List executions = plugin.getExecutions().stream().map(MavenModelUtil::convertExecution) - .collect(Collectors.toList()); + .collect(toList()); List dependecies = plugin.getDependencies() .stream() .map(dependency -> new MavenKey(dependency.getGroupId(), dependency.getArtifactId(), - dependency.getVersion())).collect(Collectors.toList()); + dependency.getVersion())).collect(toList()); return new MavenPlugin(plugin.getGroupId(), plugin.getArtifactId(), plugin.getVersion(), false, convertConfiguration(plugin.getConfiguration()), executions, dependecies); @@ -358,7 +363,7 @@ private static MavenPluginExecution convertExecution(PluginExecution execution) return new MavenPluginExecution(execution.getId(), convertConfiguration(execution.getConfiguration()), execution.getGoals()); } - public static Model convertToMavenModel(MavenModel model) { + public static Model convertToMavenModel(MavenModel model, File projectDir) { Model result = new Model(); result.setArtifactId(model.getMavenKey().getArtifactId()); result.setGroupId(model.getMavenKey().getGroupId()); @@ -380,19 +385,19 @@ public static Model convertToMavenModel(MavenModel model) { result.setModules(model.getModules()); result.setBuild(new Build()); MavenBuild modelBuild = model.getBuild(); - convertToMavenBuildBase(modelBuild, result.getBuild()); - result.getBuild().setSourceDirectory(modelBuild.getSources().get(0)); - result.getBuild().setTestSourceDirectory(modelBuild.getTestSources().get(0)); + convertToMavenBuildBase(modelBuild, result.getBuild(), projectDir); + result.getBuild().setSourceDirectory(relativize(projectDir, modelBuild.getSources().get(0))); + result.getBuild().setTestSourceDirectory(relativize(projectDir, modelBuild.getTestSources().get(0))); - result.setProfiles(convertToMavenProfiles(model.getProfiles())); + result.setProfiles(convertToMavenProfiles(model.getProfiles(), projectDir)); return result; } - private static List convertToMavenProfiles(List profiles) { - return profiles.stream().map(MavenModelUtil::convertToMavenProfile).collect(Collectors.toList()); + private static List convertToMavenProfiles(List profiles, File projectDir) { + return profiles.stream().map(profile -> convertToMavenProfile(profile, projectDir)).collect(toList()); } - private static Profile convertToMavenProfile(MavenProfile mavenProfile) { + private static Profile convertToMavenProfile(MavenProfile mavenProfile, File projectDir) { Profile result = new Profile(); result.setId(mavenProfile.getId()); result.setSource(mavenProfile.getSource()); @@ -400,7 +405,7 @@ private static Profile convertToMavenProfile(MavenProfile mavenProfile) { result.setProperties(mavenProfile.getProperties()); result.setBuild(new Build()); result.setActivation(convertToMavenActivation(mavenProfile.getActivation())); - convertToMavenBuildBase(mavenProfile.getBuild(), result.getBuild()); + convertToMavenBuildBase(mavenProfile.getBuild(), result.getBuild(), projectDir); return result; } @@ -449,22 +454,22 @@ private static ActivationFile convertToMavenActivationFile(MavenActivationFile f return null; } - private static void convertToMavenBuildBase(MavenBuildBase modelBuild, BuildBase build) { + private static void convertToMavenBuildBase(MavenBuildBase modelBuild, BuildBase build, File projectDir) { build.setFinalName(modelBuild.getFinalName()); build.setDefaultGoal(modelBuild.getDefaultGoal()); - build.setDirectory(modelBuild.getDirectory()); + build.setDirectory(relativize(projectDir, modelBuild.getDirectory())); build.setFilters(modelBuild.getFilters()); - build.setResources(convertToMavenResources(modelBuild.getResources())); - build.setTestResources(convertToMavenResources(modelBuild.getTestResources())); + build.setResources(convertToMavenResources(modelBuild.getResources(), projectDir)); + build.setTestResources(convertToMavenResources(modelBuild.getTestResources(), projectDir)); } - private static List convertToMavenResources(List resources) { - return resources.stream().map(MavenModelUtil::convertToMavenResource).collect(Collectors.toList()); + private static List convertToMavenResources(List resources, File projectDir) { + return resources.stream().map(resource -> convertToMavenResource(resource, projectDir)).collect(toList()); } - private static Resource convertToMavenResource(MavenResource mavenResource) { + private static Resource convertToMavenResource(MavenResource mavenResource, File projectDir) { Resource resource = new Resource(); - resource.setDirectory(mavenResource.getDirectory()); + resource.setDirectory(relativize(projectDir, mavenResource.getDirectory())); resource.setFiltering(mavenResource.isFiltered()); resource.setTargetPath(mavenResource.getTargetPath()); resource.setIncludes(mavenResource.getIncludes()); @@ -499,4 +504,16 @@ private static RepositoryPolicy convertToMavenPolicy(MavenRepositoryPolicy polic result.setUpdatePolicy(policy.getUpdatePolicy()); return result; } + + private static String relativize(File basePath, String rawPath) { + if (rawPath == null) { + return null; + } + + if (rawPath.isEmpty()) { + return rawPath; + } + + return rawPath.startsWith(File.separator) ? basePath.toURI().relativize(new File(rawPath).toURI()).getPath() : rawPath; + } } diff --git a/plugins/plugin-maven/maven-server/maven-server-impl/src/main/java/org/eclipse/che/maven/server/MavenServerImpl.java b/plugins/plugin-maven/maven-server/maven-server-impl/src/main/java/org/eclipse/che/maven/server/MavenServerImpl.java index a0ecddf9a34..7a25cb89ec6 100644 --- a/plugins/plugin-maven/maven-server/maven-server-impl/src/main/java/org/eclipse/che/maven/server/MavenServerImpl.java +++ b/plugins/plugin-maven/maven-server/maven-server-impl/src/main/java/org/eclipse/che/maven/server/MavenServerImpl.java @@ -226,13 +226,13 @@ protected org.codehaus.plexus.logging.Logger createLogger(String s) { } public static MavenModel interpolateModel(MavenModel model, File projectDir) throws RemoteException { - Model result = MavenModelUtil.convertToMavenModel(model); + Model result = MavenModelUtil.convertToMavenModel(model, projectDir); result = internalInterpolate(result, projectDir); // PathTranslator pathTranslator = new DefaultPathTranslator(); // pathTranslator.alignToBaseDirectory(result, projectDir); - return MavenModelUtil.convertModel(result); + return MavenModelUtil.convertModel(result, projectDir); } /** @@ -254,7 +254,7 @@ public static ProfileApplicationResult applyProfiles(MavenModel model, File projectDir, MavenExplicitProfiles explicitProfiles, Collection alwaysOnProfiles) throws RemoteException { - Model nativeModel = MavenModelUtil.convertToMavenModel(model); + Model nativeModel = MavenModelUtil.convertToMavenModel(model, projectDir); Collection enabledProfiles = explicitProfiles.getEnabledProfiles(); Collection disabledProfiles = explicitProfiles.getDisabledProfiles(); @@ -315,7 +315,7 @@ public static ProfileApplicationResult applyProfiles(MavenModel model, new DefaultProfileInjector().injectProfile(nativeModel, each, null, null); } - return new ProfileApplicationResult(MavenModelUtil.convertModel(nativeModel), + return new ProfileApplicationResult(MavenModelUtil.convertModel(nativeModel, projectDir), new MavenExplicitProfiles(collectProfilesIds(activatedProfiles), collectProfilesIds(deactivatedProfiles)) ); diff --git a/plugins/plugin-maven/maven-server/maven-server-impl/src/test/java/org/eclipse/che/maven/server/MavenServerTest.java b/plugins/plugin-maven/maven-server/maven-server-impl/src/test/java/org/eclipse/che/maven/server/MavenServerTest.java index 9712b5c9697..382987084bb 100644 --- a/plugins/plugin-maven/maven-server/maven-server-impl/src/test/java/org/eclipse/che/maven/server/MavenServerTest.java +++ b/plugins/plugin-maven/maven-server/maven-server-impl/src/test/java/org/eclipse/che/maven/server/MavenServerTest.java @@ -12,15 +12,18 @@ import org.eclipse.che.maven.data.MavenActivation; import org.eclipse.che.maven.data.MavenActivationFile; +import org.eclipse.che.maven.data.MavenBuild; import org.eclipse.che.maven.data.MavenExplicitProfiles; import org.eclipse.che.maven.data.MavenKey; import org.eclipse.che.maven.data.MavenModel; import org.eclipse.che.maven.data.MavenProfile; +import org.eclipse.che.maven.data.MavenResource; import org.testng.Assert; import org.testng.annotations.Test; import java.io.File; import java.rmi.RemoteException; +import java.util.Arrays; import java.util.Collections; import java.util.Properties; @@ -133,4 +136,58 @@ public void profilesShouldBeActivatedBeExistingFile() throws Exception { Assert.assertEquals(1, profileApplicationResult.getActivatedProfiles().getEnabledProfiles().size()); Assert.assertEquals(1, profileApplicationResult.getModel().getProperties().size()); } + + @Test + public void testShouldProvideRelativePathsInsteadAbsoluteForSimplePom() throws Exception { + final MavenSettings mavenSettings = new MavenSettings(); + mavenSettings.setLoggingLevel(MavenTerminal.LEVEL_INFO); + + final MavenServer server = new MavenServerImpl(mavenSettings); + final MavenServerResult mavenServerResult = + server.resolveProject(new File(MavenServerTest.class.getResource("/SimplePom/pom.xml").getFile()), + emptyList(), emptyList()); + + final MavenBuild mavenBuild = mavenServerResult.getProjectInfo().getMavenModel().getBuild(); + + final MavenResource expectedMavenResource = new MavenResource("src/main/resources", false, null, emptyList(), emptyList()); + final MavenResource expectedMavenTestResource = new MavenResource("src/test/resources", false, null, emptyList(), emptyList()); + + Assert.assertEquals(mavenBuild.getOutputDirectory(), "target/classes"); + Assert.assertEquals(mavenBuild.getTestOutputDirectory(), "target/test-classes"); + Assert.assertEquals(mavenBuild.getSources(), singletonList("src/main/java")); + Assert.assertEquals(mavenBuild.getTestSources(), singletonList("src/test/java")); + Assert.assertEquals(mavenBuild.getResources(), singletonList(expectedMavenResource)); + Assert.assertEquals(mavenBuild.getTestResources(), singletonList(expectedMavenTestResource)); + } + + @Test + public void testShouldProvideRelativePathsInsteadAbsoluteForComplexPom() throws Exception { + final MavenSettings mavenSettings = new MavenSettings(); + mavenSettings.setLoggingLevel(MavenTerminal.LEVEL_INFO); + + final MavenServer server = new MavenServerImpl(mavenSettings); + final MavenServerResult mavenServerResult = + server.resolveProject(new File(MavenServerTest.class.getResource("/ComplexPom/pom.xml").getFile()), + emptyList(), emptyList()); + + final MavenBuild mavenBuild = mavenServerResult.getProjectInfo().getMavenModel().getBuild(); + + final MavenResource expectedMavenResource = new MavenResource("resDir1", + true, + "targetPath", + Arrays.asList("include1", "include2"), + Arrays.asList("exclude1", "exclude2")); + final MavenResource expectedMavenTestResource = new MavenResource("testResDir1", + true, + "targetPath", + Arrays.asList("include1", "include2"), + Arrays.asList("exclude1", "exclude2")); + + Assert.assertEquals(mavenBuild.getOutputDirectory(), "outputDir"); + Assert.assertEquals(mavenBuild.getTestOutputDirectory(), "testOutputDir"); + Assert.assertEquals(mavenBuild.getSources(), singletonList("srcDir")); + Assert.assertEquals(mavenBuild.getTestSources(), singletonList("testSrcDir")); + Assert.assertEquals(mavenBuild.getResources(), singletonList(expectedMavenResource)); + Assert.assertEquals(mavenBuild.getTestResources(), singletonList(expectedMavenTestResource)); + } } diff --git a/plugins/plugin-maven/maven-server/maven-server-impl/src/test/resources/ComplexPom/pom.xml b/plugins/plugin-maven/maven-server/maven-server-impl/src/test/resources/ComplexPom/pom.xml new file mode 100644 index 00000000000..61dd37dcacf --- /dev/null +++ b/plugins/plugin-maven/maven-server/maven-server-impl/src/test/resources/ComplexPom/pom.xml @@ -0,0 +1,56 @@ + + + + 4.0.0 + groupId + artifactId + 1.0-SNAPSHOT + jar + + outputDir + testOutputDir + srcDir + testSrcDir + + + resDir1 + + exclude1 + exclude2 + + true + + include1 + include2 + + targetPath + + + + + testResDir1 + + exclude1 + exclude2 + + true + + include1 + include2 + + targetPath + + + + diff --git a/plugins/plugin-maven/maven-server/maven-server-impl/src/test/resources/SimplePom/pom.xml b/plugins/plugin-maven/maven-server/maven-server-impl/src/test/resources/SimplePom/pom.xml new file mode 100644 index 00000000000..18b0f9c027a --- /dev/null +++ b/plugins/plugin-maven/maven-server/maven-server-impl/src/test/resources/SimplePom/pom.xml @@ -0,0 +1,20 @@ + + + + 4.0.0 + groupId + artifactId + 1.0-SNAPSHOT + jar +