Skip to content

Commit a95fb7c

Browse files
ludomikulaludomikula
committed
fix: replace all javax dependencies with jakarta dependencies
1 parent b1e9425 commit a95fb7c

File tree

25 files changed

+72
-180
lines changed

25 files changed

+72
-180
lines changed

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

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,9 @@
5858
<version>2.13.0</version>
5959
</dependency>
6060
<dependency>
61-
<groupId>org.glassfish</groupId>
62-
<artifactId>javax.el</artifactId>
63-
<version>3.0.0</version>
64-
</dependency>
65-
<dependency>
66-
<groupId>javax.el</groupId>
67-
<artifactId>javax.el-api</artifactId>
68-
<version>3.0.0</version>
61+
<groupId>jakarta.el</groupId>
62+
<artifactId>jakarta.el-api</artifactId>
63+
<version>5.0.1</version>
6964
</dependency>
7065

7166
<dependency>
@@ -154,15 +149,16 @@
154149
</dependency>
155150

156151
<dependency>
157-
<groupId>javax.xml.bind</groupId>
158-
<artifactId>jaxb-api</artifactId>
159-
<version>2.3.1</version>
152+
<groupId>jakarta.xml.bind</groupId>
153+
<artifactId>jakarta.xml.bind-api</artifactId>
154+
<version>4.0.2</version>
160155
</dependency>
161156
<dependency>
162-
<groupId>javax.activation</groupId>
163-
<artifactId>activation</artifactId>
164-
<version>1.1.1</version>
157+
<groupId>jakarta.activation</groupId>
158+
<artifactId>jakarta.activation-api</artifactId>
159+
<version>2.1.3</version>
165160
</dependency>
161+
166162
<!-- no more than 2.3.3-->
167163
<dependency>
168164
<groupId>org.glassfish.jaxb</groupId>
@@ -212,9 +208,9 @@
212208
<scope>test</scope>
213209
</dependency>
214210
<dependency>
215-
<groupId>javax.validation</groupId>
216-
<artifactId>validation-api</artifactId>
217-
<version>2.0.1.Final</version>
211+
<groupId>jakarta.validation</groupId>
212+
<artifactId>jakarta.validation-api</artifactId>
213+
<version>3.0.2</version>
218214
</dependency>
219215
</dependencies>
220216
</dependencyManagement>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,13 @@
234234
<scope>test</scope>
235235
</dependency>
236236

237-
<dependency>
238-
<groupId>javax.xml.bind</groupId>
239-
<artifactId>jaxb-api</artifactId>
237+
<dependency>
238+
<groupId>jakarta.xml.bind</groupId>
239+
<artifactId>jakarta.xml.bind-api</artifactId>
240240
</dependency>
241-
<dependency>
242-
<groupId>javax.activation</groupId>
243-
<artifactId>activation</artifactId>
241+
<dependency>
242+
<groupId>jakarta.activation</groupId>
243+
<artifactId>jakarta.activation-api</artifactId>
244244
</dependency>
245245
<!-- no more than 2.3.3-->
246246
<dependency>

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/ApplicationUtil.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
import java.util.Map;
66
import java.util.Set;
77

8-
import javax.validation.constraints.NotNull;
98

109
import org.apache.commons.lang3.StringUtils;
1110

1211
import com.google.common.collect.Sets;
1312

