build(minimal): rename to 'headless' (#996)

cryostatio · Jun 14, 2022 · d13e504 · d13e504
1 parent e8a7ede
commit d13e504
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ cluster as well as exposing the Cryostat API as Kubernetes Custom Resources.
 
 * [cryostat-web](https://github.com/cryostatio/cryostat-web) : the React
 frontend included as a submodule in Cryostat and built into
-Cryostat's (non-minimal mode) OCI images.
+Cryostat's (non-headless mode) OCI images.
 
 * [JDK Mission Control](https://github.com/openjdk/jmc) for the original JDK
 Mission Control, which is the desktop application complement to JFR. Some parts
@@ -56,7 +56,7 @@ the `web-client` frontend for hot-reload development, see
 
 ### Build and push to local podman image registry
 * `mvn package`
-* Run `mvn -Dcryostat.minimal=true clean package` to exclude web-client assets.
+* Run `mvn -Dheadless=true clean package` to exclude web-client assets.
 The `clean` phase should always be specified here, or else previously-generated
 client assets will still be included into the built image.
 * For other OCI builders, use the `imageBuilder` Maven property. For example, to

diff --git a/build-images.sh b/build-images.sh
@@ -5,6 +5,6 @@ set -e
 
 sh "$(dirname $0)/baseImage/build.sh"
 
-mvn -Dcryostat.minimal=true clean verify
+mvn -Dheadless=true clean verify
 
 mvn verify
diff --git a/devserver.sh b/devserver.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "$CRYOSTAT_CORS_ORIGIN" ]; then
     "${MVN}" -DskipTests=true clean prepare-package
 else
-    "${MVN}" -DskipTests=true -Dcryostat.minimal=true clean prepare-package
+    "${MVN}" -DskipTests=true -Dheadless=true clean prepare-package
 fi
 
 # HACK. The vertx-maven-plugin doesn't include target/assets on the classpath, so copy its contents into target/classes which is included
@@ -118,4 +118,4 @@ MAVEN_OPTS="${flags[@]}" \
     CRYOSTAT_TEMPLATE_PATH="${work_dir}/templates" \
     CRYOSTAT_PROBE_TEMPLATE_PATH="${work_dir}/probes" \
     CRYOSTAT_DEV_MODE=true \
-    "${MVN}" -Dcryostat.minimal=true -DskipTests=true vertx:run
+    "${MVN}" -Dheadless=true -DskipTests=true vertx:run
diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
   <skipTests>false</skipTests>
   <skipITs>${skipTests}</skipITs>
   <skipUTs>${skipTests}</skipUTs>
-  <cryostat.minimal>false</cryostat.minimal>
+  <headless>false</headless>
   <cryostat.imageStream>quay.io/cryostat/cryostat</cryostat.imageStream>
   <cryostat.entrypoint>/app/entrypoint.sh</cryostat.entrypoint>
   <cryostat.mainClass>io.cryostat.Cryostat</cryostat.mainClass>
@@ -842,15 +842,15 @@
 
 <profiles>
   <profile>
-    <id>minimal</id>
+    <id>headless</id>
     <activation>
       <property>
-        <name>cryostat.minimal</name>
+        <name>headless</name>
         <value>true</value>
       </property>
     </activation>
     <properties>
-      <cryostat.imageVersion>${project.version}-minimal</cryostat.imageVersion>
+      <cryostat.imageVersion>${project.version}-headless</cryostat.imageVersion>
     </properties>
     <build>
       <plugins>
@@ -860,18 +860,18 @@
           <version>${org.apache.maven.plugins.failsafe.version}</version>
           <configuration>
             <systemPropertyVariables>
-              <isMinimalBuild>true</isMinimalBuild>
+              <isHeadlessBuild>true</isHeadlessBuild>
             </systemPropertyVariables>
           </configuration>
         </plugin>
       </plugins>
     </build>
   </profile>
   <profile>
-    <id>non-minimal</id>
+    <id>headfull</id>
     <activation>
       <property>
-        <name>cryostat.minimal</name>
+        <name>headless</name>
         <value>!true</value>
       </property>
     </activation>
@@ -909,7 +909,7 @@
               </fileset>
             </filesets>
             <systemPropertyVariables>
-              <isMinimalBuild>false</isMinimalBuild>
+              <isHeadlessBuild>false</isHeadlessBuild>
             </systemPropertyVariables>
           </configuration>
         </plugin>

diff --git a/repeated-unit-tests.bash b/repeated-unit-tests.bash
@@ -11,7 +11,7 @@ else
 fi
 
 FLAGS=(
-    "-Dcryostat.minimal=true"
+    "-Dheadless=true"
 )
 
 if command -v ansi2txt >/dev/null; then

diff --git a/src/test/java/itest/ClientAssetsIT.java b/src/test/java/itest/ClientAssetsIT.java
@@ -52,7 +52,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 
-@DisabledIfSystemProperty(named = "isMinimalBuild", matches = "true")
+@DisabledIfSystemProperty(named = "isHeadlessBuild", matches = "true")
 public class ClientAssetsIT extends StandardSelfTest {
 
     static File file;
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ else @@
     fi
     FLAGS=(
-        "-Dcryostat.minimal=true"
+        "-Dheadless=true"
     )
     if command -v ansi2txt >/dev/null; then
@@ Expand Down @@