diff --git a/modello-maven-plugin/src/it/clone-java5/invoker.properties b/modello-maven-plugin/src/it/clone-java5/invoker.properties deleted file mode 100644 index e3ae08259..000000000 --- a/modello-maven-plugin/src/it/clone-java5/invoker.properties +++ /dev/null @@ -1 +0,0 @@ -invoker.java.version = 1.5+ diff --git a/modello-maven-plugin/src/it/clone-java5/pom.xml b/modello-maven-plugin/src/it/clone-java5/pom.xml index ed0a95b2e..caa4c500d 100644 --- a/modello-maven-plugin/src/it/clone-java5/pom.xml +++ b/modello-maven-plugin/src/it/clone-java5/pom.xml @@ -33,8 +33,8 @@ maven-compiler-plugin 3.8.0 - @java.version@ - @java.version@ + @javaVersion@ + @javaVersion@ diff --git a/modello-maven-plugin/src/it/clone/pom.xml b/modello-maven-plugin/src/it/clone/pom.xml index cde9a4f3b..e0aa14123 100644 --- a/modello-maven-plugin/src/it/clone/pom.xml +++ b/modello-maven-plugin/src/it/clone/pom.xml @@ -33,8 +33,8 @@ maven-compiler-plugin 3.8.0 - @java.version@ - @java.version@ + @javaVersion@ + @javaVersion@ diff --git a/modello-maven-plugin/src/it/dom4j-no-plexus-utils/pom.xml b/modello-maven-plugin/src/it/dom4j-no-plexus-utils/pom.xml index 1e70c97a0..dda607fbb 100644 --- a/modello-maven-plugin/src/it/dom4j-no-plexus-utils/pom.xml +++ b/modello-maven-plugin/src/it/dom4j-no-plexus-utils/pom.xml @@ -31,8 +31,8 @@ maven-compiler-plugin 3.8.0 - @java.version@ - @java.version@ + @javaVersion@ + @javaVersion@ diff --git a/modello-maven-plugin/src/it/features/pom.xml b/modello-maven-plugin/src/it/features/pom.xml index b04eab27d..1f5123683 100644 --- a/modello-maven-plugin/src/it/features/pom.xml +++ b/modello-maven-plugin/src/it/features/pom.xml @@ -55,8 +55,8 @@ maven-compiler-plugin 3.8.0 - @java.version@ - @java.version@ + @javaVersion@ + @javaVersion@ diff --git a/modello-maven-plugin/src/it/javadoc/invoker.properties b/modello-maven-plugin/src/it/javadoc/invoker.properties deleted file mode 100644 index b3d7e920c..000000000 --- a/modello-maven-plugin/src/it/javadoc/invoker.properties +++ /dev/null @@ -1,2 +0,0 @@ -invoker.goals = generate-sources javadoc:javadoc -invoker.java.version = 1.5+ diff --git a/modello-maven-plugin/src/it/javadoc/pom.xml b/modello-maven-plugin/src/it/javadoc/pom.xml index c6088472b..a0033aa39 100644 --- a/modello-maven-plugin/src/it/javadoc/pom.xml +++ b/modello-maven-plugin/src/it/javadoc/pom.xml @@ -18,7 +18,7 @@ junit @junitVersion@ - + org.dom4j dom4j @@ -52,8 +52,8 @@ maven-compiler-plugin 3.8.0 - @java.version@ - @java.version@ + @javaVersion@ + @javaVersion@ diff --git a/modello-maven-plugin/src/it/jdom-no-plexus-utils/pom.xml b/modello-maven-plugin/src/it/jdom-no-plexus-utils/pom.xml index 41e732966..7f2f65d7d 100644 --- a/modello-maven-plugin/src/it/jdom-no-plexus-utils/pom.xml +++ b/modello-maven-plugin/src/it/jdom-no-plexus-utils/pom.xml @@ -31,8 +31,8 @@ maven-compiler-plugin 3.8.0 - @java.version@ - @java.version@ + @javaVersion@ + @javaVersion@ diff --git a/modello-maven-plugin/src/it/maven-model/pom.xml b/modello-maven-plugin/src/it/maven-model/pom.xml index 58e7e298f..1c125fb7f 100644 --- a/modello-maven-plugin/src/it/maven-model/pom.xml +++ b/modello-maven-plugin/src/it/maven-model/pom.xml @@ -14,8 +14,8 @@ maven-compiler-plugin 3.8.0 - @java.version@ - @java.version@ + @javaVersion@ + @javaVersion@ diff --git a/modello-maven-plugin/src/it/snakeyaml/invoker.properties b/modello-maven-plugin/src/it/snakeyaml/invoker.properties deleted file mode 100644 index e3ae08259..000000000 --- a/modello-maven-plugin/src/it/snakeyaml/invoker.properties +++ /dev/null @@ -1 +0,0 @@ -invoker.java.version = 1.5+ diff --git a/modello-maven-plugin/src/it/snakeyaml/pom.xml b/modello-maven-plugin/src/it/snakeyaml/pom.xml index cc3cf6621..9e5d6f062 100644 --- a/modello-maven-plugin/src/it/snakeyaml/pom.xml +++ b/modello-maven-plugin/src/it/snakeyaml/pom.xml @@ -23,8 +23,8 @@ maven-compiler-plugin 3.8.0 - @java.version@ - @java.version@ + @javaVersion@ + @javaVersion@ diff --git a/modello-maven-plugin/src/it/stax-no-plexus-utils/pom.xml b/modello-maven-plugin/src/it/stax-no-plexus-utils/pom.xml index cc4e184b2..1fc8bcd11 100644 --- a/modello-maven-plugin/src/it/stax-no-plexus-utils/pom.xml +++ b/modello-maven-plugin/src/it/stax-no-plexus-utils/pom.xml @@ -37,8 +37,8 @@ maven-compiler-plugin 3.8.0 - @java.version@ - @java.version@ + @javaVersion@ + @javaVersion@ diff --git a/pom.xml b/pom.xml index 40c13ab72..257e69b42 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus - 14 + 15 org.codehaus.modello @@ -220,18 +220,16 @@ - UTF-8 UTF-8 2.15.2 2.0.2 - 3.1.2 3.5.4 - 1.8 + 8 2023-06-06T22:23:45Z @@ -375,55 +373,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - 3.6.0 - - - org.apache.maven.plugins - maven-clean-plugin - 3.3.1 - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.3.0 - - - - true - false - - - - com.puppycrawl.tools - checkstyle - 9.3 - - - - - org.apache.maven.shared - maven-shared-resources - 5 - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-deploy-plugin - 3.1.1 - org.apache.maven.plugins maven-enforcer-plugin @@ -437,7 +386,7 @@ - ${java.version} + ${javaVersion} ${maven.version} @@ -447,16 +396,6 @@ - - org.apache.maven.plugins - maven-gpg-plugin - 3.1.0 - - - org.apache.maven.plugins - maven-install-plugin - 3.1.1 - org.apache.maven.plugins maven-jar-plugin @@ -478,11 +417,6 @@ false - - org.apache.maven.plugins - maven-project-info-reports-plugin - 3.4.5 - maven-release-plugin 3.0.1 @@ -492,44 +426,6 @@ modello-release - - org.apache.maven.plugins - maven-resources-plugin - 3.3.1 - - - org.apache.maven.plugins - maven-scm-publish-plugin - 3.2.1 - - ${project.scm.developerConnection} - gh-pages - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.0 - - - org.apache.maven.plugins - maven-site-plugin - 3.12.1 - - true - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.version} - - - org.apache.maven.plugins - maven-surefire-report-plugin - ${surefire.version} - org.apache.maven.plugins maven-verifier-plugin @@ -573,10 +469,6 @@ org.apache.maven.plugins maven-project-info-reports-plugin - - false - true - @@ -743,24 +635,16 @@ - - java21+ + java11+ - [21,) + [11,) com.diffplug.spotless spotless-maven-plugin - - - - 2.35.0 - - -