From 80d4aebdc22569fd824112f15ed59779cb5d4491 Mon Sep 17 00:00:00 2001
From: altro3 <alexuyt@gmail.com>
Date: Mon, 30 Sep 2024 22:28:29 +0700
Subject: [PATCH] Revert jmustache to version 1.15

---
 gradle/libs.versions.toml      |  2 --
 openapi-adoc/build.gradle      | 14 ++++++------
 openapi-generator/build.gradle | 39 +++++++++++++++++-----------------
 3 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 73add0e993..b61ced3378 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,7 +21,6 @@ commons-codec = "1.17.1"
 commons-io = "2.17.0"
 commons-text = "1.12.0"
 guava = "33.3.1-jre"
-jmustache = "1.16"
 commonmark = "0.23.0"
 
 micronaut = "4.6.5"
@@ -92,4 +91,3 @@ commonmark = { module = "org.commonmark:commonmark", version.ref = "commonmark"
 openapi-generator = { module = "org.openapitools:openapi-generator", version.ref = "openapi-generator" }
 swagger-parser = { module = "io.swagger:swagger-parser", version.ref = "swagger-parser" }
 swagger-parser-v3 = { module = "io.swagger.parser.v3:swagger-parser-v3", version.ref = "swagger-parser-v3" }
-jmustache = { module = "com.samskivert:jmustache", version.ref = "jmustache" }
diff --git a/openapi-adoc/build.gradle b/openapi-adoc/build.gradle
index f15b176a25..c38d0403e3 100644
--- a/openapi-adoc/build.gradle
+++ b/openapi-adoc/build.gradle
@@ -10,16 +10,16 @@ micronautBuild {
 
 dependencies {
 
-    api libs.managed.pegdown
-    api libs.managed.parboiled
-    api libs.managed.jsoup
-    api libs.managed.freemarker
+    api(libs.managed.pegdown)
+    api(libs.managed.parboiled)
+    api(libs.managed.jsoup)
+    api(libs.managed.freemarker)
 
-    implementation projects.micronautOpenapiCommon
+    implementation(projects.micronautOpenapiCommon)
 
-    testImplementation mnTest.micronaut.test.junit5
+    testImplementation(mnTest.micronaut.test.junit5)
 
-    testRuntimeOnly mnTest.junit.jupiter.engine
+    testRuntimeOnly(mnTest.junit.jupiter.engine)
 }
 
 test {
diff --git a/openapi-generator/build.gradle b/openapi-generator/build.gradle
index 1213f45a4e..d874766b10 100644
--- a/openapi-generator/build.gradle
+++ b/openapi-generator/build.gradle
@@ -3,28 +3,27 @@ plugins {
 }
 
 dependencies {
-    api libs.openapi.generator
-    api libs.swagger.parser
-    api libs.swagger.parser.v3
-    api libs.commons.lang3
-    api libs.commons.text
-    api libs.commons.codec
-    api libs.commons.io
-    api libs.managed.evo.inflector
-    api libs.jmustache
-    api libs.commonmark
-    api libs.guava
-    api mnLogging.slf4j.ext
-    api mn.snakeyaml
+    api(libs.openapi.generator)
+    api(libs.swagger.parser)
+    api(libs.swagger.parser.v3)
+    api(libs.commons.lang3)
+    api(libs.commons.text)
+    api(libs.commons.codec)
+    api(libs.commons.io)
+    api(libs.managed.evo.inflector)
+    api(libs.commonmark)
+    api(libs.guava)
+    api(mnLogging.slf4j.ext)
+    api(mn.snakeyaml)
 
-    testImplementation mnTest.micronaut.test.junit5
-    testImplementation mnTest.junit.jupiter.params
+    testImplementation(mnTest.micronaut.test.junit5)
+    testImplementation(mnTest.junit.jupiter.params)
 
-    testFixturesImplementation mn.micronaut.inject
-    testFixturesImplementation mnTest.assertj.core
-    testFixturesImplementation libs.javaparser
-    testFixturesImplementation libs.openapi.generator
-    testFixturesImplementation mnTest.micronaut.test.junit5
+    testFixturesImplementation(mn.micronaut.inject)
+    testFixturesImplementation(mnTest.assertj.core)
+    testFixturesImplementation(libs.javaparser)
+    testFixturesImplementation(libs.openapi.generator)
+    testFixturesImplementation(mnTest.micronaut.test.junit5)
 
     testRuntimeOnly mnTest.junit.jupiter.engine
 }