Skip to content

Commit 18e1b51

Browse files
WeiXinChanmaochongxin
WeiXinChan
authored and
maochongxin
committed
update pom.xml
1 parent ec20fc7 commit 18e1b51

30 files changed

+758
-422
lines changed

‎pom.xml‎

Lines changed: 62 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,24 @@
5454
<dependencyManagement>
5555
<dependencies>
5656
<dependency>
57-
<groupId>org.testcontainers</groupId>
58-
<artifactId>testcontainers-bom</artifactId>
59-
<version>1.15.3</version>
60-
<type>pom</type>
61-
<scope>import</scope>
57+
<groupId>com.alipay.sofa.common</groupId>
58+
<artifactId>sofa-common-tools</artifactId>
59+
<version>1.3.12</version>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.slf4j</groupId>
63+
<artifactId>slf4j-api</artifactId>
64+
<version>1.7.36</version>
65+
</dependency>
66+
<dependency>
67+
<groupId>com.google.guava</groupId>
68+
<artifactId>guava</artifactId>
69+
<version>31.1-jre</version>
70+
</dependency>
71+
<dependency>
72+
<groupId>junit</groupId>
73+
<artifactId>junit</artifactId>
74+
<version>4.13.2</version>
6275
</dependency>
6376
</dependencies>
6477
</dependencyManagement>
@@ -67,7 +80,6 @@
6780
<dependency>
6881
<groupId>com.alipay.sofa.common</groupId>
6982
<artifactId>sofa-common-tools</artifactId>
70-
<version>1.3.12</version>
7183
</dependency>
7284

7385
<dependency>
@@ -91,7 +103,6 @@
91103
<dependency>
92104
<groupId>com.google.guava</groupId>
93105
<artifactId>guava</artifactId>
94-
<version>31.1-jre</version>
95106
</dependency>
96107

97108
<dependency>
@@ -129,13 +140,18 @@
129140
<dependency>
130141
<groupId>org.slf4j</groupId>
131142
<artifactId>slf4j-api</artifactId>
132-
<version>1.7.36</version>
133143
</dependency>
134144

135145
<dependency>
136146
<groupId>junit</groupId>
137147
<artifactId>junit</artifactId>
138-
<version>4.13.2</version>
148+
<scope>test</scope>
149+
</dependency>
150+
151+
<dependency>
152+
<groupId>org.junit.jupiter</groupId>
153+
<artifactId>junit-jupiter</artifactId>
154+
<version>5.9.2</version>
139155
<scope>test</scope>
140156
</dependency>
141157

@@ -144,13 +160,25 @@
144160
<artifactId>powermock-api-mockito2</artifactId>
145161
<version>2.0.9</version>
146162
<scope>test</scope>
163+
<exclusions>
164+
<exclusion>
165+
<groupId>org.powermock</groupId>
166+
<artifactId>powermock-reflect</artifactId>
167+
</exclusion>
168+
</exclusions>
147169
</dependency>
148170

149171
<dependency>
150172
<groupId>org.powermock</groupId>
151173
<artifactId>powermock-module-junit4</artifactId>
152174
<version>2.0.9</version>
153175
<scope>test</scope>
176+
<exclusions>
177+
<exclusion>
178+
<groupId>org.powermock</groupId>
179+
<artifactId>powermock-reflect</artifactId>
180+
</exclusion>
181+
</exclusions>
154182
</dependency>
155183

156184
<dependency>
@@ -164,6 +192,13 @@
164192
<groupId>org.testcontainers</groupId>
165193
<artifactId>jdbc</artifactId>
166194
<scope>test</scope>
195+
<version>1.15.3</version>
196+
<exclusions>
197+
<exclusion>
198+
<groupId>org.rnorth.visible-assertions</groupId>
199+
<artifactId>visible-assertions</artifactId>
200+
</exclusion>
201+
</exclusions>
167202
</dependency>
168203
</dependencies>
169204

@@ -361,6 +396,24 @@
361396
</execution>
362397
</executions>
363398
</plugin>
399+
<plugin>
400+
<groupId>org.apache.maven.plugins</groupId>
401+
<artifactId>maven-enforcer-plugin</artifactId>
402+
<version>3.0.0-M3</version>
403+
<executions>
404+
<execution>
405+
<id>enforce-dependency-convergence</id>
406+
<goals>
407+
<goal>enforce</goal>
408+
</goals>
409+
<configuration>
410+
<rules>
411+
<DependencyConvergence/>
412+
</rules>
413+
</configuration>
414+
</execution>
415+
</executions>
416+
</plugin>
364417
</plugins>
365418
</build>
366419
</profile>

‎src/main/java/com/alipay/oceanbase/rpc/ObGlobal.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,14 @@ public static String getObVsnString(long version) {
8383

8484
public static boolean isLsOpSupport() {
8585
return OB_VERSION >= OB_VERSION_4_2_3_0 && OB_VERSION < OB_VERSION_4_3_0_0
86-
|| OB_VERSION >= OB_VERSION_4_3_4_0;
86+
|| OB_VERSION >= OB_VERSION_4_3_4_0;
8787
}
8888

8989
public static boolean isReturnOneResultSupport() {
9090
return OB_VERSION >= OB_VERSION_4_2_3_0 && OB_VERSION < OB_VERSION_4_3_0_0
91-
|| OB_VERSION >= OB_VERSION_4_3_4_0;
91+
|| OB_VERSION >= OB_VERSION_4_3_4_0;
9292
}
9393

94-
9594
public static final long OB_VERSION_4_2_3_0 = calcVersion(4, (short) 2, (byte) 3, (byte) 0);
9695

9796
public static final long OB_VERSION_4_3_0_0 = calcVersion(4, (short) 3, (byte) 0, (byte) 0);

0 commit comments

Comments
 (0)