Refactor archetypes/helidon to comply with the workspace conventions (#…

…8291) - rename archetypes/helidon to archetypes/helidon-archetypes - update artifactId from 'helidon' to 'helidon-archetypes' - Update stager plugin configuration to preserve the old layout (I.e. stage as 'helidon-{version}.jar' - Update legacy/pom.xml to reflect the change
helidon-io · Jan 25, 2024 · b79f1fe · b79f1fe
1 parent 996ba16
commit b79f1fe
Show file tree

Hide file tree

Showing 157 changed files with 9 additions and 8 deletions.
diff --git a/archetypes/helidon/filters.properties → archetypes/archetypes/filters.properties b/archetypes/helidon/filters.properties → archetypes/archetypes/filters.properties
diff --git a/archetypes/helidon/pom.xml → archetypes/archetypes/pom.xml b/archetypes/helidon/pom.xml → archetypes/archetypes/pom.xml
@@ -26,8 +26,8 @@
         <version>4.0.0-SNAPSHOT</version>
     </parent>
     <packaging>helidon-archetype</packaging>
-    <artifactId>helidon</artifactId>
-    <name>Helidon Archetype</name>
+    <artifactId>helidon-archetypes</artifactId>
+    <name>Helidon Archetypes</name>
 
     <dependencies>
         <dependency>
@@ -83,12 +83,13 @@
                                         <archive target="cli-data/${project.version}/cli-data.zip">
                                             <copy-artifacts>
                                                 <copy-artifact groupId="io.helidon.archetypes"
-                                                               artifactId="helidon"
+                                                               artifactId="helidon-archetypes"
                                                                version="${project.version}"
+                                                               target="helidon-{version}.{type}"
                                                                type="jar"/>
                                             </copy-artifacts>
                                             <templates>
-                                                <template source="src/main/cli/metadata.properties.mustache"
+                                                <template source="src/main/cli/metadata.properties.hbs"
                                                           target="metadata.properties">
                                                     <variables>
                                                         <variable name="buildtoolsVersion"
@@ -101,7 +102,7 @@
                                         </archive>
                                     </archives>
                                     <templates>
-                                        <template source="src/main/cli/versions.xml.mustache" target="cli-data/versions.xml">
+                                        <template source="src/main/cli/versions.xml.hbs" target="cli-data/versions.xml">
                                             <variables>
                                                 <variable name="version" value="${project.version}"/>
                                             </variables>

diff --git a/...idon/src/main/archetype/common/common.xml → ...ypes/src/main/archetype/common/common.xml b/...idon/src/main/archetype/common/common.xml → ...ypes/src/main/archetype/common/common.xml
diff --git a/...in/archetype/common/customize-project.xml → ...in/archetype/common/customize-project.xml b/...in/archetype/common/customize-project.xml → ...in/archetype/common/customize-project.xml
diff --git a/...idon/src/main/archetype/common/docker.xml → ...ypes/src/main/archetype/common/docker.xml b/...idon/src/main/archetype/common/docker.xml → ...ypes/src/main/archetype/common/docker.xml
diff --git a/...lidon/src/main/archetype/common/extra.xml → ...types/src/main/archetype/common/extra.xml b/...lidon/src/main/archetype/common/extra.xml → ...types/src/main/archetype/common/extra.xml
diff --git a/...main/archetype/common/files/.dockerignore → ...main/archetype/common/files/.dockerignore b/...main/archetype/common/files/.dockerignore → ...main/archetype/common/files/.dockerignore
diff --git a/.../archetype/common/files/.helidon.mustache → .../archetype/common/files/.helidon.mustache b/.../archetype/common/files/.helidon.mustache → .../archetype/common/files/.helidon.mustache
diff --git a/...pe/common/files/Dockerfile.jlink.mustache → ...pe/common/files/Dockerfile.jlink.mustache b/...pe/common/files/Dockerfile.jlink.mustache → ...pe/common/files/Dockerfile.jlink.mustache
diff --git a/...rchetype/common/files/Dockerfile.mustache → ...rchetype/common/files/Dockerfile.mustache b/...rchetype/common/files/Dockerfile.mustache → ...rchetype/common/files/Dockerfile.mustache
diff --git a/...e/common/files/Dockerfile.native.mustache → ...e/common/files/Dockerfile.native.mustache b/...e/common/files/Dockerfile.native.mustache → ...e/common/files/Dockerfile.native.mustache
diff --git a/...n/archetype/common/files/README.jaeger.md → ...n/archetype/common/files/README.jaeger.md b/...n/archetype/common/files/README.jaeger.md → ...n/archetype/common/files/README.jaeger.md
diff --git a/...archetype/common/files/README.md.mustache → ...archetype/common/files/README.md.mustache b/...archetype/common/files/README.md.mustache → ...archetype/common/files/README.md.mustache
diff --git a/...n/archetype/common/files/README.native.md → ...n/archetype/common/files/README.native.md b/...n/archetype/common/files/README.native.md → ...n/archetype/common/files/README.native.md
diff --git a/...n/archetype/common/files/README.zipkin.md → ...n/archetype/common/files/README.zipkin.md b/...n/archetype/common/files/README.zipkin.md → ...n/archetype/common/files/README.zipkin.md
diff --git a/.../archetype/common/files/app.yaml.mustache → .../archetype/common/files/app.yaml.mustache b/.../archetype/common/files/app.yaml.mustache → .../archetype/common/files/app.yaml.mustache
diff --git a/...n/archetype/common/files/pom.xml.mustache → ...n/archetype/common/files/pom.xml.mustache b/...n/archetype/common/files/pom.xml.mustache → ...n/archetype/common/files/pom.xml.mustache
diff --git a/.../src/main/java/__pkg__/Main.java.mustache → .../src/main/java/__pkg__/Main.java.mustache b/.../src/main/java/__pkg__/Main.java.mustache → .../src/main/java/__pkg__/Main.java.mustache
diff --git a/...s/src/main/java/module-info.java.mustache → ...s/src/main/java/module-info.java.mustache b/...s/src/main/java/module-info.java.mustache → ...s/src/main/java/module-info.java.mustache
diff --git a/...tifactid/native-image.properties.mustache → ...tifactid/native-image.properties.mustache b/...tifactid/native-image.properties.mustache → ...tifactid/native-image.properties.mustache
diff --git a/...mon/files/src/main/resources/keystore.p12 → ...mon/files/src/main/resources/keystore.p12 b/...mon/files/src/main/resources/keystore.p12 → ...mon/files/src/main/resources/keystore.p12
diff --git a/.../archetype/common/files/v8o.yaml.mustache → .../archetype/common/files/v8o.yaml.mustache b/.../archetype/common/files/v8o.yaml.mustache → .../archetype/common/files/v8o.yaml.mustache
diff --git a/...c/main/archetype/common/media-sources.xml → ...c/main/archetype/common/media-sources.xml b/...c/main/archetype/common/media-sources.xml → ...c/main/archetype/common/media-sources.xml
diff --git a/...lidon/src/main/archetype/common/media.xml → ...types/src/main/archetype/common/media.xml b/...lidon/src/main/archetype/common/media.xml → ...types/src/main/archetype/common/media.xml
diff --git a/...rc/main/archetype/common/multi-module.xml → ...rc/main/archetype/common/multi-module.xml b/...rc/main/archetype/common/multi-module.xml → ...rc/main/archetype/common/multi-module.xml
diff --git a/...c/main/archetype/common/observability.xml → ...c/main/archetype/common/observability.xml b/...c/main/archetype/common/observability.xml → ...c/main/archetype/common/observability.xml
diff --git a/...n/src/main/archetype/common/packaging.xml → ...s/src/main/archetype/common/packaging.xml b/...n/src/main/archetype/common/packaging.xml → ...s/src/main/archetype/common/packaging.xml
diff --git a/...don/src/main/archetype/common/presets.xml → ...pes/src/main/archetype/common/presets.xml b/...don/src/main/archetype/common/presets.xml → ...pes/src/main/archetype/common/presets.xml
diff --git a/...on/src/main/archetype/common/security.xml → ...es/src/main/archetype/common/security.xml b/...on/src/main/archetype/common/security.xml → ...es/src/main/archetype/common/security.xml
diff --git a/...don/src/main/archetype/common/sources.xml → ...pes/src/main/archetype/common/sources.xml b/...don/src/main/archetype/common/sources.xml → ...pes/src/main/archetype/common/sources.xml
diff --git a/...pes/helidon/src/main/archetype/flavor.xml → .../archetypes/src/main/archetype/flavor.xml b/...pes/helidon/src/main/archetype/flavor.xml → .../archetypes/src/main/archetype/flavor.xml
diff --git a/...rc/main/archetype/mp/common/common-mp.xml → ...rc/main/archetype/mp/common/common-mp.xml b/...rc/main/archetype/mp/common/common-mp.xml → ...rc/main/archetype/mp/common/common-mp.xml
diff --git a/...n/java/__pkg__/package-info.java.mustache → ...n/java/__pkg__/package-info.java.mustache b/...n/java/__pkg__/package-info.java.mustache → ...n/java/__pkg__/package-info.java.mustache
diff --git a/...les/src/main/resources/META-INF/beans.xml → ...les/src/main/resources/META-INF/beans.xml b/...les/src/main/resources/META-INF/beans.xml → ...les/src/main/resources/META-INF/beans.xml
diff --git a/...F/microprofile-config.properties.mustache → ...F/microprofile-config.properties.mustache b/...F/microprofile-config.properties.mustache → ...F/microprofile-config.properties.mustache
diff --git a/...ain/resources/logging.properties.mustache → ...ain/resources/logging.properties.mustache b/...ain/resources/logging.properties.mustache → ...ain/resources/logging.properties.mustache
diff --git a/.../test/java/__pkg__/MainTest.java.mustache → .../test/java/__pkg__/MainTest.java.mustache b/.../test/java/__pkg__/MainTest.java.mustache → .../test/java/__pkg__/MainTest.java.mustache
diff --git a/...F/microprofile-config.properties.mustache → ...F/microprofile-config.properties.mustache b/...F/microprofile-config.properties.mustache → ...F/microprofile-config.properties.mustache
diff --git a/.../resources/application-test.yaml.mustache → .../resources/application-test.yaml.mustache b/.../resources/application-test.yaml.mustache → .../resources/application-test.yaml.mustache
diff --git a/...rc/main/archetype/mp/custom/custom-mp.xml → ...rc/main/archetype/mp/custom/custom-mp.xml b/...rc/main/archetype/mp/custom/custom-mp.xml → ...rc/main/archetype/mp/custom/custom-mp.xml
diff --git a/...in/archetype/mp/custom/database-input.xml → ...in/archetype/mp/custom/database-input.xml b/...in/archetype/mp/custom/database-input.xml → ...in/archetype/mp/custom/database-input.xml
diff --git a/.../archetype/mp/custom/database-outputs.xml → .../archetype/mp/custom/database-outputs.xml b/.../archetype/mp/custom/database-outputs.xml → .../archetype/mp/custom/database-outputs.xml
diff --git a/...mp/custom/files/README.native.md.mustache → ...mp/custom/files/README.native.md.mustache b/...mp/custom/files/README.native.md.mustache → ...mp/custom/files/README.native.md.mustache
diff --git a/...ype/mp/custom/files/application.abac.yaml → ...ype/mp/custom/files/application.abac.yaml b/...ype/mp/custom/files/application.abac.yaml → ...ype/mp/custom/files/application.abac.yaml
diff --git a/...e/mp/custom/files/application.google.yaml → ...e/mp/custom/files/application.google.yaml b/...e/mp/custom/files/application.google.yaml → ...e/mp/custom/files/application.google.yaml
diff --git a/...tom/files/application.http-signature.yaml → ...tom/files/application.http-signature.yaml b/...tom/files/application.http-signature.yaml → ...tom/files/application.http-signature.yaml
diff --git a/...ype/mp/custom/files/application.oidc.yaml → ...ype/mp/custom/files/application.oidc.yaml b/...ype/mp/custom/files/application.oidc.yaml → ...ype/mp/custom/files/application.oidc.yaml
diff --git a/...stom/files/microprofile-config.properties → ...stom/files/microprofile-config.properties b/...stom/files/microprofile-config.properties → ...stom/files/microprofile-config.properties
diff --git a/...pkg__/FileService.java.multipart.mustache → ...pkg__/FileService.java.multipart.mustache b/...pkg__/FileService.java.multipart.mustache → ...pkg__/FileService.java.multipart.mustache
diff --git a/...pkg__/FileStorage.java.multipart.mustache → ...pkg__/FileStorage.java.multipart.mustache b/...pkg__/FileStorage.java.multipart.mustache → ...pkg__/FileStorage.java.multipart.mustache
diff --git a/...ain/java/__pkg__/FtResource.java.mustache → ...ain/java/__pkg__/FtResource.java.mustache b/...ain/java/__pkg__/FtResource.java.mustache → ...ain/java/__pkg__/FtResource.java.mustache
diff --git a/...java/__pkg__/JwtApplication.java.mustache → ...java/__pkg__/JwtApplication.java.mustache b/...java/__pkg__/JwtApplication.java.mustache → ...java/__pkg__/JwtApplication.java.mustache
diff --git a/...in/java/__pkg__/JwtResource.java.mustache → ...in/java/__pkg__/JwtResource.java.mustache b/...in/java/__pkg__/JwtResource.java.mustache → ...in/java/__pkg__/JwtResource.java.mustache
diff --git a/...n/java/__pkg__/Message.java.json.mustache → ...n/java/__pkg__/Message.java.json.mustache b/...n/java/__pkg__/Message.java.json.mustache → ...n/java/__pkg__/Message.java.json.mustache
diff --git a/...rtFeatureProvider.java.multipart.mustache → ...rtFeatureProvider.java.multipart.mustache b/...rtFeatureProvider.java.multipart.mustache → ...rtFeatureProvider.java.multipart.mustache
diff --git a/...n/java/__pkg__/OidcResource.java.mustache → ...n/java/__pkg__/OidcResource.java.mustache b/...n/java/__pkg__/OidcResource.java.mustache → ...n/java/__pkg__/OidcResource.java.mustache
diff --git a/...__/SimpleGreetResource.java.json.mustache → ...__/SimpleGreetResource.java.json.mustache b/...__/SimpleGreetResource.java.json.mustache → ...__/SimpleGreetResource.java.json.mustache
diff --git a/..._/SimpleGreetResource.java.jsonp.mustache → ..._/SimpleGreetResource.java.jsonp.mustache b/..._/SimpleGreetResource.java.jsonp.mustache → ..._/SimpleGreetResource.java.jsonp.mustache
diff --git a/...__pkg__/SimpleGreetResource.java.mustache → ...__pkg__/SimpleGreetResource.java.mustache b/...__pkg__/SimpleGreetResource.java.mustache → ...__pkg__/SimpleGreetResource.java.mustache
diff --git a/...java/__pkg__/TracedResource.java.mustache → ...java/__pkg__/TracedResource.java.mustache b/...java/__pkg__/TracedResource.java.mustache → ...java/__pkg__/TracedResource.java.mustache
diff --git a/.../main/resources/application.yaml.mustache → .../main/resources/application.yaml.mustache b/.../main/resources/application.yaml.mustache → .../main/resources/application.yaml.mustache
diff --git a/..._/FileServiceTest.java.multipart.mustache → ..._/FileServiceTest.java.multipart.mustache b/..._/FileServiceTest.java.multipart.mustache → ..._/FileServiceTest.java.multipart.mustache
diff --git a/...java/__pkg__/FtResourceTest.java.mustache → ...java/__pkg__/FtResourceTest.java.mustache b/...java/__pkg__/FtResourceTest.java.mustache → ...java/__pkg__/FtResourceTest.java.mustache
diff --git a/.../test/java/__pkg__/TestCORS.java.mustache → .../test/java/__pkg__/TestCORS.java.mustache b/.../test/java/__pkg__/TestCORS.java.mustache → .../test/java/__pkg__/TestCORS.java.mustache
diff --git a/...ain/archetype/mp/custom/observability.xml → ...ain/archetype/mp/custom/observability.xml b/...ain/archetype/mp/custom/observability.xml → ...ain/archetype/mp/custom/observability.xml
diff --git a/.../archetype/mp/custom/security-outputs.xml → .../archetype/mp/custom/security-outputs.xml b/.../archetype/mp/custom/security-outputs.xml → .../archetype/mp/custom/security-outputs.xml
diff --git a/...n/archetype/mp/custom/tracing-outputs.xml → ...n/archetype/mp/custom/tracing-outputs.xml b/...n/archetype/mp/custom/tracing-outputs.xml → ...n/archetype/mp/custom/tracing-outputs.xml
diff --git a/...ain/archetype/mp/database/database-mp.xml → ...ain/archetype/mp/database/database-mp.xml b/...ain/archetype/mp/database/database-mp.xml → ...ain/archetype/mp/database/database-mp.xml
diff --git a/...ain/archetype/mp/database/files/README.md → ...ain/archetype/mp/database/files/README.md b/...ain/archetype/mp/database/files/README.md → ...ain/archetype/mp/database/files/README.md
diff --git a/...c/main/java/__pkg__/Pokemon.java.mustache → ...c/main/java/__pkg__/Pokemon.java.mustache b/...c/main/java/__pkg__/Pokemon.java.mustache → ...c/main/java/__pkg__/Pokemon.java.mustache
diff --git a/...ava/__pkg__/PokemonResource.java.mustache → ...ava/__pkg__/PokemonResource.java.mustache b/...ava/__pkg__/PokemonResource.java.mustache → ...ava/__pkg__/PokemonResource.java.mustache
diff --git a/...in/java/__pkg__/PokemonType.java.mustache → ...in/java/__pkg__/PokemonType.java.mustache b/...in/java/__pkg__/PokemonType.java.mustache → ...in/java/__pkg__/PokemonType.java.mustache
diff --git a/...__pkg__/PokemonTypeResource.java.mustache → ...__pkg__/PokemonTypeResource.java.mustache b/...__pkg__/PokemonTypeResource.java.mustache → ...__pkg__/PokemonTypeResource.java.mustache
diff --git a/...META-INF/helidon/serial-config.properties → ...META-INF/helidon/serial-config.properties b/...META-INF/helidon/serial-config.properties → ...META-INF/helidon/serial-config.properties
diff --git a/...c/main/resources/META-INF/init_script.sql → ...c/main/resources/META-INF/init_script.sql b/...c/main/resources/META-INF/init_script.sql → ...c/main/resources/META-INF/init_script.sql
diff --git a/...sources/META-INF/persistence.xml.mustache → ...sources/META-INF/persistence.xml.mustache b/...sources/META-INF/persistence.xml.mustache → ...sources/META-INF/persistence.xml.mustache
diff --git a/...n/resources/hibernate.properties.mustache → ...n/resources/hibernate.properties.mustache b/...n/resources/hibernate.properties.mustache → ...n/resources/hibernate.properties.mustache
diff --git a/...ypes/helidon/src/main/archetype/mp/mp.xml → ...s/archetypes/src/main/archetype/mp/mp.xml b/...ypes/helidon/src/main/archetype/mp/mp.xml → ...s/archetypes/src/main/archetype/mp/mp.xml
diff --git a/...hetype/mp/oci/files/README-Description.md → ...hetype/mp/oci/files/README-Description.md b/...hetype/mp/oci/files/README-Description.md → ...hetype/mp/oci/files/README-Description.md
diff --git a/...pe/mp/oci/files/client/README.md.mustache → ...pe/mp/oci/files/client/README.md.mustache b/...pe/mp/oci/files/client/README.md.mustache → ...pe/mp/oci/files/client/README.md.mustache
diff --git a/...type/mp/oci/files/client/pom.xml.mustache → ...type/mp/oci/files/client/pom.xml.mustache b/...type/mp/oci/files/client/pom.xml.mustache → ...type/mp/oci/files/client/pom.xml.mustache
diff --git a/...n/archetype/mp/oci/files/pom.xml.mustache → ...n/archetype/mp/oci/files/pom.xml.mustache b/...n/archetype/mp/oci/files/pom.xml.mustache → ...n/archetype/mp/oci/files/pom.xml.mustache
diff --git a/...pe/mp/oci/files/server/README.md.mustache → ...pe/mp/oci/files/server/README.md.mustache b/...pe/mp/oci/files/server/README.md.mustache → ...pe/mp/oci/files/server/README.md.mustache
diff --git a/..._/server/GreetLivenessCheck.java.mustache → ..._/server/GreetLivenessCheck.java.mustache b/..._/server/GreetLivenessCheck.java.mustache → ..._/server/GreetLivenessCheck.java.mustache
diff --git a/.../server/GreetReadinessCheck.java.mustache → .../server/GreetReadinessCheck.java.mustache b/.../server/GreetReadinessCheck.java.mustache → .../server/GreetReadinessCheck.java.mustache
diff --git a/..._pkg__/server/GreetResource.java.mustache → ..._pkg__/server/GreetResource.java.mustache b/..._pkg__/server/GreetResource.java.mustache → ..._pkg__/server/GreetResource.java.mustache
diff --git a/...g__/server/GreetingProvider.java.mustache → ...g__/server/GreetingProvider.java.mustache b/...g__/server/GreetingProvider.java.mustache → ...g__/server/GreetingProvider.java.mustache
diff --git a/...__pkg__/server/package-info.java.mustache → ...__pkg__/server/package-info.java.mustache b/...__pkg__/server/package-info.java.mustache → ...__pkg__/server/package-info.java.mustache
diff --git a/...A-INF/microprofile-config-prod.properties → ...A-INF/microprofile-config-prod.properties b/...A-INF/microprofile-config-prod.properties → ...A-INF/microprofile-config-prod.properties
diff --git a/...A-INF/microprofile-config-test.properties → ...A-INF/microprofile-config-test.properties b/...A-INF/microprofile-config-test.properties → ...A-INF/microprofile-config-test.properties
diff --git a/.../java/__pkg__/server/Common.java.mustache → .../java/__pkg__/server/Common.java.mustache b/.../java/__pkg__/server/Common.java.mustache → .../java/__pkg__/server/Common.java.mustache
diff --git a/...GreetResourceConfigFileTest.java.mustache → ...GreetResourceConfigFileTest.java.mustache b/...GreetResourceConfigFileTest.java.mustache → ...GreetResourceConfigFileTest.java.mustache
diff --git a/...sourceInstancePrincipalTest.java.mustache → ...sourceInstancePrincipalTest.java.mustache b/...sourceInstancePrincipalTest.java.mustache → ...sourceInstancePrincipalTest.java.mustache
diff --git a/...ver/GreetResourceMockedTest.java.mustache → ...ver/GreetResourceMockedTest.java.mustache b/...ver/GreetResourceMockedTest.java.mustache → ...ver/GreetResourceMockedTest.java.mustache
diff --git a/...ain/archetype/mp/oci/files/spec/README.md → ...ain/archetype/mp/oci/files/spec/README.md b/...ain/archetype/mp/oci/files/spec/README.md → ...ain/archetype/mp/oci/files/spec/README.md
diff --git a/...main/archetype/mp/oci/files/spec/api.yaml → ...main/archetype/mp/oci/files/spec/api.yaml b/...main/archetype/mp/oci/files/spec/api.yaml → ...main/archetype/mp/oci/files/spec/api.yaml
diff --git a/...idon/src/main/archetype/mp/oci/oci-mp.xml → ...ypes/src/main/archetype/mp/oci/oci-mp.xml b/...idon/src/main/archetype/mp/oci/oci-mp.xml → ...ypes/src/main/archetype/mp/oci/oci-mp.xml
diff --git a/...tart/files/microprofile-config.properties → ...tart/files/microprofile-config.properties b/...tart/files/microprofile-config.properties → ...tart/files/microprofile-config.properties
diff --git a/.../__pkg__/GreetResource.java.json.mustache → .../__pkg__/GreetResource.java.json.mustache b/.../__pkg__/GreetResource.java.json.mustache → .../__pkg__/GreetResource.java.json.mustache
diff --git a/...__pkg__/GreetResource.java.jsonp.mustache → ...__pkg__/GreetResource.java.jsonp.mustache b/...__pkg__/GreetResource.java.jsonp.mustache → ...__pkg__/GreetResource.java.jsonp.mustache
diff --git a/...va/__pkg__/GreetingProvider.java.mustache → ...va/__pkg__/GreetingProvider.java.mustache b/...va/__pkg__/GreetingProvider.java.mustache → ...va/__pkg__/GreetingProvider.java.mustache
diff --git a/...archetype/mp/quickstart/quickstart-mp.xml → ...archetype/mp/quickstart/quickstart-mp.xml b/...archetype/mp/quickstart/quickstart-mp.xml → ...archetype/mp/quickstart/quickstart-mp.xml
diff --git a/...rc/main/archetype/se/common/common-se.xml → ...rc/main/archetype/se/common/common-se.xml b/...rc/main/archetype/se/common/common-se.xml → ...rc/main/archetype/se/common/common-se.xml
diff --git a/...n/java/__pkg__/package-info.java.mustache → ...n/java/__pkg__/package-info.java.mustache b/...n/java/__pkg__/package-info.java.mustache → ...n/java/__pkg__/package-info.java.mustache
diff --git a/.../main/resources/application.yaml.mustache → .../main/resources/application.yaml.mustache b/.../main/resources/application.yaml.mustache → .../main/resources/application.yaml.mustache
diff --git a/...ain/resources/logging.properties.mustache → ...ain/resources/logging.properties.mustache b/...ain/resources/logging.properties.mustache → ...ain/resources/logging.properties.mustache
diff --git a/...va/__pkg__/AbstractMainTest.java.mustache → ...va/__pkg__/AbstractMainTest.java.mustache b/...va/__pkg__/AbstractMainTest.java.mustache → ...va/__pkg__/AbstractMainTest.java.mustache
diff --git a/...rc/test/java/__pkg__/MainIT.java.mustache → ...rc/test/java/__pkg__/MainIT.java.mustache b/...rc/test/java/__pkg__/MainIT.java.mustache → ...rc/test/java/__pkg__/MainIT.java.mustache
diff --git a/.../test/java/__pkg__/MainTest.java.mustache → .../test/java/__pkg__/MainTest.java.mustache b/.../test/java/__pkg__/MainTest.java.mustache → .../test/java/__pkg__/MainTest.java.mustache
diff --git a/.../resources/application-test.yaml.mustache → .../resources/application-test.yaml.mustache b/.../resources/application-test.yaml.mustache → .../resources/application-test.yaml.mustache
diff --git a/...rc/main/archetype/se/custom/custom-se.xml → ...rc/main/archetype/se/custom/custom-se.xml b/...rc/main/archetype/se/custom/custom-se.xml → ...rc/main/archetype/se/custom/custom-se.xml
diff --git a/...n/archetype/se/custom/database-inputs.xml → ...n/archetype/se/custom/database-inputs.xml b/...n/archetype/se/custom/database-inputs.xml → ...n/archetype/se/custom/database-inputs.xml
diff --git a/...n/archetype/se/custom/database-output.xml → ...n/archetype/se/custom/database-output.xml b/...n/archetype/se/custom/database-output.xml → ...n/archetype/se/custom/database-output.xml
diff --git a/...on/src/main/archetype/se/custom/extra.xml → ...es/src/main/archetype/se/custom/extra.xml b/...on/src/main/archetype/se/custom/extra.xml → ...es/src/main/archetype/se/custom/extra.xml
diff --git a/...se/custom/files/README.md.native.mustache → ...se/custom/files/README.md.native.mustache b/...se/custom/files/README.md.native.mustache → ...se/custom/files/README.md.native.mustache
diff --git a/...type/se/custom/files/application.jwt.yaml → ...type/se/custom/files/application.jwt.yaml b/...type/se/custom/files/application.jwt.yaml → ...type/se/custom/files/application.jwt.yaml
diff --git a/...pkg__/FileService.java.multipart.mustache → ...pkg__/FileService.java.multipart.mustache b/...pkg__/FileService.java.multipart.mustache → ...pkg__/FileService.java.multipart.mustache
diff --git a/...main/java/__pkg__/FtService.java.mustache → ...main/java/__pkg__/FtService.java.mustache b/...main/java/__pkg__/FtService.java.mustache → ...main/java/__pkg__/FtService.java.mustache
diff --git a/...a/__pkg__/GreetService.java.json.mustache → ...a/__pkg__/GreetService.java.json.mustache b/...a/__pkg__/GreetService.java.json.mustache → ...a/__pkg__/GreetService.java.json.mustache
diff --git a/.../__pkg__/GreetService.java.jsonp.mustache → .../__pkg__/GreetService.java.jsonp.mustache b/.../__pkg__/GreetService.java.jsonp.mustache → .../__pkg__/GreetService.java.jsonp.mustache
diff --git a/...n/java/__pkg__/GreetService.java.mustache → ...n/java/__pkg__/GreetService.java.mustache b/...n/java/__pkg__/GreetService.java.mustache → ...n/java/__pkg__/GreetService.java.mustache
diff --git a/.../__pkg__/JwtOverrideService.java.mustache → .../__pkg__/JwtOverrideService.java.mustache b/.../__pkg__/JwtOverrideService.java.mustache → .../__pkg__/JwtOverrideService.java.mustache
diff --git a/...n/java/__pkg__/Message.java.json.mustache → ...n/java/__pkg__/Message.java.json.mustache b/...n/java/__pkg__/Message.java.json.mustache → ...n/java/__pkg__/Message.java.json.mustache
diff --git a/.../main/java/__pkg__/Service1.java.mustache → .../main/java/__pkg__/Service1.java.mustache b/.../main/java/__pkg__/Service1.java.mustache → .../main/java/__pkg__/Service1.java.mustache
diff --git a/.../main/java/__pkg__/Service2.java.mustache → .../main/java/__pkg__/Service2.java.mustache b/.../main/java/__pkg__/Service2.java.mustache → .../main/java/__pkg__/Service2.java.mustache
diff --git a/.../java/__pkg__/TracedService.java.mustache → .../java/__pkg__/TracedService.java.mustache b/.../java/__pkg__/TracedService.java.mustache → .../java/__pkg__/TracedService.java.mustache
diff --git a/.../java/__pkg__/WebClientMain.java.mustache → .../java/__pkg__/WebClientMain.java.mustache b/.../java/__pkg__/WebClientMain.java.mustache → .../java/__pkg__/WebClientMain.java.mustache
diff --git a/.../src/main/resources/WEB/google-login.html → .../src/main/resources/WEB/google-login.html b/.../src/main/resources/WEB/google-login.html → .../src/main/resources/WEB/google-login.html
diff --git a/...m/files/src/main/resources/WEB/index.html → ...m/files/src/main/resources/WEB/index.html b/...m/files/src/main/resources/WEB/index.html → ...m/files/src/main/resources/WEB/index.html
diff --git a/...ain/resources/WEB/static.js/google-app.js → ...ain/resources/WEB/static.js/google-app.js b/...ain/resources/WEB/static.js/google-app.js → ...ain/resources/WEB/static.js/google-app.js
diff --git a/...c/main/resources/backend-service-jwt.yaml → ...c/main/resources/backend-service-jwt.yaml b/...c/main/resources/backend-service-jwt.yaml → ...c/main/resources/backend-service-jwt.yaml
diff --git a/...rc/main/resources/client-service-jwt.yaml → ...rc/main/resources/client-service-jwt.yaml b/...rc/main/resources/client-service-jwt.yaml → ...rc/main/resources/client-service-jwt.yaml
diff --git a/...files/src/main/resources/signing-jwk.json → ...files/src/main/resources/signing-jwk.json b/...files/src/main/resources/signing-jwk.json → ...files/src/main/resources/signing-jwk.json
diff --git a/...les/src/main/resources/verifying-jwk.json → ...les/src/main/resources/verifying-jwk.json b/...les/src/main/resources/verifying-jwk.json → ...les/src/main/resources/verifying-jwk.json
diff --git a/...g__/OutboundOverrideJwtTest.java.mustache → ...g__/OutboundOverrideJwtTest.java.mustache b/...g__/OutboundOverrideJwtTest.java.mustache → ...g__/OutboundOverrideJwtTest.java.mustache
diff --git a/...a/__pkg__/SignatureMainTest.java.mustache → ...a/__pkg__/SignatureMainTest.java.mustache b/...a/__pkg__/SignatureMainTest.java.mustache → ...a/__pkg__/SignatureMainTest.java.mustache
diff --git a/...ain/archetype/se/custom/observability.xml → ...ain/archetype/se/custom/observability.xml b/...ain/archetype/se/custom/observability.xml → ...ain/archetype/se/custom/observability.xml
diff --git a/.../archetype/se/custom/security-outputs.xml → .../archetype/se/custom/security-outputs.xml b/.../archetype/se/custom/security-outputs.xml → .../archetype/se/custom/security-outputs.xml
diff --git a/...n/archetype/se/custom/tracing-outputs.xml → ...n/archetype/se/custom/tracing-outputs.xml b/...n/archetype/se/custom/tracing-outputs.xml → ...n/archetype/se/custom/tracing-outputs.xml
diff --git a/...ain/archetype/se/database/database-se.xml → ...ain/archetype/se/database/database-se.xml b/...ain/archetype/se/database/database-se.xml → ...ain/archetype/se/database/database-se.xml
diff --git a/...base/files/application-jdbc.yaml.mustache → ...base/files/application-jdbc.yaml.mustache b/...base/files/application-jdbc.yaml.mustache → ...base/files/application-jdbc.yaml.mustache
diff --git a/...ase/files/application-mongo.yaml.mustache → ...ase/files/application-mongo.yaml.mustache b/...ase/files/application-mongo.yaml.mustache → ...ase/files/application-mongo.yaml.mustache
diff --git a/...files/application-test-jdbc.yaml.mustache → ...files/application-test-jdbc.yaml.mustache b/...files/application-test-jdbc.yaml.mustache → ...files/application-test-jdbc.yaml.mustache
diff --git a/...iles/application-test-mongo.yaml.mustache → ...iles/application-test-mongo.yaml.mustache b/...iles/application-test-mongo.yaml.mustache → ...iles/application-test-mongo.yaml.mustache
diff --git a/...c/main/java/__pkg__/Pokemon.java.mustache → ...c/main/java/__pkg__/Pokemon.java.mustache b/...c/main/java/__pkg__/Pokemon.java.mustache → ...c/main/java/__pkg__/Pokemon.java.mustache
diff --git a/.../java/__pkg__/PokemonMapper.java.mustache → .../java/__pkg__/PokemonMapper.java.mustache b/.../java/__pkg__/PokemonMapper.java.mustache → .../java/__pkg__/PokemonMapper.java.mustache
diff --git a/...pkg__/PokemonMapperProvider.java.mustache → ...pkg__/PokemonMapperProvider.java.mustache b/...pkg__/PokemonMapperProvider.java.mustache → ...pkg__/PokemonMapperProvider.java.mustache
diff --git a/...java/__pkg__/PokemonService.java.mustache → ...java/__pkg__/PokemonService.java.mustache b/...java/__pkg__/PokemonService.java.mustache → ...java/__pkg__/PokemonService.java.mustache
diff --git a/...on.dbclient.spi.DbMapperProvider.mustache → ...on.dbclient.spi.DbMapperProvider.mustache b/...on.dbclient.spi.DbMapperProvider.mustache → ...on.dbclient.spi.DbMapperProvider.mustache
diff --git a/...les/src/main/resources/pokemon-types.json → ...les/src/main/resources/pokemon-types.json b/...les/src/main/resources/pokemon-types.json → ...les/src/main/resources/pokemon-types.json
diff --git a/...se/files/src/main/resources/pokemons.json → ...se/files/src/main/resources/pokemons.json b/...se/files/src/main/resources/pokemons.json → ...se/files/src/main/resources/pokemons.json
diff --git a/...archetype/se/quickstart/quickstart-se.xml → ...archetype/se/quickstart/quickstart-se.xml b/...archetype/se/quickstart/quickstart-se.xml → ...archetype/se/quickstart/quickstart-se.xml
diff --git a/...ypes/helidon/src/main/archetype/se/se.xml → ...s/archetypes/src/main/archetype/se/se.xml b/...ypes/helidon/src/main/archetype/se/se.xml → ...s/archetypes/src/main/archetype/se/se.xml
diff --git a/...src/main/cli/metadata.properties.mustache → ...ypes/src/main/cli/metadata.properties.hbs b/...src/main/cli/metadata.properties.mustache → ...ypes/src/main/cli/metadata.properties.hbs
diff --git a/...elidon/src/main/cli/versions.xml.mustache → .../archetypes/src/main/cli/versions.xml.hbs b/...elidon/src/main/cli/versions.xml.mustache → .../archetypes/src/main/cli/versions.xml.hbs
diff --git a/archetypes/legacy/pom.xml b/archetypes/legacy/pom.xml
@@ -41,7 +41,7 @@
     <dependencies>
         <dependency>
             <groupId>io.helidon.archetypes</groupId>
-            <artifactId>helidon</artifactId>
+            <artifactId>helidon-archetypes</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -71,7 +71,7 @@
                             <!--suppress UnresolvedMavenProperty -->
                             <enum path="app-type">${app-type}</enum>
                         </presets>
-                        <exec url="mvn://io.helidon.archetypes:helidon:${project.version}!/main.xml"/>
+                        <exec url="mvn://io.helidon.archetypes:helidon-archetypes:${project.version}!/main.xml"/>
                     </entrypoint>
                 </configuration>
             </plugin>

diff --git a/archetypes/pom.xml b/archetypes/pom.xml
@@ -31,7 +31,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>helidon</module>
+        <module>archetypes</module>
         <module>legacy</module>
     </modules>