Skip to content

Commit ca53052

Browse files
ludomikulaludomikula
committed
chore: updated java to 21, libraries to latest
1 parent e5d5741 commit ca53052

File tree

24 files changed

+173
-446
lines changed

24 files changed

+173
-446
lines changed

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

Lines changed: 12 additions & 12 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.2.4</version>
21+
<version>3.4.5</version>
2222
<type>pom</type>
2323
<scope>import</scope>
2424
</dependency>
@@ -38,24 +38,24 @@
3838
<dependency>
3939
<groupId>org.json</groupId>
4040
<artifactId>json</artifactId>
41-
<version>20240303</version>
41+
<version>20250107</version>
4242
</dependency>
4343

4444
<dependency>
4545
<groupId>org.projectlombok</groupId>
4646
<artifactId>lombok</artifactId>
47-
<version>1.18.32</version>
47+
<version>1.18.38</version>
4848
</dependency>
4949

5050
<dependency>
5151
<groupId>org.apache.commons</groupId>
5252
<artifactId>commons-text</artifactId>
53-
<version>1.11.0</version>
53+
<version>1.13.1</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>commons-io</groupId>
5757
<artifactId>commons-io</artifactId>
58-
<version>2.16.0</version>
58+
<version>2.19.0</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>org.glassfish</groupId>
@@ -76,18 +76,18 @@
7676
<dependency>
7777
<groupId>jakarta.persistence</groupId>
7878
<artifactId>jakarta.persistence-api</artifactId>
79-
<version>3.1.0</version>
79+
<version>3.2.0</version>
8080
</dependency>
8181

8282
<dependency>
8383
<groupId>org.apache.commons</groupId>
8484
<artifactId>commons-collections4</artifactId>
85-
<version>4.4</version>
85+
<version>4.5.0</version>
8686
</dependency>
8787
<dependency>
8888
<groupId>com.google.guava</groupId>
8989
<artifactId>guava</artifactId>
90-
<version>33.1.0-jre</version>
90+
<version>33.4.8-jre</version>
9191
</dependency>
9292

9393
<dependency>
@@ -109,7 +109,7 @@
109109
<dependency>
110110
<groupId>com.github.ben-manes.caffeine</groupId>
111111
<artifactId>caffeine</artifactId>
112-
<version>3.1.8</version>
112+
<version>3.2.0</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.11</version>
122+
<version>0.9.14</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.6.4</version>
134+
<version>3.7.4</version>
135135
</dependency>
136136

137137
<dependency>
@@ -246,7 +246,7 @@
246246
<dependency>
247247
<groupId>org.springdoc</groupId>
248248
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
249-
<version>2.5.0</version>
249+
<version>2.8.6</version>
250250
</dependency>
251251

252252
</dependencies>

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/localcache/ReloadableCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import jakarta.annotation.Nonnull;
66
import lombok.extern.slf4j.Slf4j;
77
import org.lowcoder.sdk.destructor.DestructorUtil;
8+
import org.springframework.lang.CheckReturnValue;
89
import reactor.core.publisher.Mono;
910

10-
import javax.annotation.CheckReturnValue;
1111
import java.time.Duration;
1212
import java.util.concurrent.ScheduledExecutorService;
1313
import java.util.concurrent.TimeUnit;

‎server/api-service/lowcoder-plugins/clickHousePlugin/pom.xml

Lines changed: 8 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515

1616
<properties>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18-
<java.version>17</java.version>
18+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
19+
<java.version>21</java.version>
1920
<maven.compiler.source>${java.version}</maven.compiler.source>
2021
<maven.compiler.target>${java.version}</maven.compiler.target>
2122
<plugin.id>clickHouse-plugin</plugin.id>
@@ -39,26 +40,21 @@
3940
</dependency>
4041

