Set the artifactId name in the build option

This commit is contained in:
garronej
2023-02-04 19:36:42 +01:00
parent 4e6a290693
commit 243fbd4dc9
2 changed files with 5 additions and 7 deletions

View File

@ -51,7 +51,7 @@ export namespace BuildOptions {
extraPages?: string[]; extraPages?: string[];
extraThemeProperties?: string[]; extraThemeProperties?: string[];
groupId: string; groupId: string;
artifactId?: string; artifactId: string;
bundler: Bundler; bundler: Bundler;
}; };
@ -141,7 +141,7 @@ export function readBuildOptions(params: {
return KEYCLOAKIFY_BUNDLER ?? bundler ?? "keycloakify"; return KEYCLOAKIFY_BUNDLER ?? bundler ?? "keycloakify";
})(), })(),
"artifactId": process.env.KEYCLOAKIFY_ARTIFACT_ID ?? artifactId, "artifactId": process.env.KEYCLOAKIFY_ARTIFACT_ID ?? artifactId ?? `${themeName}-keycloak-theme`,
"groupId": (() => { "groupId": (() => {
const fallbackGroupId = `${themeName}.keycloak`; const fallbackGroupId = `${themeName}.keycloak`;

View File

@ -30,8 +30,6 @@ export function generateJavaStackFiles(params: {
doBundlesEmailTemplate doBundlesEmailTemplate
} = params; } = params;
const finalArtifactId = artifactId ?? `${themeName}-keycloak-theme`;
{ {
const { pomFileCode } = (function generatePomFileCode(): { const { pomFileCode } = (function generatePomFileCode(): {
pomFileCode: string; pomFileCode: string;
@ -43,9 +41,9 @@ export function generateJavaStackFiles(params: {
` xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">`, ` xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">`,
` <modelVersion>4.0.0</modelVersion>`, ` <modelVersion>4.0.0</modelVersion>`,
` <groupId>${groupId}</groupId>`, ` <groupId>${groupId}</groupId>`,
` <artifactId>${finalArtifactId}</artifactId>`, ` <artifactId>${artifactId}</artifactId>`,
` <version>${version}</version>`, ` <version>${version}</version>`,
` <name>${finalArtifactId}</name>`, ` <name>${artifactId}</name>`,
` <description />`, ` <description />`,
`</project>` `</project>`
].join("\n"); ].join("\n");
@ -84,6 +82,6 @@ export function generateJavaStackFiles(params: {
} }
return { return {
"jarFilePath": pathJoin(keycloakThemeBuildingDirPath, "target", `${finalArtifactId}-${version}.jar`) "jarFilePath": pathJoin(keycloakThemeBuildingDirPath, "target", `${artifactId}-${version}.jar`)
}; };
} }