Skip to content

Commit 6c01744

Browse files
committed
hotfix: fix revision and other warnings in pom
1 parent dcf1af2 commit 6c01744

File tree

9 files changed

+33
-45
lines changed

9 files changed

+33
-45
lines changed

pom.xml

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ under the License.
1818

1919
<groupId>com.oceanbase</groupId>
2020
<artifactId>spark-connector-oceanbase-parent</artifactId>
21-
<version>${rversion}</version>
21+
<version>${revision}</version>
2222
<packaging>pom</packaging>
2323

2424
<modules>
@@ -27,7 +27,10 @@ under the License.
2727
</modules>
2828

2929
<properties>
30-
<rversion>1.0-SNAPSHOT</rversion>
30+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
31+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
32+
33+
<revision>1.0-SNAPSHOT</revision>
3134
<scala.version>2.12.15</scala.version>
3235
<scala.binary.version>2.12</scala.binary.version>
3336
<slf4j.version>1.7.32</slf4j.version>
@@ -56,6 +59,14 @@ under the License.
5659
<artifactId>junit</artifactId>
5760
<version>${junit4.version}</version>
5861
</dependency>
62+
63+
<dependency>
64+
<groupId>org.testcontainers</groupId>
65+
<artifactId>testcontainers-bom</artifactId>
66+
<version>${testcontainers.version}</version>
67+
<type>pom</type>
68+
<scope>import</scope>
69+
</dependency>
5970
</dependencies>
6071
</dependencyManagement>
6172

@@ -83,18 +94,9 @@ under the License.
8394
<scope>test</scope>
8495
</dependency>
8596

86-
<dependency>
87-
<groupId>org.testcontainers</groupId>
88-
<artifactId>testcontainers-bom</artifactId>
89-
<version>${testcontainers.version}</version>
90-
<type>pom</type>
91-
<scope>import</scope>
92-
</dependency>
93-
9497
<dependency>
9598
<groupId>org.testcontainers</groupId>
9699
<artifactId>oceanbase</artifactId>
97-
<version>${testcontainers.version}</version>
98100
<scope>test</scope>
99101
</dependency>
100102
</dependencies>
@@ -213,6 +215,11 @@ under the License.
213215
<groupId>org.apache.maven.plugins</groupId>
214216
<artifactId>maven-shade-plugin</artifactId>
215217
<version>3.4.1</version>
218+
<configuration>
219+
<shadeTestJar>false</shadeTestJar>
220+
<shadedArtifactAttached>false</shadedArtifactAttached>
221+
<createDependencyReducedPom>false</createDependencyReducedPom>
222+
</configuration>
216223
</plugin>
217224

218225
<!-- configure scala style -->
@@ -273,6 +280,7 @@ under the License.
273280
<plugin>
274281
<groupId>org.apache.maven.plugins</groupId>
275282
<artifactId>maven-source-plugin</artifactId>
283+
<version>3.2.1</version>
276284
<executions>
277285
<execution>
278286
<id>attach-sources</id>
@@ -285,6 +293,7 @@ under the License.
285293
<plugin>
286294
<groupId>org.apache.maven.plugins</groupId>
287295
<artifactId>maven-javadoc-plugin</artifactId>
296+
<version>2.9.1</version>
288297
<configuration>
289298
<quiet>true</quiet>
290299
</configuration>
@@ -385,20 +394,6 @@ under the License.
385394
<artifactId>spotless-maven-plugin</artifactId>
386395
</plugin>
387396

388-
<plugin>
389-
<groupId>org.apache.maven.plugins</groupId>
390-
<artifactId>maven-clean-plugin</artifactId>
391-
<configuration>
392-
<filesets>
393-
<fileset>
394-
<directory>${project.basedir}</directory>
395-
<includes>
396-
<include>dependency-reduced-pom.xml</include>
397-
</includes>
398-
</fileset>
399-
</filesets>
400-
</configuration>
401-
</plugin>
402397
<plugin>
403398
<groupId>org.codehaus.mojo</groupId>
404399
<artifactId>flatten-maven-plugin</artifactId>

spark-connector-oceanbase-common/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ under the License.
1818
<parent>
1919
<groupId>com.oceanbase</groupId>
2020
<artifactId>spark-connector-oceanbase-parent</artifactId>
21-
<version>${rversion}</version>
21+
<version>${revision}</version>
2222
</parent>
2323

2424
<artifactId>spark-connector-oceanbase-common</artifactId>
25-
<version>${rversion}</version>
2625
</project>

spark-connector-oceanbase/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ under the License.
1919
<parent>
2020
<groupId>com.oceanbase</groupId>
2121
<artifactId>spark-connector-oceanbase-parent</artifactId>
22-
<version>${rversion}</version>
22+
<version>${revision}</version>
2323
</parent>
2424

2525
<artifactId>spark-connector-oceanbase</artifactId>

