4.x: archetype - Remove Verrazzano from archetype (#9829)

helidon-io · Feb 26, 2025 · 2de63a8 · 2de63a8
1 parent 388180a
commit 2de63a8
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 52 deletions.
diff --git a/archetypes/archetypes/filters.properties b/archetypes/archetypes/filters.properties
@@ -40,8 +40,8 @@ metrics=!${metrics} || (${metrics.builtin})
 extra=${extra} == [] || ${extra} == ['cors', 'fault-tolerance', 'coherence'] || \
   (${flavor} == 'se' && ${extra} == ['webclient', 'cors', 'fault-tolerance', 'coherence'])
 
-# group docker, k8s and v8o
-packaging=!(${docker} || ${k8s} || ${v8o}) || (${docker} && ${k8s} && ${v8o})
+# group docker and k8s
+packaging=!(${docker} || ${k8s}) || (${docker} && ${k8s})
 
 # force docker.native-image=true and docker.jlink-image=true when docker=true
 docker=!${docker} || (${docker.native-image} && ${docker.jlink-image})

diff --git a/archetypes/archetypes/src/main/archetype/common/files/v8o.yaml.mustache b/archetypes/archetypes/src/main/archetype/common/files/v8o.yaml.mustache
diff --git a/archetypes/archetypes/src/main/archetype/common/packaging.xml b/archetypes/archetypes/src/main/archetype/common/packaging.xml
@@ -77,20 +77,6 @@ kubectl delete -f app.yaml
                     </model>
                 </output>
             </boolean>
-            <boolean id="v8o"
-                     name="Verrazzano Support"
-                     description="Add Verrazzano manifests to your project"
-                     default="false"
-                     optional="true">
-                <output>
-                    <templates engine="mustache" transformations="mustache">
-                        <directory>files</directory>
-                        <includes>
-                            <include>v8o.yaml.mustache</include>
-                        </includes>
-                    </templates>
-                </output>
-            </boolean>
             <boolean id="jpms"
                      name="Module support (JPMS)"
                      description="Add a module-info to your project"

diff --git a/archetypes/archetypes/src/main/archetype/common/presets.xml b/archetypes/archetypes/src/main/archetype/common/presets.xml
@@ -36,7 +36,6 @@
         <boolean path="docker.native-image">true</boolean>
         <boolean path="docker.jlink-image">true</boolean>
         <boolean path="k8s">true</boolean>
-        <boolean path="v8o">false</boolean>
         <boolean path="jpms">false</boolean>
     </presets>
 </archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/oci-mp.xml b/archetypes/archetypes/src/main/archetype/mp/oci/oci-mp.xml
@@ -44,7 +44,6 @@ This will mount `~/.oci` as a volume in the running docker container.
         <boolean path="docker.native-image">false</boolean>
         <boolean path="docker.jlink-image">false</boolean>
         <boolean path="k8s">true</boolean>
-        <boolean path="v8o">false</boolean>
         <boolean path="jpms">false</boolean>
     </presets>
     <call method="pre-processed-models"/>