4142
<dependency>
42-
<!-- please stop using ru.yandex.clickhouse as it's been deprecated -->
4343
<groupId>com.clickhouse</groupId>
4444
<artifactId>clickhouse-jdbc</artifactId>
45-
<version>0.3.2-patch11</version>
46-
<!-- use uber jar with all dependencies included, change classifier to http for smaller jar -->
47-
<classifier>all</classifier>
48-
<exclusions>
49-
<exclusion>
50-
<groupId>*</groupId>
51-
<artifactId>*</artifactId>
52-
</exclusion>
53-
</exclusions>
45+
<version>0.8.4</version>
5446
</dependency>
5547

5648
<!-- Test Dependencies -->
5749

5850
<dependency>
5951
<groupId>org.testcontainers</groupId>
6052
<artifactId>testcontainers</artifactId>
61-
<version>1.18.0</version>
53+
<scope>test</scope>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.testcontainers</groupId>
57+
<artifactId>clickhouse</artifactId>
6258
<scope>test</scope>
6359
</dependency>
6460

@@ -69,30 +65,6 @@
6965
<plugin>
7066
<groupId>org.apache.maven.plugins</groupId>
7167
<artifactId>maven-shade-plugin</artifactId>
72-
<version>3.2.4</version>
73-
<executions>
74-
<execution>
75-
<id>shade-plugin-jar</id>
76-
<phase>package</phase>
77-
<goals>
78-
<goal>shade</goal>
79-
</goals>
80-
<configuration>
81-
<minimizeJar>false</minimizeJar>
82-
<transformers>
83-
<transformer
84-
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
85-
<manifestEntries>
86-
<Plugin-Id>${plugin.id}</Plugin-Id>
87-
<Plugin-Class>${plugin.class}</Plugin-Class>
88-
<Plugin-Version>${plugin.version}</Plugin-Version>
89-
<Plugin-Provider>${plugin.provider}</Plugin-Provider>
90-
</manifestEntries>
91-
</transformer>
92-
</transformers>
93-
</configuration>
94-
</execution>
95-
</executions>
9668
</plugin>
9769
<plugin>
9870
<artifactId>maven-dependency-plugin</artifactId>

‎server/api-service/lowcoder-plugins/elasticSearchPlugin/pom.xml

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
<properties>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19-
<java.version>17</java.version>
19+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
20+
<java.version>21</java.version>
2021
<maven.compiler.source>${java.version}</maven.compiler.source>
2122
<maven.compiler.target>${java.version}</maven.compiler.target>
2223
<plugin.id>es-plugin</plugin.id>
@@ -31,21 +32,19 @@
3132
<dependency>
3233
<groupId>org.elasticsearch.client</groupId>
3334
<artifactId>elasticsearch-rest-client</artifactId>
34-
<version>8.2.3</version>
35+
<version>9.0.0</version>
3536
</dependency>
3637

3738
<!-- Test Dependencies -->
3839
<dependency>
3940
<groupId>org.testcontainers</groupId>
4041
<artifactId>testcontainers</artifactId>
41-
<version>1.18.0</version>
4242
<scope>test</scope>
4343
</dependency>
4444

4545
<dependency>
4646
<groupId>org.testcontainers</groupId>
4747
<artifactId>elasticsearch</artifactId>
48-
<version>1.16.3</version>
4948
<scope>test</scope>
5049
</dependency>
5150

@@ -63,29 +62,6 @@
6362
<plugin>
6463
<groupId>org.apache.maven.plugins</groupId>
6564
<artifactId>maven-shade-plugin</artifactId>
66-
<version>3.2.4</version>
67-
<executions>
68-
<execution>
69-
<id>shade-plugin-jar</id>
70-
<phase>package</phase>
71-
<goals>
72-
<goal>shade</goal>
73-
</goals>
74-
<configuration>
75-
<minimizeJar>false</minimizeJar>
76-
<transformers>
77-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
78-
<manifestEntries>
79-
<Plugin-Id>${plugin.id}</Plugin-Id>
80-
<Plugin-Class>${plugin.class}</Plugin-Class>
81-
<Plugin-Version>${plugin.version}</Plugin-Version>
82-
<Plugin-Provider>${plugin.provider}</Plugin-Provider>
83-
</manifestEntries>
84-
</transformer>
85-
</transformers>
86-
</configuration>
87-
</execution>
88-
</executions>
8965
</plugin>
9066
<plugin>
9167
<artifactId>maven-dependency-plugin</artifactId>

