Skip to content

Commit 0b0c2d7

Browse files
ludomikulaludomikula
committed
fix: updated springboot, mongo and mongock dependencies
1 parent b79da8c commit 0b0c2d7

File tree

14 files changed

+115
-95
lines changed

14 files changed

+115
-95
lines changed

‎server/api-service/distribution/src/assembly/bin.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<include>org.lowcoder:lowcoder-domain</include>
4545
<include>org.lowcoder:lowcoder-infra</include>
4646
<include>org.lowcoder:lowcoder-sdk</include>
47+
<include>org.lowcoder:sqlBasedPlugin</include>
4748
</includes>
4849
<binaries>
4950
<outputDirectory>libs</outputDirectory>

‎server/api-service/lowcoder-dependencies/pom.xml‎

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>org.springframework.boot</groupId>
2020
<artifactId>spring-boot-dependencies</artifactId>
21-
<version>3.1.2</version>
21+
<version>3.2.4</version>
2222
<type>pom</type>
2323
<scope>import</scope>
2424
</dependency>
@@ -32,13 +32,13 @@
3232
<dependency>
3333
<groupId>org.pf4j</groupId>
3434
<artifactId>pf4j</artifactId>
35-
<version>3.5.0</version>
35+
<version>3.11.0</version>
3636
</dependency>
3737

3838
<dependency>
3939
<groupId>org.json</groupId>
4040
<artifactId>json</artifactId>
41-
<version>20230227</version>
41+
<version>20240303</version>
4242
</dependency>
4343

4444
<dependency>
@@ -50,12 +50,12 @@
5050
<dependency>
5151
<groupId>org.apache.commons</groupId>
5252
<artifactId>commons-text</artifactId>
53-
<version>1.10.0</version>
53+
<version>1.11.0</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>commons-io</groupId>
5757
<artifactId>commons-io</artifactId>
58-
<version>2.13.0</version>
58+
<version>2.16.0</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>org.glassfish</groupId>
@@ -70,7 +70,7 @@
7070
<dependency>
7171
<groupId>org.eclipse.jgit</groupId>
7272
<artifactId>org.eclipse.jgit</artifactId>
73-
<version>6.5.0.202303070854-r</version>
73+
<version>6.9.0.202403050737-r</version>
7474
</dependency>
7575

7676
<dependency>
@@ -87,7 +87,7 @@
8787
<dependency>
8888
<groupId>com.google.guava</groupId>
8989
<artifactId>guava</artifactId>
90-
<version>30.0-jre</version>
90+
<version>33.1.0-jre</version>
9191
</dependency>
9292

9393
<dependency>
@@ -98,18 +98,18 @@
9898
<dependency>
9999
<groupId>org.jetbrains.kotlin</groupId>
100100
<artifactId>kotlin-stdlib-jdk7</artifactId>
101-
<version>1.6.21</version>
101+
<version>1.9.23</version>
102102
</dependency>
103103

104104
<dependency>
105105
<groupId>com.jayway.jsonpath</groupId>
106106
<artifactId>json-path</artifactId>
107-
<version>2.7.0</version>
107+
<version>2.9.0</version>
108108
</dependency>
109109
<dependency>
110110
<groupId>com.github.ben-manes.caffeine</groupId>
111111
<artifactId>caffeine</artifactId>
112-
<version>3.0.5</version>
112+
<version>3.1.8</version>
113113
</dependency>
114114
<dependency>
115115
<groupId>es.moki.ratelimitj</groupId>
@@ -119,7 +119,7 @@
119119
<dependency>
120120
<groupId>com.github.spullara.mustache.java</groupId>
121121
<artifactId>compiler</artifactId>
122-
<version>0.9.6</version>
122+
<version>0.9.11</version>
123123
</dependency>
124124

125125
<dependency>
@@ -131,7 +131,7 @@
131131
<dependency>
132132
<groupId>io.projectreactor</groupId>
133133
<artifactId>reactor-core</artifactId>
134-
<version>3.4.29</version>
134+
<version>3.6.4</version>
135135
</dependency>
136136

137137
<dependency>
@@ -163,14 +163,14 @@
163163