spark-connector-oceanbase/spark-connector-oceanbase-2.4/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ under the License.
1919
<parent>
2020
<groupId>com.oceanbase</groupId>
2121
<artifactId>spark-connector-oceanbase</artifactId>
22-
<version>${rversion}</version>
22+
<version>${revision}</version>
2323
</parent>
2424

2525
<artifactId>spark-connector-oceanbase-2.4_${scala.binary.version}</artifactId>
@@ -33,7 +33,7 @@ under the License.
3333
<dependency>
3434
<groupId>com.oceanbase</groupId>
3535
<artifactId>spark-connector-oceanbase-base</artifactId>
36-
<version>${rversion}</version>
36+
<version>${project.version}</version>
3737
</dependency>
3838

3939
<dependency>
@@ -97,7 +97,6 @@ under the License.
9797
<include>com.lmax:disruptor</include>
9898
</includes>
9999
</artifactSet>
100-
<createDependencyReducedPom>false</createDependencyReducedPom>
101100
<filters>
102101
<filter>
103102
<artifact>com.oceanbase:obkv-table-client</artifact>

spark-connector-oceanbase/spark-connector-oceanbase-3.1/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ under the License.
1919
<parent>
2020
<groupId>com.oceanbase</groupId>
2121
<artifactId>spark-connector-oceanbase</artifactId>
22-
<version>${rversion}</version>
22+
<version>${revision}</version>
2323
</parent>
2424

2525
<artifactId>spark-connector-oceanbase-3.1_${scala.binary.version}</artifactId>
@@ -33,7 +33,7 @@ under the License.
3333
<dependency>
3434
<groupId>com.oceanbase</groupId>
3535
<artifactId>spark-connector-oceanbase-base</artifactId>
36-
<version>${rversion}</version>
36+
<version>${project.version}</version>
3737
</dependency>
3838

3939
<dependency>

spark-connector-oceanbase/spark-connector-oceanbase-3.2/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ under the License.
1919
<parent>
2020
<groupId>com.oceanbase</groupId>
2121
<artifactId>spark-connector-oceanbase</artifactId>
22-
<version>${rversion}</version>
22+
<version>${revision}</version>
2323
</parent>
2424

2525
<artifactId>spark-connector-oceanbase-3.2_${scala.binary.version}</artifactId>
@@ -33,7 +33,7 @@ under the License.
3333
<dependency>
3434
<groupId>com.oceanbase</groupId>
3535
<artifactId>spark-connector-oceanbase-base</artifactId>
36-
<version>${rversion}</version>
36+
<version>${project.version}</version>
3737
</dependency>
3838

3939
<dependency>

spark-connector-oceanbase/spark-connector-oceanbase-3.3/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ under the License.
1919
<parent>
2020
<groupId>com.oceanbase</groupId>
2121
<artifactId>spark-connector-oceanbase</artifactId>
22-
<version>${rversion}</version>
22+
<version>${revision}</version>
2323
</parent>
2424

2525
<artifactId>spark-connector-oceanbase-3.3_${scala.binary.version}</artifactId>
@@ -33,7 +33,7 @@ under the License.
3333
<dependency>
3434
<groupId>com.oceanbase</groupId>
3535
<artifactId>spark-connector-oceanbase-base</artifactId>
36-
<version>${rversion}</version>
36+
<version>${project.version}</version>
3737
</dependency>
3838

3939
<dependency>

spark-connector-oceanbase/spark-connector-oceanbase-3.4/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ under the License.
1919
<parent>
2020
<groupId>com.oceanbase</groupId>
2121
<artifactId>spark-connector-oceanbase</artifactId>
22-
<version>${rversion}</version>
22+
<version>${revision}</version>
2323
</parent>
2424

2525
<artifactId>spark-connector-oceanbase-3.4_${scala.binary.version}</artifactId>
@@ -33,7 +33,7 @@ under the License.
3333
<dependency>
3434
<groupId>com.oceanbase</groupId>
3535
<artifactId>spark-connector-oceanbase-base</artifactId>
36-
<version>${rversion}</version>
36+
<version>${project.version}</version>
3737
</dependency>
3838

3939
<dependency>

spark-connector-oceanbase/spark-connector-oceanbase-base/pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ under the License.
1919
<parent>
2020
<groupId>com.oceanbase</groupId>
2121
<artifactId>spark-connector-oceanbase</artifactId>
22-
<version>${rversion}</version>
22+
<version>${revision}</version>
2323
</parent>
2424

2525
<artifactId>spark-connector-oceanbase-base</artifactId>
@@ -197,11 +197,6 @@ under the License.
197197
<artifactId>disruptor</artifactId>
198198
<version>3.4.2</version>
199199
</dependency>
200-
<dependency>
201-
<groupId>org.apache.logging.log4j</groupId>
202-
<artifactId>log4j-slf4j-impl</artifactId>
203-
<version>${log4j.version}</version>
204-
</dependency>
205200
</dependencies>
206201

207202
<build>

0 commit comments

Comments
 (0)