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

Unify the profile name across mojos #3266

Merged
merged 1 commit into from
Dec 16, 2023
Merged

Unify the profile name across mojos #3266

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
1 change: 1 addition & 0 deletions tycho-api/src/main/java/org/eclipse/tycho/TychoConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public interface TychoConstants {

String PROP_PGP_SIGNATURES = "pgp.signatures";

String DEFAULT_PROFILE = "DefaultProfile";
/**
* @deprecated this is deprecated but can't be removed as we otherwise loose compatibility for
* older repository format, this should never be used in new code and usage should
Expand Down
5 changes: 3 additions & 2 deletions ...-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/DirectorMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.eclipse.equinox.p2.core.IProvisioningAgent;
import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;
import org.eclipse.equinox.p2.core.ProvisionException;
import org.eclipse.tycho.TychoConstants;
import org.eclipse.tycho.p2.CommandLineArguments;
import org.eclipse.tycho.p2.resolver.BundlePublisher;
import org.eclipse.tycho.p2tools.TychoDirectorApplication;
Expand Down Expand Up @@ -205,7 +206,7 @@ public class DirectorMojo extends AbstractMojo {
/**
* Defines what profile to use for the actions.
*/
@Parameter(property = "profile")
@Parameter(property = "profile", defaultValue = TychoConstants.DEFAULT_PROFILE)
private String profile;

/**
Expand All @@ -216,7 +217,7 @@ public class DirectorMojo extends AbstractMojo {
@Parameter(property = "profileproperties")
private String profileproperties;

@Parameter(property = "installFeatures")
@Parameter(property = "installFeatures", defaultValue = "true")
private boolean installFeatures;

/**
Expand Down
3 changes: 2 additions & 1 deletion ...r-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/MaterializeProductsMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.eclipse.tycho.TargetEnvironment;
import org.eclipse.tycho.TychoConstants;
import org.eclipse.tycho.core.resolver.shared.DependencySeed;
import org.eclipse.tycho.p2.tools.RepositoryReferences;
import org.eclipse.tycho.p2.tools.director.shared.DirectorCommandException;
Expand Down Expand Up @@ -59,7 +60,7 @@ public enum DirectorRuntimeType {
/**
* The name of the p2 profile to be created.
*/
@Parameter(defaultValue = "DefaultProfile")
@Parameter(defaultValue = TychoConstants.DEFAULT_PROFILE)
private String profile;

// TODO 405785 the syntax of this parameter doesn't work well with configuration inheritance; replace with new generic envSpecificConfiguration parameter syntax
Expand Down
3 changes: 1 addition & 2 deletions ...cho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/AbstractEclipseTestMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,8 +522,7 @@ public abstract class AbstractEclipseTestMojo extends AbstractTestMojo {
*
* @since 0.19.0
*/
// default value should be kept the same as DirectorMojo#profile default value
@Parameter(defaultValue = "DefaultProfile")
@Parameter(defaultValue = TychoConstants.DEFAULT_PROFILE)
private String profileName;

/**
Expand Down