hotfix: fix revision and other warnings in pom

oceanbase · Nov 11, 2024 · 6c01744 · 6c01744
1 parent dcf1af2
commit 6c01744
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 45 deletions.
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@ under the License.
 
     <groupId>com.oceanbase</groupId>
     <artifactId>spark-connector-oceanbase-parent</artifactId>
-    <version>${rversion}</version>
+    <version>${revision}</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -27,7 +27,10 @@ under the License.
     </modules>
 
     <properties>
-        <rversion>1.0-SNAPSHOT</rversion>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+        <revision>1.0-SNAPSHOT</revision>
         <scala.version>2.12.15</scala.version>
         <scala.binary.version>2.12</scala.binary.version>
         <slf4j.version>1.7.32</slf4j.version>
@@ -56,6 +59,14 @@ under the License.
                 <artifactId>junit</artifactId>
                 <version>${junit4.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers-bom</artifactId>
+                <version>${testcontainers.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -83,18 +94,9 @@ under the License.
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers-bom</artifactId>
-            <version>${testcontainers.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>oceanbase</artifactId>
-            <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -213,6 +215,11 @@ under the License.
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
                     <version>3.4.1</version>
+                    <configuration>
+                        <shadeTestJar>false</shadeTestJar>
+                        <shadedArtifactAttached>false</shadedArtifactAttached>
+                        <createDependencyReducedPom>false</createDependencyReducedPom>
+                    </configuration>
                 </plugin>
 
                 <!-- configure scala style -->
@@ -273,6 +280,7 @@ under the License.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -285,6 +293,7 @@ under the License.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
                 <configuration>
                     <quiet>true</quiet>
                 </configuration>
@@ -385,20 +394,6 @@ under the License.
                 <artifactId>spotless-maven-plugin</artifactId>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>${project.basedir}</directory>
-                            <includes>
-                                <include>dependency-reduced-pom.xml</include>
-                            </includes>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>flatten-maven-plugin</artifactId>

diff --git a/spark-connector-oceanbase-common/pom.xml b/spark-connector-oceanbase-common/pom.xml
@@ -18,9 +18,8 @@ under the License.
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>spark-connector-oceanbase-parent</artifactId>
-        <version>${rversion}</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>spark-connector-oceanbase-common</artifactId>
-    <version>${rversion}</version>
 </project>
diff --git a/spark-connector-oceanbase/pom.xml b/spark-connector-oceanbase/pom.xml
@@ -19,7 +19,7 @@ under the License.
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>spark-connector-oceanbase-parent</artifactId>
-        <version>${rversion}</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>spark-connector-oceanbase</artifactId>

diff --git a/spark-connector-oceanbase/spark-connector-oceanbase-2.4/pom.xml b/spark-connector-oceanbase/spark-connector-oceanbase-2.4/pom.xml
@@ -19,7 +19,7 @@ under the License.
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>spark-connector-oceanbase</artifactId>
-        <version>${rversion}</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>spark-connector-oceanbase-2.4_${scala.binary.version}</artifactId>
@@ -33,7 +33,7 @@ under the License.
         <dependency>
             <groupId>com.oceanbase</groupId>
             <artifactId>spark-connector-oceanbase-base</artifactId>
-            <version>${rversion}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -97,7 +97,6 @@ under the License.
                                     <include>com.lmax:disruptor</include>
                                 </includes>
                             </artifactSet>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <filters>
                                 <filter>
                                     <artifact>com.oceanbase:obkv-table-client</artifact>

diff --git a/spark-connector-oceanbase/spark-connector-oceanbase-3.1/pom.xml b/spark-connector-oceanbase/spark-connector-oceanbase-3.1/pom.xml
@@ -19,7 +19,7 @@ under the License.
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>spark-connector-oceanbase</artifactId>
-        <version>${rversion}</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>spark-connector-oceanbase-3.1_${scala.binary.version}</artifactId>
@@ -33,7 +33,7 @@ under the License.
         <dependency>
             <groupId>com.oceanbase</groupId>
             <artifactId>spark-connector-oceanbase-base</artifactId>
-            <version>${rversion}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

diff --git a/spark-connector-oceanbase/spark-connector-oceanbase-3.2/pom.xml b/spark-connector-oceanbase/spark-connector-oceanbase-3.2/pom.xml
@@ -19,7 +19,7 @@ under the License.
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>spark-connector-oceanbase</artifactId>
-        <version>${rversion}</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>spark-connector-oceanbase-3.2_${scala.binary.version}</artifactId>
@@ -33,7 +33,7 @@ under the License.
         <dependency>
             <groupId>com.oceanbase</groupId>
             <artifactId>spark-connector-oceanbase-base</artifactId>
-            <version>${rversion}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

diff --git a/spark-connector-oceanbase/spark-connector-oceanbase-3.3/pom.xml b/spark-connector-oceanbase/spark-connector-oceanbase-3.3/pom.xml
@@ -19,7 +19,7 @@ under the License.
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>spark-connector-oceanbase</artifactId>
-        <version>${rversion}</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>spark-connector-oceanbase-3.3_${scala.binary.version}</artifactId>
@@ -33,7 +33,7 @@ under the License.
         <dependency>
             <groupId>com.oceanbase</groupId>
             <artifactId>spark-connector-oceanbase-base</artifactId>
-            <version>${rversion}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

diff --git a/spark-connector-oceanbase/spark-connector-oceanbase-3.4/pom.xml b/spark-connector-oceanbase/spark-connector-oceanbase-3.4/pom.xml
@@ -19,7 +19,7 @@ under the License.
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>spark-connector-oceanbase</artifactId>
-        <version>${rversion}</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>spark-connector-oceanbase-3.4_${scala.binary.version}</artifactId>
@@ -33,7 +33,7 @@ under the License.
         <dependency>
             <groupId>com.oceanbase</groupId>
             <artifactId>spark-connector-oceanbase-base</artifactId>
-            <version>${rversion}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

diff --git a/spark-connector-oceanbase/spark-connector-oceanbase-base/pom.xml b/spark-connector-oceanbase/spark-connector-oceanbase-base/pom.xml
@@ -19,7 +19,7 @@ under the License.
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>spark-connector-oceanbase</artifactId>
-        <version>${rversion}</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>spark-connector-oceanbase-base</artifactId>
@@ -197,11 +197,6 @@ under the License.
             <artifactId>disruptor</artifactId>
             <version>3.4.2</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
     </dependencies>
 
     <build>