Merge pull request #9972 from murdos/enh/use-maven-java-release

enh: use "release" configuration for setting java version rather than "source" and "target"
jhipster · Jun 2, 2024 · fb5ca32 · fb5ca32
2 parents 54ddf64 + c8d5bc2
commit fb5ca32
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -283,8 +283,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${compiler-plugin.version}</version>
         <configuration>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
+          <release>${java.version}</release>
           <parameters>true</parameters>
           <annotationProcessorPaths>
             <path>
@@ -509,7 +508,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>${maven-javadoc-plugin.version}</version>
         <configuration>
-          <source>${maven.compiler.source}</source>
+          <release>${java.version}</release>
           <quiet>true</quiet>
           <failOnWarnings>false</failOnWarnings>
           <failOnError>false</failOnError>

diff --git a/src/main/java/tech/jhipster/lite/generator/buildtool/maven/domain/MavenModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/buildtool/maven/domain/MavenModuleFactory.java
@@ -127,8 +127,7 @@ private MavenPlugin mavenCompilerPlugin() {
       .versionSlug("compiler-plugin")
       .configuration(
         """
-          <source>${java.version}</source>
-          <target>${java.version}</target>
+          <release>${java.version}</release>
           <parameters>true</parameters>
         """
       )

diff --git a/...test/java/tech/jhipster/lite/generator/buildtool/maven/domain/MavenModuleFactoryTest.java b/...test/java/tech/jhipster/lite/generator/buildtool/maven/domain/MavenModuleFactoryTest.java
@@ -44,8 +44,7 @@ void shouldBuildMavenModule() {
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${compiler-plugin.version}</version>
                 <configuration>
-                  <source>${java.version}</source>
-                  <target>${java.version}</target>
+                  <release>${java.version}</release>
                   <parameters>true</parameters>
                 </configuration>
               </plugin>

diff --git a/src/test/resources/generator/buildtool/maven/pom.test.xml b/src/test/resources/generator/buildtool/maven/pom.test.xml
@@ -75,8 +75,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${compiler-plugin.version}</version>
         <configuration>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
+          <release>${java.version}</release>
         </configuration>
       </plugin>
       <plugin>

diff --git a/src/test/resources/projects/init-maven/pom.xml b/src/test/resources/projects/init-maven/pom.xml
@@ -104,8 +104,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${compiler-plugin.version}</version>
         <configuration>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
+          <release>${java.version}</release>
         </configuration>
       </plugin>
       <plugin>