164164
<dependency>
165165
<groupId>io.sentry</groupId>
166-
<artifactId>sentry-spring-boot-starter</artifactId>
167-
<version>3.1.2</version>
166+
<artifactId>sentry-spring-boot-starter-jakarta</artifactId>
167+
<version>7.6.0</version>
168168
</dependency>
169169

170170
<dependency>
171171
<groupId>org.jgrapht</groupId>
172172
<artifactId>jgrapht-core</artifactId>
173-
<version>1.5.0</version>
173+
<version>1.5.2</version>
174174
</dependency>
175175

176176
<dependency>
@@ -193,17 +193,22 @@
193193
</dependency>
194194

195195
<dependency>
196-
<groupId>com.github.cloudyrock.mongock</groupId>
196+
<groupId>io.mongock</groupId>
197197
<artifactId>mongock-bom</artifactId>
198-
<version>4.3.8</version>
198+
<version>5.4.0</version>
199199
<type>pom</type>
200200
<scope>import</scope>
201201
</dependency>
202+
<dependency>
203+
<groupId>io.mongock</groupId>
204+
<artifactId>mongock-springboot</artifactId>
205+
<version>5.4.0</version>
206+
</dependency>
202207

203208
<dependency>
204209
<groupId>io.projectreactor.tools</groupId>
205210
<artifactId>blockhound</artifactId>
206-
<version>1.0.6.RELEASE</version>
211+
<version>1.0.8.RELEASE</version>
207212
</dependency>
208213

209214
<dependency>
@@ -215,7 +220,7 @@
215220
<dependency>
216221
<groupId>io.projectreactor</groupId>
217222
<artifactId>reactor-test</artifactId>
218-
<version>3.3.5.RELEASE</version>
223+
<version>3.6.4</version>
219224
</dependency>
220225
<dependency>
221226
<groupId>org.apache.httpcomponents</groupId>
@@ -225,7 +230,7 @@
225230
<dependency>
226231
<groupId>de.flapdoodle.embed</groupId>
227232
<artifactId>de.flapdoodle.embed.mongo.spring30x</artifactId>
228-
<version>4.7.0</version>
233+
<version>4.11.0</version>
229234
</dependency>
230235
<dependency>
231236
<groupId>org.mockito</groupId>
@@ -238,6 +243,12 @@
238243
<artifactId>jakarta.validation-api</artifactId>
239244
<version>3.0.2</version>
240245
</dependency>
246+
<dependency>
247+
<groupId>org.springdoc</groupId>
248+
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
249+
<version>2.5.0</version>
250+
</dependency>
251+
241252
</dependencies>
242253
</dependencyManagement>
243254
</project>

‎server/api-service/lowcoder-domain/pom.xml‎

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@
3939
<groupId>org.slf4j</groupId>
4040
<artifactId>slf4j-log4j12</artifactId>
4141
</exclusion>
42-
<exclusion>
43-
<groupId>javax.annotation</groupId>
44-
<artifactId>javax.annotation-api</artifactId>
45-
</exclusion>
4642
</exclusions>
4743
</dependency>
4844

@@ -60,8 +56,8 @@
6056
</dependency>
6157

6258
<dependency>
63-
<groupId>com.github.cloudyrock.mongock</groupId>
64-
<artifactId>mongock-spring-v5</artifactId>
59+
<groupId>io.mongock</groupId>
60+
<artifactId>mongock-springboot</artifactId>
6561
<exclusions>
6662
<exclusion>
6763
<groupId>com.google.guava</groupId>
@@ -71,11 +67,15 @@
7167
<groupId>javax.inject</groupId>
7268
<artifactId>javax.inject</artifactId>
7369
</exclusion>
70+
<exclusion>
71+
<groupId>org.springframework.boot</groupId>
72+
<artifactId>spring-boot-autoconfigure</artifactId>
73+
</exclusion>
7474
</exclusions>
7575
</dependency>
7676
<dependency>
77-
<groupId>com.github.cloudyrock.mongock</groupId>
78-
<artifactId>mongodb-springdata-v3-driver</artifactId>
77+
<groupId>io.mongock</groupId>
78+
<artifactId>mongodb-springdata-v4-driver</artifactId>
7979
</dependency>
8080
<dependency>
8181
<groupId>org.projectlombok</groupId>
@@ -168,7 +168,7 @@
168168

