Unify the profile name across mojos

(cherry picked from commit bd2796d)
eclipse-tycho · Dec 16, 2023 · b8e32dc · b8e32dc
1 parent 1abdf41
commit b8e32dc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/tycho-api/src/main/java/org/eclipse/tycho/TychoConstants.java b/tycho-api/src/main/java/org/eclipse/tycho/TychoConstants.java
@@ -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

diff --git a/...-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/DirectorMojo.java b/...-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/DirectorMojo.java
@@ -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;
@@ -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;
 
     /**
@@ -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;
 
     /**

diff --git a/...r-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/MaterializeProductsMojo.java b/...r-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/MaterializeProductsMojo.java
@@ -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;
@@ -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

diff --git a/...cho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/AbstractEclipseTestMojo.java b/...cho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/AbstractEclipseTestMojo.java
@@ -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;
 
     /**