Skip to content

Commit 201d046

Browse files
GroundWuGroundWu
committed
Merge remote-tracking branch 'ob/master' into support_full_text_indx
2 parents 56869c4 + e053056 commit 201d046

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+2102
-758
lines changed

‎pom.xml‎

Lines changed: 49 additions & 30 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,21 +103,6 @@
91103
<dependency>
92104
<groupId>com.google.guava</groupId>
93105
<artifactId>guava</artifactId>
94-
<version>31.1-jre</version>
95-
</dependency>
96-
97-
<dependency>
98-
<groupId>org.springframework</groupId>
99-
<artifactId>spring-core</artifactId>
100-
<version>5.2.25.RELEASE</version>
101-
<scope>test</scope>
102-
</dependency>
103-
104-
<dependency>
105-
<groupId>org.springframework</groupId>
106-
<artifactId>spring-beans</artifactId>
107-
<version>5.2.25.RELEASE</version>
108-
<scope>test</scope>
109106
</dependency>
110107

111108
<dependency>
@@ -129,13 +126,11 @@
129126
<dependency>
130127
<groupId>org.slf4j</groupId>
131128
<artifactId>slf4j-api</artifactId>
132-
<version>1.7.36</version>
133129
</dependency>
134130

135131
<dependency>
136132
<groupId>junit</groupId>
137133
<artifactId>junit</artifactId>
138-
<version>4.13.2</version>
139134
<scope>test</scope>
140135
</dependency>
141136

@@ -144,6 +139,12 @@
144139
<artifactId>powermock-api-mockito2</artifactId>
145140
<version>2.0.9</version>
146141
<scope>test</scope>
142+
<exclusions>
143+
<exclusion>
144+
<artifactId>objenesis</artifactId>
145+
<groupId>org.objenesis</groupId>
146+
</exclusion>
147+
</exclusions>
147148
</dependency>
148149

149150
<dependency>
@@ -153,17 +154,17 @@
153154
<scope>test</scope>
154155
</dependency>
155156

156-
<dependency>
157-
<groupId>ch.qos.logback</groupId>
158-
<artifactId>logback-classic</artifactId>
159-
<version>1.2.12</version>
160-
<scope>test</scope>
161-
</dependency>
162-
163157
<dependency>
164158
<groupId>org.testcontainers</groupId>
165159
<artifactId>jdbc</artifactId>
166160
<scope>test</scope>
161+
<version>1.15.3</version>
162+
<exclusions>
163+
<exclusion>
164+
<groupId>org.rnorth.visible-assertions</groupId>
165+
<artifactId>visible-assertions</artifactId>
166+
</exclusion>
167+
</exclusions>
167168
</dependency>
168169
</dependencies>
169170

@@ -361,6 +362,24 @@
361362
</execution>
362363
</executions>
363364
</plugin>
365+
<plugin>
366+
<groupId>org.apache.maven.plugins</groupId>
367+
<artifactId>maven-enforcer-plugin</artifactId>
368+
<version>3.0.0-M3</version>
369+
<executions>
370+
<execution>
371+
<id>enforce-dependency-convergence</id>
372+
<goals>
373+
<goal>enforce</goal>
374+
</goals>
375+
<configuration>
376+
<rules>
377+
<DependencyConvergence/>
378+
</rules>
379+
</configuration>
380+
</execution>
381+
</executions>
382+
</plugin>
364383
</plugins>
365384
</build>
366385
</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)