169169
<dependency>
170170
<groupId>io.sentry</groupId>
171-
<artifactId>sentry-spring-boot-starter</artifactId>
171+
<artifactId>sentry-spring-boot-starter-jakarta</artifactId>
172172
</dependency>
173173

174174
<dependency>
@@ -282,6 +282,26 @@
282282
</execution>
283283
</executions>
284284
</plugin>
285+
286+
<plugin>
287+
<artifactId>maven-antrun-plugin</artifactId>
288+
<executions>
289+
<execution>
290+
<phase>generate-sources</phase>
291+
<configuration>
292+
<target>
293+
<replace token= "javax.annotation.processing.Generated" value="jakarta.annotation.Generated" dir="target/generated-sources">
294+
<include name="**/*.java"/>
295+
</replace>
296+
</target>
297+
</configuration>
298+
<goals>
299+
<goal>run</goal>
300+
</goals>
301+
</execution>
302+
</executions>
303+
</plugin>
304+
285305
</plugins>
286306
</build>
287307

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/MongoConfig.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package org.lowcoder.domain.configurations;
22

3-
import com.github.cloudyrock.mongock.driver.mongodb.springdata.v3.SpringDataMongoV3Driver;
4-
import com.github.cloudyrock.spring.v5.MongockSpring5;
53
import com.mongodb.ReadConcern;
64
import com.mongodb.ReadPreference;
75
import com.mongodb.WriteConcern;
6+
import io.mongock.driver.mongodb.springdata.v4.SpringDataMongoV4Driver;
7+
import io.mongock.runner.springboot.MongockSpringboot;
8+
import io.mongock.runner.springboot.base.MongockApplicationRunner;
89
import jakarta.annotation.PostConstruct;
10+
import lombok.RequiredArgsConstructor;
911
import lombok.extern.slf4j.Slf4j;
1012
import org.lowcoder.domain.user.model.User;
1113
import org.lowcoder.sdk.config.MaterialProperties;
@@ -30,30 +32,28 @@
3032

