keycloakify 11.9.13 → 11.9.15

package/README.md

@@ -131,6 +131,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/wnmzzzz"><img src="https://avatars.githubusercontent.com/u/117174301?v=4?s=100" width="100px;" alt="wnmzzzz"/><br /><sub><b>wnmzzzz</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=wnmzzzz" title="Tests">⚠️</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/DerIch27"><img src="https://avatars.githubusercontent.com/u/62176944?v=4?s=100" width="100px;" alt="Lars Gottfriedsen"/><br /><sub><b>Lars Gottfriedsen</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=DerIch27" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://www.linkedin.com/in/antonioacg/"><img src="https://avatars.githubusercontent.com/u/8991621?v=4?s=100" width="100px;" alt="Antonio Casagrande"/><br /><sub><b>Antonio Casagrande</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=antonioacg" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/emouty"><img src="https://avatars.githubusercontent.com/u/16755668?v=4?s=100" width="100px;" alt="emouty"/><br /><sub><b>emouty</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=emouty" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

package/bin/511.index.js

@@ -1628,7 +1628,11 @@ async function buildJar(params) {
         await promises_.writeFile((0,external_path_.join)(keycloakifyBuildCacheDirPath, "pom.xml"), Buffer.from(pomFileCode, "utf8"));
     }
     {
-        const mvnBuildCmd = `mvn -B -ntp clean install -Dmaven.repo.local="${(0,external_path_.join)(keycloakifyBuildCacheDirPath, ".m2")}"`;
+        const useDefaultMavenRepo = process.env.KEYCLOAKIFY_USE_DEFAULT_MAVEN_REPO === "true";
+        const mavenLocalRepoArg = useDefaultMavenRepo
+            ? ""
+            : `-Dmaven.repo.local="${(0,external_path_.join)(buildContext.cacheDirPath, ".m2")}"`;
+        const mvnBuildCmd = `mvn -B -ntp clean install ${mavenLocalRepoArg}`.trim();
         await new Promise((resolve, reject) => external_child_process_default().exec(mvnBuildCmd, {
             cwd: keycloakifyBuildCacheDirPath,
             env: Object.assign(Object.assign({}, process.env), { MAVEN_OPTS: [process.env.MAVEN_OPTS, "-Xmx4096m"]

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "11.9.13",
+    "version": "11.9.15",
     "description": "Framework to create custom Keycloak UIs",
     "repository": {
         "type": "git",

package/src/bin/keycloakify/buildJars/buildJar.ts

@@ -3,13 +3,13 @@ import type {
     KeycloakAccountV1Version,
     KeycloakThemeAdditionalInfoExtensionVersion
 } from "./extensionVersions";
-import { join as pathJoin, dirname as pathDirname } from "path";
+import { dirname as pathDirname, join as pathJoin } from "path";
 import { transformCodebase } from "../../tools/transformCodebase";
 import type { BuildContext } from "../../shared/buildContext";
 import * as fs from "fs/promises";
 import {
-    generatePom,
-    BuildContextLike as BuildContextLike_generatePom
+    BuildContextLike as BuildContextLike_generatePom,
+    generatePom
 } from "./generatePom";
 import { readFileSync } from "fs";
 import { isInside } from "../../tools/isInside";
@@ -222,7 +222,14 @@ export async function buildJar(params: {
     }
 
     {
-        const mvnBuildCmd = `mvn -B -ntp clean install -Dmaven.repo.local="${pathJoin(keycloakifyBuildCacheDirPath, ".m2")}"`;
+        const useDefaultMavenRepo =
+            process.env.KEYCLOAKIFY_USE_DEFAULT_MAVEN_REPO === "true";
+
+        const mavenLocalRepoArg = useDefaultMavenRepo
+            ? ""
+            : `-Dmaven.repo.local="${pathJoin(buildContext.cacheDirPath, ".m2")}"`;
+
+        const mvnBuildCmd = `mvn -B -ntp clean install ${mavenLocalRepoArg}`.trim();
 
         await new Promise<void>((resolve, reject) =>
             child_process.exec(

package/src/bin/keycloakify/generateFtl/kcContextDeclarationTemplate.ftl

@@ -177,7 +177,7 @@ function decodeHtmlEntities(htmlStr){
                 <#break>
             </#if>
 
-            <#local abort = "ABORT: should not be exposed">
+            <#local abort = "ABORT:Should not be exposed ">
 
             <#if stringified?starts_with("java.util.stream.")>
                 <#return abort>
@@ -232,7 +232,7 @@ function decodeHtmlEntities(htmlStr){
 
             </#list>
 
-            <#local outSeq += ["/* class: " + stringified?replace("@\\s*[0-9a-fA-F]+$", "") + "*/"]>
+            <#local outSeq += ["/* class: " + stringified?replace("@\\s*[0-9a-fA-F]+$", "", "r") + " */"]>
 
         </#list>