[#noissue] Apply maven standard properties

pinpoint-apm · Mar 21, 2024 · ef690a5 · ef690a5
1 parent 75255b2
commit ef690a5
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 13 deletions.
diff --git a/agent-module/bootstraps/bootstrap-java15/pom.xml b/agent-module/bootstraps/bootstrap-java15/pom.xml
@@ -28,7 +28,6 @@
     <properties>
         <jdk.version>8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <javadoc.source>8</javadoc.source>
 
     </properties>
 

diff --git a/agent-module/bootstraps/bootstrap-java16/pom.xml b/agent-module/bootstraps/bootstrap-java16/pom.xml
@@ -28,7 +28,6 @@
     <properties>
         <jdk.version>8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <javadoc.source>8</javadoc.source>
     </properties>
 
     <artifactId>pinpoint-bootstrap-java16</artifactId>

diff --git a/agent-module/bootstraps/bootstrap-java9-internal/pom.xml b/agent-module/bootstraps/bootstrap-java9-internal/pom.xml
@@ -28,7 +28,6 @@
     <properties>
         <jdk.version>9</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
-        <javadoc.source>8</javadoc.source>
 
     </properties>
 

diff --git a/agent-module/bootstraps/bootstrap-java9/pom.xml b/agent-module/bootstraps/bootstrap-java9/pom.xml
@@ -28,7 +28,7 @@
     <properties>
         <jdk.version>9</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
-        <javadoc.source>8</javadoc.source>
+        <maven.compiler.release>9</maven.compiler.release>
 
     </properties>
 
@@ -92,9 +92,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <release>${jdk.version}</release>
-                </configuration>
             </plugin>
 
             <plugin>

diff --git a/agent-module/plugins/bom/pom.xml b/agent-module/plugins/bom/pom.xml
@@ -306,6 +306,7 @@
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
+                <version>${gson.version}</version>
             </dependency>
             <dependency>
                 <groupId>net.sf.json-lib</groupId>

diff --git a/pom.xml b/pom.xml
@@ -132,9 +132,11 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <jdk.version>1.8</jdk.version>
+        <maven.compiler.source>${jdk.version}</maven.compiler.source>
+        <maven.compiler.target>${jdk.version}</maven.compiler.target>
+        <maven.compiler.compilerVersion>${jdk.version}</maven.compiler.compilerVersion>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
         <test.jdk.home>${jdk.home}</test.jdk.home>
-        <javadoc.source>${jdk.version}</javadoc.source>
 
         <docker.repository.name>pinpointdocker</docker.repository.name>
 
@@ -1609,7 +1611,6 @@
                     <version>${plugin.pmd.version}</version>
                     <configuration>
                         <linkXRef>true</linkXRef>
-                        <targetJdk>${jdk.version}</targetJdk>
                         <excludes>
                             <exclude>com/navercorp/pinpoint/thrift/dto/**/*.java</exclude>
                             <exclude>com/navercorp/pinpoint/common/util/apache/**/*.java</exclude>
@@ -1693,15 +1694,12 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${plugin.compiler.version}</version>
                 <configuration>
-                    <source>${jdk.version}</source>
-                    <target>${jdk.version}</target>
                     <fork>true</fork>
                     <debug>true</debug>
                     <verbose>true</verbose>
                     <parameters>true</parameters>
                     <showDeprecation>true</showDeprecation>
                     <detail>true</detail>
-                    <compilerVersion>${jdk.version}</compilerVersion>
                     <executable>${jdk.home}/bin/javac</executable>
                 </configuration>
             </plugin>
@@ -1883,7 +1881,6 @@
                         <version>3.4.0</version>
                         <configuration>
                             <doclint>none</doclint>
-                            <source>${javadoc.source}</source>
 <!--                            <detectOfflineLinks>false</detectOfflineLinks>-->
 <!--                            <detectJavaApiLink>false</detectJavaApiLink>-->
                             <javadocExecutable>${jdk.home}/bin/javadoc</javadocExecutable>