Simplify the Java version configurations for main and test

vladmihalcea · Aug 24, 2022 · 8bb8ae9 · 8bb8ae9
1 parent b0a81d9
commit 8bb8ae9
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 36 deletions.
diff --git a/hibernate-types-60/pom.xml b/hibernate-types-60/pom.xml
@@ -172,40 +172,8 @@
 
     </dependencies>
 
-    <properties>
-        <jdk.version>11</jdk.version>
-        <jdk-test.version>17</jdk-test.version>
-
-        <hibernate.version>6.0.2.Final</hibernate.version>
-        <postgresql.version>42.4.1</postgresql.version>
-
-        <mysql.version>8.0.28</mysql.version>
-        <jackson-module-jakarta-xmlbind-annotation>2.13.3</jackson-module-jakarta-xmlbind-annotation>
-        <guava.version>31.1-jre</guava.version>
-        <moneta.version>1.4.2</moneta.version>
-
-        <ehcache.version>3.10.0</ehcache.version>
-        <jaxb-api.version>2.3.0</jaxb-api.version>
-        <jakarta-bind.api.version>3.0.1</jakarta-bind.api.version>
-
-        <hikari.version>4.0.3</hikari.version>
-        <aspectj.version>1.8.7</aspectj.version>
-        <spring.version>6.0.0-M5</spring.version>
-        <spring-data.version>3.0.0-M5</spring-data.version>
-
-    </properties>
-
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <release>${jdk.version}</release>
-                    <testRelease>${jdk-test.version}</testRelease>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -228,4 +196,29 @@
         </plugins>
     </build>
 
+    <properties>
+        <jdk.version>11</jdk.version>
+        <jdk-test.version>17</jdk-test.version>
+        <maven.compiler.release>${jdk.version}</maven.compiler.release>
+        <maven.compiler.testRelease>${jdk-test.version}</maven.compiler.testRelease>
+
+        <hibernate.version>6.0.2.Final</hibernate.version>
+        <postgresql.version>42.4.1</postgresql.version>
+
+        <mysql.version>8.0.28</mysql.version>
+        <jackson-module-jakarta-xmlbind-annotation>2.13.3</jackson-module-jakarta-xmlbind-annotation>
+        <guava.version>31.1-jre</guava.version>
+        <moneta.version>1.4.2</moneta.version>
+
+        <ehcache.version>3.10.0</ehcache.version>
+        <jaxb-api.version>2.3.0</jaxb-api.version>
+        <jakarta-bind.api.version>3.0.1</jakarta-bind.api.version>
+
+        <hikari.version>4.0.3</hikari.version>
+        <aspectj.version>1.8.7</aspectj.version>
+        <spring.version>6.0.0-M5</spring.version>
+        <spring-data.version>3.0.0-M5</spring-data.version>
+
+    </properties>
+
 </project>
diff --git a/pom.xml b/pom.xml
@@ -212,10 +212,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <source>${jdk.version}</source>
-                    <target>${jdk.version}</target>
-                    <testSource>${jdk-test.version}</testSource>
-                    <testTarget>${jdk-test.version}</testTarget>
                     <showDeprecation>true</showDeprecation>
                     <showWarnings>true</showWarnings>
                 </configuration>
@@ -378,6 +374,11 @@
         <jdk.version>6</jdk.version>
         <jdk-test.version>8</jdk-test.version>
 
+        <maven.compiler.source>${jdk.version}</maven.compiler.source>
+        <maven.compiler.target>${jdk.version}</maven.compiler.target>
+        <maven.compiler.testSource>${jdk-test.version}</maven.compiler.testSource>
+        <maven.compiler.testTarget>${jdk-test.version}</maven.compiler.testTarget>
+
         <console.log.level>DEBUG</console.log.level>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>