From f06b4795d9d4279f6d023fda1e78bdf54f20969e Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sun, 17 Nov 2024 14:56:17 +0100 Subject: [PATCH] [MINVOKER-373] Switch to Doxia 2 --- pom.xml | 11 +++++------ src/it/script-classpath-duplicates/pom.xml | 2 +- src/site/apt/groovy-version.apt.vm | 8 ++++---- src/site/site.xml | 6 +++--- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 58c8ee20..6ee4640c 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,10 @@ under the License. bsh 2.0b6 2024-10-18T16:49:15Z - 4.0.23 + 4.0.23 + + 3.21.0 + 2.0.0 @@ -97,7 +100,7 @@ under the License. org.apache.groovy groovy-bom - ${groovy-version} + ${groovyVersion} pom import @@ -389,10 +392,6 @@ under the License. run-its - - - 3.20.0 - diff --git a/src/it/script-classpath-duplicates/pom.xml b/src/it/script-classpath-duplicates/pom.xml index 589db482..04b3a6d0 100644 --- a/src/it/script-classpath-duplicates/pom.xml +++ b/src/it/script-classpath-duplicates/pom.xml @@ -43,7 +43,7 @@ under the License. org.apache.groovy groovy - @groovy-version@ + @groovyVersion@ pom test diff --git a/src/site/apt/groovy-version.apt.vm b/src/site/apt/groovy-version.apt.vm index 76a1aad6..959886c6 100644 --- a/src/site/apt/groovy-version.apt.vm +++ b/src/site/apt/groovy-version.apt.vm @@ -33,11 +33,11 @@ Groovy version and extensions Plugin <<>> in version <<<3.4.0>>> has only dependency on <<>> core add common extensions: - * <<>> + * <<>> - * <<>> + * <<>> - * <<>> + * <<>> [] @@ -56,7 +56,7 @@ Groovy version and extensions org.apache.groovy groovy-yaml - ${groovy-version} + ${groovyVersion} diff --git a/src/site/site.xml b/src/site/site.xml index a0932f76..89bcd9ef 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -19,8 +19,8 @@ specific language governing permissions and limitations under the License. --> - + @@ -56,4 +56,4 @@ under the License. - +