Skip to content

Commit

Permalink
[Feature][scaleph-schedule] update schedule module (#757)
Browse files Browse the repository at this point in the history 
* feature: update schedule group web

* feature: upgrade carp version

* fix: dependency update

* fix: dependency update

* feature: upgrade carp to 0.0.20

* feature: upgrade seatunnel plugin to 2.3.8

* fix: dependency update

* feature: replace datasource class

* feature: replace datasource class

* feature: upgrade seatunnel hudi connectors to 2.3.8

* fix: license-header

* fix: license-header

* feature: upgrade carp-spring-boot-parent to 0.0.22

* feature: upgrade to carp

* feature: remove dependency

* feature: upgrade gravitino to 0.7.0-incubating

* feature: update schedule job

* feature: update schedule job

* feature: update schedule job

---------

Co-authored-by: wangqi <[email protected]>
  • Loading branch information
@kalencaya
kalencaya and wangqi authored Jan 10, 2025
1 parent 862a392 commit c2f2477
Show file tree
Hide file tree
Showing 100 changed files with 1,074 additions and 2,368 deletions.
114 changes: 13 additions & 101 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>cn.sliew</groupId>
<artifactId>carp-spring-boot-parent</artifactId>
<version>0.0.19</version>
<version>0.0.25</version>
</parent>
<groupId>cn.sliew</groupId>
<artifactId>scaleph</artifactId>
Expand Down Expand Up @@ -129,36 +129,29 @@
<org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
<mapstruct.lombok.binding.version>0.2.0</mapstruct.lombok.binding.version>
<org.projectlombok.version>1.18.24</org.projectlombok.version>
<velocity.engine.version>2.2</velocity.engine.version>
<auto-service.version>1.0.1</auto-service.version>
<semver.version>0.9.0</semver.version>
<disruptor.version>4.0.0</disruptor.version>
<carp.version>0.0.23</carp.version>
<milky.version>1.0.13</milky.version>

<ojdbc.version>21.1.0.0</ojdbc.version>
<clickhouse-jdbc.version>0.3.2</clickhouse-jdbc.version>
<doris.version>5.1.26</doris.version>
<druid.version>0.22.1</druid.version>
<calcite-druid.version>1.29.0</calcite-druid.version>
<config.version>1.4.3</config.version>
<okhttp.version>4.10.0</okhttp.version>
<minio.version>8.3.8</minio.version>
<carp.version>0.0.20</carp.version>
<milky.version>1.0.13</milky.version>

<sakura.version>1.0.2</sakura.version>
<hadoop.version>3.3.4</hadoop.version>
<hive.version>3.1.3</hive.version>
<protobuf.version>3.21.5</protobuf.version>
<netty.version>4.1.82.Final</netty.version>
<flink.version>1.18.1</flink.version>
<flink.base.version>1.18</flink.base.version>
<flink-jdbc.version>3.1.2</flink-jdbc.version>
<paimon.version>0.7.0-incubating</paimon.version>
<spring-cloud-openfeign.version>3.1.7</spring-cloud-openfeign.version>
<zjsonpatch.version>0.4.14</zjsonpatch.version>

<netty.version>4.1.82.Final</netty.version>
<kogito.version>2.44.0.Alpha</kogito.version>
<cola.version>4.3.2</cola.version>
<fury.version>0.4.1</fury.version>
<jgrapht.version>1.5.2</jgrapht.version>
<gravitino.version>0.5.1</gravitino.version>
<disruptor.version>4.0.0</disruptor.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -354,12 +347,6 @@
<version>2.8.1</version>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${org.projectlombok.version}</version>
</dependency>

<dependency>
<groupId>org.mapstruct.extensions.spring</groupId>
<artifactId>mapstruct-spring-annotations</artifactId>
Expand All @@ -371,12 +358,6 @@
<version>${org.mapstruct.version}</version>
</dependency>

<dependency>
<groupId>com.github.zafarkhaja</groupId>
<artifactId>java-semver</artifactId>
<version>${semver.version}</version>
</dependency>

<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
Expand Down Expand Up @@ -451,7 +432,11 @@
<artifactId>flink-table-planner_2.12</artifactId>
<version>${flink.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-kubernetes</artifactId>
<version>${flink.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-jdbc</artifactId>
Expand All @@ -469,53 +454,25 @@
<version>${sakura.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-kubernetes</artifactId>
<version>${flink.version}</version>
</dependency>

<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
<version>${config.version}</version>
</dependency>

<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>logging-interceptor</artifactId>
<version>${okhttp.version}</version>
</dependency>

<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>${ojdbc.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>${netty.version}</version>
</dependency>

<dependency>
<groupId>com.flipkart.zjsonpatch</groupId>
<artifactId>zjsonpatch</artifactId>
<version>${zjsonpatch.version}</version>
</dependency>

<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-spring-boot-starter</artifactId>
Expand All @@ -532,51 +489,6 @@
<artifactId>fury-core</artifactId>
<version>${fury.version}</version>
</dependency>

<dependency>
<groupId>org.jgrapht</groupId>
<artifactId>jgrapht-core</artifactId>
<version>${jgrapht.version}</version>
</dependency>

<dependency>
<groupId>com.datastrato.gravitino</groupId>
<artifactId>client-java-runtime</artifactId>
<version>${gravitino.version}</version>
<exclusions>
<exclusion>
<groupId>com.datastrato.gravitino</groupId>
<artifactId>client-java</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.datastrato.gravitino</groupId>
<artifactId>client-java</artifactId>
<version>${gravitino.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
35 changes: 0 additions & 35 deletions scaleph-api/src/main/java/cn/sliew/scaleph/api/annotation/AnonymousAccess.java
View file

This file was deleted.

4 changes: 3 additions & 1 deletion scaleph-api/src/main/java/cn/sliew/scaleph/api/config/CarpDataSourceConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ public class CarpDataSourceConfig {

@Autowired
private MybatisPlusInterceptor mybatisPlusInterceptor;
@Autowired
private CarpMybatisConfig.CarpMetaHandler carpMetaHandler;

@Primary
@Bean(DataSourceConstants.DATA_SOURCE_FACTORY)
Expand All @@ -65,7 +67,7 @@ public DataSourceTransactionManager carpTransactionManager() {
public SqlSessionFactory carpSqlSessionFactory() throws Exception {
MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
GlobalConfig globalConfig = GlobalConfigUtils.defaults();
globalConfig.setMetaObjectHandler(new CarpMybatisConfig.CarpMetaHandler());
globalConfig.setMetaObjectHandler(carpMetaHandler);

MybatisPlusProperties props = new MybatisPlusProperties();
props.setMapperLocations(new String[]{DataSourceConstants.MAPPER_XML_PATH});
Expand Down
5 changes: 4 additions & 1 deletion scaleph-api/src/main/java/cn/sliew/scaleph/api/config/LogDataSourceConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package cn.sliew.scaleph.api.config;

import cn.sliew.carp.framework.mybatis.config.CarpMybatisConfig;
import cn.sliew.scaleph.dao.DataSourceConstants;
import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
Expand Down Expand Up @@ -45,6 +46,8 @@ public class LogDataSourceConfig {

@Autowired
private MybatisPlusInterceptor mybatisPlusInterceptor;
@Autowired
private CarpMybatisConfig.CarpMetaHandler carpMetaHandler;

@Bean(DataSourceConstants.LOG_DATA_SOURCE_FACTORY)
@ConfigurationProperties(prefix = "spring.datasource.log")
Expand All @@ -62,7 +65,7 @@ public DataSourceTransactionManager logTransactionManager() {
public SqlSessionFactory logSqlSessionFactory() throws Exception {
MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
GlobalConfig globalConfig = GlobalConfigUtils.defaults();
globalConfig.setMetaObjectHandler(new MybatisConfig.MetaHandler());
globalConfig.setMetaObjectHandler(carpMetaHandler);
MybatisPlusProperties props = new MybatisPlusProperties();
props.setMapperLocations(new String[]{DataSourceConstants.LOG_MAPPER_XML_PATH});
factoryBean.setMapperLocations(props.resolveMapperLocations());
Expand Down
5 changes: 4 additions & 1 deletion scaleph-api/src/main/java/cn/sliew/scaleph/api/config/MasterDataSourceConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package cn.sliew.scaleph.api.config;

import cn.sliew.carp.framework.mybatis.config.CarpMybatisConfig;
import cn.sliew.scaleph.dao.DataSourceConstants;
import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
Expand Down Expand Up @@ -46,6 +47,8 @@ public class MasterDataSourceConfig {

@Autowired
private MybatisPlusInterceptor mybatisPlusInterceptor;
@Autowired
private CarpMybatisConfig.CarpMetaHandler carpMetaHandler;

@Primary
@Bean(DataSourceConstants.MASTER_DATA_SOURCE_FACTORY)
Expand All @@ -66,7 +69,7 @@ public DataSourceTransactionManager masterTransactionManager() {
public SqlSessionFactory masterSqlSessionFactory() throws Exception {
MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
GlobalConfig globalConfig = GlobalConfigUtils.defaults();
globalConfig.setMetaObjectHandler(new MybatisConfig.MetaHandler());
globalConfig.setMetaObjectHandler(carpMetaHandler);

MybatisPlusProperties props = new MybatisPlusProperties();
props.setMapperLocations(new String[]{DataSourceConstants.MASTER_MAPPER_XML_PATH});
Expand Down
68 changes: 0 additions & 68 deletions scaleph-api/src/main/java/cn/sliew/scaleph/api/config/MybatisConfig.java
View file

This file was deleted.

5 changes: 4 additions & 1 deletion scaleph-api/src/main/java/cn/sliew/scaleph/api/config/SakuraDataSourceConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package cn.sliew.scaleph.api.config;

import cn.sliew.carp.framework.mybatis.config.CarpMybatisConfig;
import cn.sliew.scaleph.dao.DataSourceConstants;
import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
Expand Down Expand Up @@ -45,6 +46,8 @@ public class SakuraDataSourceConfig {

@Autowired
private MybatisPlusInterceptor mybatisPlusInterceptor;
@Autowired
private CarpMybatisConfig.CarpMetaHandler carpMetaHandler;

@Bean(DataSourceConstants.SAKURA_DATA_SOURCE_FACTORY)
@ConfigurationProperties(prefix = "spring.datasource.sakura")
Expand All @@ -62,7 +65,7 @@ public DataSourceTransactionManager logTransactionManager() {
public SqlSessionFactory logSqlSessionFactory() throws Exception {
MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
GlobalConfig globalConfig = GlobalConfigUtils.defaults();
globalConfig.setMetaObjectHandler(new MybatisConfig.MetaHandler());
globalConfig.setMetaObjectHandler(carpMetaHandler);
MybatisPlusProperties props = new MybatisPlusProperties();
props.setMapperLocations(new String[]{DataSourceConstants.SAKURA_MAPPER_XML_PATH});
factoryBean.setMapperLocations(props.resolveMapperLocations());
Expand Down
Loading

0 comments on commit c2f2477

Please sign in to comment.