CHE-4920: Analyze maven profiles (#5122)

eclipse-che · May 18, 2017 · 6a427e3 · 6a427e3
1 parent a13068e
commit 6a427e3
Show file tree

Hide file tree

Showing 40 changed files with 2,881 additions and 98 deletions.
diff --git a/ide/che-core-ide-app/pom.xml b/ide/che-core-ide-app/pom.xml
@@ -213,6 +213,26 @@
                             </ignoredDependencies>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>unpack-terminal</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.eclipse.che.lib</groupId>
+                                    <artifactId>che-terminal-client</artifactId>
+                                    <version>${che.lib.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.outputDirectory}/org/eclipse/che/public/term</outputDirectory>
+                                    <excludes>org/**,META-INF/**</excludes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -318,32 +338,6 @@
                     </excludes>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack-terminal</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.eclipse.che.lib</groupId>
-                                    <artifactId>che-terminal-client</artifactId>
-                                    <version>${che.lib.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.outputDirectory}/org/eclipse/che/public/term</outputDirectory>
-                                    <excludes>org/**,META-INF/**</excludes>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/...in-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/MavenServerManager.java b/...in-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/MavenServerManager.java
@@ -13,13 +13,16 @@
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import com.google.inject.name.Named;
+
+import org.eclipse.che.maven.data.MavenExplicitProfiles;
 import org.eclipse.che.maven.data.MavenModel;
 import org.eclipse.che.maven.server.MavenRemoteServer;
 import org.eclipse.che.maven.server.MavenServer;
 import org.eclipse.che.maven.server.MavenServerDownloadListener;
 import org.eclipse.che.maven.server.MavenServerLogger;
 import org.eclipse.che.maven.server.MavenSettings;
 import org.eclipse.che.maven.server.MavenTerminal;
+import org.eclipse.che.maven.server.ProfileApplicationResult;
 import org.eclipse.che.plugin.maven.server.execution.CommandLine;
 import org.eclipse.che.plugin.maven.server.execution.JavaParameters;
 import org.eclipse.che.plugin.maven.server.execution.ProcessExecutor;
@@ -37,6 +40,7 @@
 import java.rmi.RemoteException;
 import java.rmi.server.UnicastRemoteObject;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -122,6 +126,13 @@ public MavenModel interpolateModel(MavenModel model, File projectDir) {
         return perform(() -> getOrCreateWrappedObject().interpolateModel(model, projectDir));
     }
 
+    public ProfileApplicationResult applyProfiles(MavenModel model,
+                                                  File projectDir,
+                                                  MavenExplicitProfiles explicitProfiles,
+                                                  Collection<String> alwaysOnProfiles) {
+        return perform(() -> getOrCreateWrappedObject().applyProfiles(model, projectDir, explicitProfiles, alwaysOnProfiles));
+    }
+
     @PreDestroy
     public void shutdown() {
         client.stopAll(false);