‎server/api-service/lowcoder-plugins/googleSheetsPlugin/pom.xml

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
<properties>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19-
<java.version>17</java.version>
19+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
20+
<java.version>21</java.version>
2021
<maven.compiler.source>${java.version}</maven.compiler.source>
2122
<maven.compiler.target>${java.version}</maven.compiler.target>
2223
<plugin.id>googleSheets-plugin</plugin.id>
@@ -31,43 +32,42 @@
3132
<dependency>
3233
<groupId>com.google.api-client</groupId>
3334
<artifactId>google-api-client</artifactId>
34-
<version>1.31.2</version>
35+
<version>2.7.2</version>
3536
</dependency>
3637
<dependency>
3738
<groupId>com.google.oauth-client</groupId>
3839
<artifactId>google-oauth-client-jetty</artifactId>
39-
<version>1.30.6</version>
40+
<version>1.39.0</version>
4041
</dependency>
4142
<dependency>
4243
<groupId>com.google.auth</groupId>
4344
<artifactId>google-auth-library-oauth2-http</artifactId>
44-
<version>1.3.0</version>
45+
<version>1.33.1</version>
4546
</dependency>
4647
<dependency>
4748
<groupId>com.google.apis</groupId>
4849
<artifactId>google-api-services-sheets</artifactId>
49-
<version>v4-rev20230526-2.0.0</version>
50+
<version>v4-rev612-1.25.0</version>
5051
</dependency>
5152

5253
<!-- Test dependencies -->
5354

5455
<dependency>
5556
<groupId>org.assertj</groupId>
5657
<artifactId>assertj-core</artifactId>
57-
<version>3.13.2</version>
5858
<scope>test</scope>
5959
</dependency>
6060

6161
<dependency>
6262
<groupId>org.springframework.boot</groupId>
6363
<artifactId>spring-boot-starter-webflux</artifactId>
64-
<version>3.0.6</version>
64+
<version>3.4.5</version>
6565
<scope>test</scope>
6666
</dependency>
6767
<dependency>
6868
<groupId>com.google.guava</groupId>
6969
<artifactId>guava</artifactId>
70-
<version>31.1-jre</version>
70+
<version>33.4.8-jre</version>
7171
<scope>compile</scope>
7272
</dependency>
7373

@@ -79,30 +79,6 @@
7979
<plugin>
8080
<groupId>org.apache.maven.plugins</groupId>
8181
<artifactId>maven-shade-plugin</artifactId>
82-
<version>3.2.4</version>
83-
<executions>
84-
<execution>
85-
<id>shade-plugin-jar</id>
86-
<phase>package</phase>
87-
<goals>
88-
<goal>shade</goal>
89-
</goals>
90-
<configuration>
91-
<minimizeJar>false</minimizeJar>
92-
<transformers>
93-
<transformer
94-
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
95-
<manifestEntries>
96-
<Plugin-Id>${plugin.id}</Plugin-Id>
97-
<Plugin-Class>${plugin.class}</Plugin-Class>
98-
<Plugin-Version>${plugin.version}</Plugin-Version>
99-
<Plugin-Provider>${plugin.provider}</Plugin-Provider>
100-
</manifestEntries>
101-
</transformer>
102-
</transformers>
103-
</configuration>
104-
</execution>
105-
</executions>
10682
</plugin>
10783
<plugin>
10884
<artifactId>maven-dependency-plugin</artifactId>

0 commit comments

Comments
 (0)