Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement: Bump version of obkv-table-client to 1.3.0 #11

Merged
merged 2 commits into from
Dec 10, 2024
Merged

Enhancement: Bump version of obkv-table-client to 1.3.0 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53f99fb
Enhancement: Bump version of obkv-table-client to 1.3.0.
yuanoOo Nov 29, 2024
3f66339
Enhancement: Bump version of obkv-hbase-client to 2.0.0.
yuanoOo Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spark-connector-obkv-hbase/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ under the License.
<dependency>
<groupId>com.oceanbase</groupId>
<artifactId>obkv-hbase-client</artifactId>
<version>0.1.5</version>
<version>2.0.0</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
Expand Down
18 changes: 5 additions & 13 deletions spark-connector-obkv-hbase/spark-connector-obkv-hbase-2.4/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,24 +88,16 @@ under the License.
<phase>package</phase>
<configuration>
<artifactSet>
<!-- Spark 2.4 should not shade include org.apache.hadoop*:* -->
<includes combine.children="append">
<include>com.alibaba:*</include>
<include>com.oceanbase:*</include>
<include>com.alipay.sofa:bolt</include>
<include>com.alipay.sofa.common:sofa-common-tools</include>
<include>com.alibaba:*</include>
<include>com.alipay.*:*</include>
<include>com.google.*:*</include>
<include>org.apache.hbase*:*</include>
<include>mysql:mysql-connector-java</include>
<include>org.apache.hbase:*</include>
</includes>
</artifactSet>
<createDependencyReducedPom>false</createDependencyReducedPom>
<filters>
<filter>
<artifact>com.oceanbase:obkv-table-client</artifact>
<excludes>
<exclude>**/log4j/log-conf.xml</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
Expand Down
88 changes: 0 additions & 88 deletions ...connector-obkv-hbase-2.4/src/main/resources/oceanbase-table-client/log/log4j/log-conf.xml
View file
Open in desktop

This file was deleted.

15 changes: 4 additions & 11 deletions spark-connector-obkv-hbase/spark-connector-obkv-hbase-3.1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,13 @@ under the License.
<includes combine.children="append">
<include>com.oceanbase:*</include>
<include>com.alibaba:*</include>
<include>com.alipay.sofa:bolt</include>
<include>com.alipay.sofa.common:sofa-common-tools</include>
<include>org.apache.hbase:*</include>
<include>com.alipay.*:*</include>
<include>com.google.*:*</include>
<include>org.apache.hadoop*:*</include>
<include>org.apache.hbase*:*</include>
<include>mysql:mysql-connector-java</include>
</includes>
</artifactSet>
<filters>
<filter>
<artifact>com.oceanbase:obkv-table-client</artifact>
<excludes>
<exclude>**/log4j/log-conf.xml</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
Expand Down
88 changes: 0 additions & 88 deletions ...connector-obkv-hbase-3.1/src/main/resources/oceanbase-table-client/log/log4j/log-conf.xml
View file
Open in desktop

This file was deleted.

15 changes: 4 additions & 11 deletions spark-connector-obkv-hbase/spark-connector-obkv-hbase-3.2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,13 @@ under the License.
<includes combine.children="append">
<include>com.oceanbase:*</include>
<include>com.alibaba:*</include>
<include>com.alipay.sofa:bolt</include>
<include>com.alipay.sofa.common:sofa-common-tools</include>
<include>org.apache.hbase:*</include>
<include>com.alipay.*:*</include>
<include>com.google.*:*</include>
<include>org.apache.hadoop*:*</include>
<include>org.apache.hbase*:*</include>
<include>mysql:mysql-connector-java</include>
</includes>
</artifactSet>
<filters>
<filter>
<artifact>com.oceanbase:obkv-table-client</artifact>
<excludes>
<exclude>**/log4j/log-conf.xml</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
Expand Down
88 changes: 0 additions & 88 deletions ...connector-obkv-hbase-3.2/src/main/resources/oceanbase-table-client/log/log4j/log-conf.xml
View file
Open in desktop

This file was deleted.

16 changes: 6 additions & 10 deletions spark-connector-obkv-hbase/spark-connector-obkv-hbase-3.3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,15 @@ under the License.
<includes combine.children="append">
<include>com.oceanbase:*</include>
<include>com.alibaba:*</include>
<include>com.alipay.sofa:bolt</include>
<include>com.alipay.sofa.common:sofa-common-tools</include>
<include>org.apache.hbase:*</include>
<include>com.alipay.*:*</include>
<include>com.google.*:*</include>
<include>org.apache.hadoop*:*</include>
<include>org.apache.hbase*:*</include>
<include>mysql:mysql-connector-java</include>
<!-- This is only needed for Spark 3.3 and above. -->
<include>com.lmax:disruptor</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<!-- Resolve dependency conflicts in direct-load API. -->
<pattern>org.apache.logging</pattern>
<shadedPattern>shade.org.apache.logging</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
Expand Down
Loading
Loading