Remove duplicate properties & add lombok config

jd-opensource · May 5, 2024 · ef7ea78 · ef7ea78
1 parent a78bde9
commit ef7ea78
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 23 deletions.
diff --git a/joylive-bom/pom.xml b/joylive-bom/pom.xml
@@ -385,8 +385,8 @@
                         <artifactId>maven-compiler-plugin</artifactId>
                         <version>${maven-compiler-plugin.version}</version>
                         <configuration>
-                            <source>1.8</source>
-                            <target>1.8</target>
+                            <source>${maven.compiler.source}</source>
+                            <target>${maven.compiler.target}</target>
                             <encoding>${project.build.sourceEncoding}</encoding>
                             <compilerArgument>-parameters</compilerArgument>
                         </configuration>

diff --git a/joylive-core/joylive-governance-api/pom.xml b/joylive-core/joylive-governance-api/pom.xml
@@ -11,12 +11,6 @@
 
     <artifactId>joylive-governance-api</artifactId>
 
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.jd.live</groupId>

diff --git a/joylive-core/pom.xml b/joylive-core/pom.xml
@@ -18,10 +18,6 @@
         <module>joylive-governance-api</module>
     </modules>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

diff --git a/joylive-implement/joylive-event/joylive-event-opentelemetry/pom.xml b/joylive-implement/joylive-event/joylive-event-opentelemetry/pom.xml
@@ -12,9 +12,6 @@
     <artifactId>joylive-event-opentelemetry</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <opentelemetry-sdk.version>1.36.0</opentelemetry-sdk.version>
         <opentelemetry-exporter-prometheus.version>1.29.0-alpha</opentelemetry-exporter-prometheus.version>
         <protobuf-java.version>4.26.1</protobuf-java.version>

diff --git a/joylive-test/joylive-test-bytebuddy/pom.xml b/joylive-test/joylive-test-bytebuddy/pom.xml
@@ -11,12 +11,6 @@
 
     <artifactId>joylive-test-bytebuddy</artifactId>
 
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.jd.live</groupId>

diff --git a/lombok.config b/lombok.config
@@ -0,0 +1,16 @@
+#
+# Copyright Â© ${year} ${owner} (${email})
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+lombok.addLombokGeneratedAnnotation = true
diff --git a/pom.xml b/pom.xml
@@ -218,8 +218,8 @@
                         <artifactId>maven-compiler-plugin</artifactId>
                         <version>${maven-compiler-plugin.version}</version>
                         <configuration>
-                            <source>1.8</source>
-                            <target>1.8</target>
+                            <source>${maven.compiler.source}</source>
+                            <target>${maven.compiler.target}</target>
                             <encoding>${project.build.sourceEncoding}</encoding>
                             <compilerArgument>-parameters</compilerArgument>
                         </configuration>