3133
@Slf4j
3234
@Configuration
35+
@RequiredArgsConstructor
3336
@EnableReactiveMongoAuditing
3437
@EnableReactiveMongoRepositories(basePackages = {"org.lowcoder.infra", "org.lowcoder.domain"})
3538
public class MongoConfig {
3639

37-
@Autowired
38-
private MaterialProperties materialProperties;
39-
40-
@Autowired
41-
private MappingMongoConverter mappingMongoConverter;
40+
private final MaterialProperties materialProperties;
41+
private final MappingMongoConverter mappingMongoConverter;
4242

4343
@PostConstruct
4444
public void init() {
4545
mappingMongoConverter.setMapKeyDotReplacement("##OB_REPLACE##");
4646
}
4747

4848
@Bean
49-
public MongockSpring5.MongockApplicationRunner mongockApplicationRunner(ApplicationContext springContext, MongoTemplate mongoTemplate) {
50-
SpringDataMongoV3Driver springDataMongoV3Driver = SpringDataMongoV3Driver.withDefaultLock(mongoTemplate);
51-
springDataMongoV3Driver.setWriteConcern(WriteConcern.JOURNALED.withJournal(false));
52-
springDataMongoV3Driver.setReadConcern(ReadConcern.LOCAL);
49+
public MongockApplicationRunner mongockApplicationRunner(ApplicationContext springContext, MongoTemplate mongoTemplate) {
50+
SpringDataMongoV4Driver driver = SpringDataMongoV4Driver.withDefaultLock(mongoTemplate);
51+
driver.setWriteConcern(WriteConcern.JOURNALED.withJournal(false));
52+
driver.setReadConcern(ReadConcern.LOCAL);
5353

54-
return MongockSpring5.builder()
55-
.setDriver(springDataMongoV3Driver)
56-
.addChangeLogsScanPackages(List.of("org.lowcoder.runner.migrations"))
54+
return MongockSpringboot.builder()
55+
.setDriver(driver)
56+
.addMigrationScanPackages(List.of("org.lowcoder.runner.migrations"))
5757
.setSpringContext(springContext)
5858
.buildApplicationRunner();
5959
}

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceDO.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
@Jacksonized
2323
@SuperBuilder
2424
@NoArgsConstructor
25-
@AllArgsConstructor(onConstructor_ = { @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)})
25+
@AllArgsConstructor
2626
public class DatasourceDO extends HasIdAndAuditing {
2727

2828
private String name;

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/client/DatasourcePluginClient.java‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
package org.lowcoder.domain.plugin.client;
22

3-
import static org.lowcoder.sdk.constants.GlobalContext.REQUEST;
4-
5-
import java.time.Duration;
6-
import java.util.Collections;
7-
import java.util.List;
8-
import java.util.Map;
9-
import java.util.function.Function;
10-
3+
import lombok.RequiredArgsConstructor;
4+
import lombok.extern.slf4j.Slf4j;
115
import org.apache.commons.collections4.CollectionUtils;
126
import org.apache.commons.collections4.MapUtils;
137
import org.apache.commons.lang3.StringUtils;
@@ -19,19 +13,25 @@
1913
import org.lowcoder.sdk.exception.ServerException;
2014
import org.lowcoder.sdk.models.DatasourceTestResult;
2115
import org.lowcoder.sdk.models.QueryExecutionResult;
22-
import org.springframework.beans.factory.annotation.Autowired;
2316
import org.springframework.core.ParameterizedTypeReference;
2417
import org.springframework.http.HttpHeaders;
2518
import org.springframework.http.server.reactive.ServerHttpRequest;
2619
import org.springframework.stereotype.Component;
2720
import org.springframework.web.reactive.function.client.ExchangeStrategies;
2821
import org.springframework.web.reactive.function.client.WebClient;
29-
30-
import lombok.extern.slf4j.Slf4j;
3122
import reactor.core.publisher.Flux;
3223
import reactor.core.publisher.Mono;
3324

25+
import java.time.Duration;
26+
import java.util.Collections;
27+
import java.util.List;
28+
import java.util.Map;
29+
import java.util.function.Function;
30+
31+
import static org.lowcoder.sdk.constants.GlobalContext.REQUEST;
32+
3433
@Slf4j
34+
@RequiredArgsConstructor
3535
@Component
3636
public class DatasourcePluginClient implements NodeServerClient {
3737

@@ -44,10 +44,8 @@ public class DatasourcePluginClient implements NodeServerClient {
4444
.exchangeStrategies(EXCHANGE_STRATEGIES)
4545
.build();
4646

47-
@Autowired
48-
private CommonConfigHelper commonConfigHelper;
49-
@Autowired
50-
private NodeServerHelper nodeServerHelper;
47+
private final CommonConfigHelper commonConfigHelper;
48+
private final NodeServerHelper nodeServerHelper;
5149

5250
private static final String PLUGINS_PATH = "plugins";
5351
private static final String RUN_PLUGIN_QUERY = "runPluginQuery";
@@ -78,7 +76,7 @@ public Mono<List<Object>> getPluginDynamicConfig(List<GetPluginDynamicConfigRequ
7876
return response.bodyToMono(new ParameterizedTypeReference<>() {
7977
});
8078
}
81-
log.error("request /getPluginDynamicConfig error.{},{}", getPluginDynamicConfigRequestDTOS, response.rawStatusCode());
79+
log.error("request /getPluginDynamicConfig error.{},{}", getPluginDynamicConfigRequestDTOS, response.statusCode().value());
8280
return Mono.error(new ServerException("get dynamic config error"));
8381
})
8482
.timeout(Duration.ofSeconds(10))
@@ -105,7 +103,7 @@ public Flux<DatasourcePluginDefinition> getDatasourcePluginDefinitions() {
105103
return response.bodyToMono(new ParameterizedTypeReference<List<DatasourcePluginDefinition>>() {
106104
});
107105
}
108-
log.error("request /plugins error.{}", response.rawStatusCode());
106+
log.error("request /plugins error.{}", response.statusCode().value());
109107
return Mono.just(Collections.emptyList());
110108
})
111109
.timeout(Duration.ofSeconds(10))

0 commit comments

Comments
 (0)