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

Jump to bottom

CHE-4920: Analyze maven profiles #5122

Merged
merged 3 commits into from
May 18, 2017
Merged

CHE-4920: Analyze maven profiles #5122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
268c39e
CHE-4920: add an ability to analyze maven profiles
May 18, 2017
cd8ff7a
CHE-4920: code cleanup
May 18, 2017
52c0138
CHE-4920: code cleanup
May 18, 2017
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
46 changes: 20 additions & 26 deletions ide/che-core-ide-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
11 changes: 11 additions & 0 deletions ...in-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/MavenServerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

/**
Expand Down Expand Up @@ -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);
Expand Down
Loading