13+
import jakarta.validation.constraints.NotNull;
14+
1415
public class ApplicationUtil {
1516

1617
public static Object getContainerSizeFromDSL(Map<String, Object> dsl) {

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/model/Group.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import java.util.Locale;
66

77
import javax.annotation.Nonnull;
8-
import javax.validation.constraints.NotNull;
98

109
import org.apache.commons.lang3.BooleanUtils;
1110
import org.apache.commons.lang3.StringUtils;
@@ -15,6 +14,7 @@
1514

1615
import com.fasterxml.jackson.annotation.JsonIgnore;
1716

17+
import jakarta.validation.constraints.NotNull;
1818
import lombok.Getter;
1919
import lombok.Setter;
2020
import lombok.ToString;

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/repository/GroupRepository.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
import java.util.Collection;
44

5-
import javax.validation.constraints.NotNull;
6-
75
import org.lowcoder.domain.group.model.Group;
86
import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
97
import org.springframework.stereotype.Repository;
108

9+
import jakarta.validation.constraints.NotNull;
1110
import reactor.core.publisher.Flux;
1211
import reactor.core.publisher.Mono;
1312

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import java.util.Map.Entry;
1616
import java.util.Set;
1717

18-
import javax.annotation.Nullable;
19-
import javax.validation.constraints.NotNull;
18+
import jakarta.annotation.Nullable;
19+
import jakarta.validation.constraints.NotNull;
2020

2121
import org.apache.commons.collections4.CollectionUtils;
2222
import org.lowcoder.domain.application.model.ApplicationRequestType;

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/Connection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import java.util.Map;
77
import java.util.Set;
88

9-
import javax.annotation.Nullable;
10-
import javax.validation.constraints.NotEmpty;
9+
import jakarta.annotation.Nullable;
10+
import jakarta.validation.constraints.NotEmpty;
1111

1212
import org.apache.commons.collections4.CollectionUtils;
1313
import org.apache.commons.collections4.SetUtils;

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/conditional/ConditionalOnPropertyNotBlank.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import java.lang.annotation.Target;
77
import java.util.Map;
88

9-
import javax.annotation.Nullable;
10-
import javax.validation.constraints.NotBlank;
9+
import jakarta.annotation.Nullable;
10+
import jakarta.validation.constraints.NotBlank;
1111

1212
import org.apache.commons.lang3.StringUtils;
1313
import org.lowcoder.infra.conditional.ConditionalOnPropertyNotBlank.OnPropertyNotBlankCondition;

‎server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/ReactorRestClientAdaptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.io.Closeable;
44
import java.io.IOException;
55

6-
import javax.validation.constraints.NotNull;
6+
import jakarta.validation.constraints.NotNull;
77

88
import org.elasticsearch.client.Request;
99
import org.elasticsearch.client.Response;

‎server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/model/EsConnection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.io.Closeable;
44
import java.io.IOException;
55

6-
import javax.validation.constraints.NotNull;
6+
import jakarta.validation.constraints.NotNull;
77

88
import org.lowcoder.plugin.es.ReactorRestClientAdaptor;
99

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727

2828
<dependencies>
2929
<dependency>
30-
<groupId>javax.mail</groupId>
31-
<artifactId>mail</artifactId>
32-
<version>1.5.0-b01</version>
30+
<groupId>jakarta.mail</groupId>
31+
<artifactId>jakarta.mail-api</artifactId>
32+
<version>2.1.3</version>
3333
</dependency>
3434

3535
<!-- vertx os async but not mature, used in test -->

‎server/api-service/lowcoder-plugins/smtpPlugin/src/main/java/org/lowcoder/plugins/SmtpPlugin.java

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.lowcoder.plugins;
22

3-
import static javax.mail.Message.RecipientType.BCC;
4-
import static javax.mail.Message.RecipientType.CC;
5-
import static javax.mail.Message.RecipientType.TO;
3+
import static jakarta.mail.Message.RecipientType.BCC;
4+
import static jakarta.mail.Message.RecipientType.CC;
5+
import static jakarta.mail.Message.RecipientType.TO;
66
import static org.apache.commons.collections4.MapUtils.getString;
77
import static org.apache.commons.lang3.ArrayUtils.isNotEmpty;
88
import static org.apache.commons.lang3.StringUtils.isBlank;
@@ -27,22 +27,22 @@
2727
import java.util.Set;
2828
import java.util.stream.Stream;
2929

30-
import javax.activation.DataHandler;
31-
import javax.annotation.Nonnull;
32-
import javax.mail.Authenticator;
33-
import javax.mail.Message;
34-
import javax.mail.MessagingException;
35-
import javax.mail.Multipart;
36-
import javax.mail.Part;
37-
import javax.mail.PasswordAuthentication;
38-
import javax.mail.Session;
39-
import javax.mail.Transport;
40-
import javax.mail.internet.AddressException;
41-
import javax.mail.internet.InternetAddress;
42-
import javax.mail.internet.MimeBodyPart;
43-
import javax.mail.internet.MimeMessage;
44-
import javax.mail.internet.MimeMultipart;
45-
import javax.mail.util.ByteArrayDataSource;
30+
import jakarta.activation.DataHandler;
31+
import jakarta.annotation.Nonnull;
32+
import jakarta.mail.Authenticator;
33+
import jakarta.mail.Message;
34+
import jakarta.mail.MessagingException;
35+
import jakarta.mail.Multipart;
36+
import jakarta.mail.Part;
37+
import jakarta.mail.PasswordAuthentication;
38+
import jakarta.mail.Session;
39+
import jakarta.mail.Transport;
40+
import jakarta.mail.internet.AddressException;
41+
import jakarta.mail.internet.InternetAddress;
42+
import jakarta.mail.internet.MimeBodyPart;
43+
import jakarta.mail.internet.MimeMessage;
44+
import jakarta.mail.internet.MimeMultipart;
45+
import jakarta.mail.util.ByteArrayDataSource;
4646

4747
import org.apache.commons.collections4.CollectionUtils;
4848
import org.apache.commons.lang3.StringUtils;

‎server/api-service/lowcoder-plugins/smtpPlugin/src/main/java/org/lowcoder/plugins/SmtpQueryExecutionContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.List;
44

5-
import javax.mail.internet.InternetAddress;
5+
import jakarta.mail.internet.InternetAddress;
66

77
import org.lowcoder.sdk.query.QueryExecutionContext;
88

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@
9090
<groupId>org.hibernate.validator</groupId>
9191
<artifactId>hibernate-validator</artifactId>
9292
</dependency>
93-
<dependency>
94-
<groupId>javax.el</groupId>
95-
<artifactId>javax.el-api</artifactId>
93+
<dependency>
94+
<groupId>jakarta.el</groupId>
95+
<artifactId>jakarta.el-api</artifactId>
9696
</dependency>
9797
<dependency>
9898
<groupId>net.minidev</groupId>
@@ -161,9 +161,9 @@
161161
<groupId>jakarta.annotation</groupId>
162162
<artifactId>jakarta.annotation-api</artifactId>
163163
</dependency>
164-
<dependency>
165-
<groupId>javax.validation</groupId>
166-
<artifactId>validation-api</artifactId>
164+
<dependency>
165+
<groupId>jakarta.validation</groupId>
166+
<artifactId>jakarta.validation-api</artifactId>
167167
</dependency>
168168
</dependencies>
169169

‎server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/MustacheHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
import java.util.regex.Pattern;
4343
import java.util.stream.Collectors;
4444

45-
import javax.annotation.Nonnull;
46-
import javax.validation.constraints.NotNull;
45+
import jakarta.annotation.Nonnull;
46+
import jakarta.validation.constraints.NotNull;
4747

4848
import org.apache.commons.collections4.CollectionUtils;
4949
import org.apache.commons.lang3.Range;

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.util.List;
1515
import java.util.Locale;
1616

17-
import javax.validation.Valid;
17+
import jakarta.validation.Valid;
1818

1919
import org.apache.commons.collections4.CollectionUtils;
2020
import org.apache.commons.lang3.BooleanUtils;

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceEndpoints.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import java.util.List;
44
import java.util.Set;
55

6-
import javax.annotation.Nullable;
7-
import javax.validation.Valid;
6+
import jakarta.annotation.Nullable;
7+
import jakarta.validation.Valid;
88

99
import org.lowcoder.api.framework.view.ResponseView;
1010
import org.lowcoder.api.permission.view.CommonPermissionView;

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/PluginConfiguration.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import org.lowcoder.api.framework.plugin.LowcoderPluginManager;
66
import org.lowcoder.api.framework.plugin.endpoint.PluginEndpointHandler;
7-
import org.lowcoder.api.framework.plugin.security.PluginAuthorizationManager;
87
import org.lowcoder.plugin.api.EndpointExtension;
98
import org.springframework.aop.Advisor;
109
import org.springframework.aop.support.annotation.AnnotationMatchingPointcut;
@@ -43,16 +42,5 @@ RouterFunction<?> pluginEndpoints(LowcoderPluginManager pluginManager, PluginEnd
4342

4443
return (endpoints == null) ? pluginsList : pluginsList.andOther(endpoints);
4544
}
46-
47-
@Bean
48-
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
49-
Advisor protectPluginEndpoints(PluginAuthorizationManager pluginAauthManager)
50-
{
51-
AnnotationMatchingPointcut pointcut = new AnnotationMatchingPointcut(EndpointExtension.class, true);
52-
AuthorizationManagerBeforeReactiveMethodInterceptor interceptor = new AuthorizationManagerBeforeReactiveMethodInterceptor(pointcut, pluginAauthManager);
53-
interceptor.setOrder(AuthorizationInterceptorsOrder.PRE_AUTHORIZE.getOrder() -1);
54-
return interceptor;
55-
}
56-
57-
45+
5846
}

0 commit comments

Comments
 (0)