[JENKINS-44458] Make it (much) simpler

jenkinsci · May 24, 2017 · eacc5e2 · eacc5e2
1 parent a7571e5
commit eacc5e2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@ Changelog
 
 ### Unreleased
 
-* Setup Wizard disabled by default when using `hpi:run`. To enable it use `-DenableWizard`.
+* Setup Wizard disabled by default when using `hpi:run`. To enable it use `-Dhudson.Main.development=false`.
 
 ### 2.29
 

diff --git a/README.md b/README.md
@@ -155,7 +155,7 @@ or
 
 By default, the setup wizard (Jenkins >= 2.0) is skipped when using `hpi:run`. If you want the wizard to be enabled just run:
 
-    mvn -DenableWizard hpi:run
+    mvn -Dhudson.Main.development=false hpi:run
 
 
 ## For maintainers

diff --git a/pom.xml b/pom.xml
@@ -88,6 +88,8 @@
     <!-- For jgit-scm-provider profile -->
     <git.provider>git</git.provider>
     <maven-scm.version>1.9.5</maven-scm.version>
+    <!-- To skip the wizard by default in hpi:run. It should not impact other goals. -->
+    <hudson.Main.development>true</hudson.Main.development>
   </properties>
 
   <prerequisites>
@@ -612,6 +614,9 @@
           <showDeprecation>true</showDeprecation>
           <contextPath>/jenkins</contextPath>
           <!-- TODO specify ${java.level} when JENKINS-20679 implemented -->
+          <systemProperties>
+            <hudson.Main.development>true</hudson.Main.development>
+          </systemProperties>
         </configuration>
       </plugin>
       <plugin>
@@ -1339,27 +1344,5 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>disableWizard</id>
-      <activation>
-        <property>
-          <name>!enableWizard</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.jenkins-ci.tools</groupId>
-            <artifactId>maven-hpi-plugin</artifactId>
-            <configuration>
-              <systemProperties>
-                <name>hudson.Main.development</name>
-                <value>true</value>
-              </systemProperties>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 </project>