Skip to content

Commit 17a63ed

Browse files
authored
add rewrite plugin and migrate javax.annotation to jakarta.annotation (eclipse-openvsx#1609)
1 parent 97a94df commit 17a63ed

37 files changed

Lines changed: 54 additions & 43 deletions

server/build.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ plugins {
99
alias(libs.plugins.hibernate.orm)
1010
alias(libs.plugins.test.logger)
1111
alias(libs.plugins.gatling)
12+
alias(libs.plugins.rewrite)
1213
id 'maven-publish'
1314
}
1415

@@ -154,6 +155,8 @@ dependencies {
154155

155156
gatling libs.gatling.core
156157
gatling libs.gatling.app
158+
159+
rewrite libs.rewrite.java
157160
}
158161

159162
configurations.configureEach {
@@ -194,6 +197,11 @@ jooq {
194197
}
195198
}
196199

200+
rewrite {
201+
activeRecipe("org.openrewrite.java.migrate.jakarta.JavaxAnnotationMigrationToJakartaAnnotation")
202+
setExportDatatables(true)
203+
}
204+
197205
publishing {
198206
publications {
199207
maven(MavenPublication) {

server/gradle/libs.versions.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jsonpath = "2.9.0"
2020
junit = "5.14.2"
2121
loki4j = "1.4.2"
2222
re2j = "1.7"
23+
rewrite-java = "3.26.0"
2324
spring-boot = "3.5.10"
2425
springdoc = "2.8.13"
2526
testcontainers = "1.21.4"
@@ -34,6 +35,7 @@ jooq-codegen = { id = "org.jooq.jooq-codegen-gradle", version.re
3435
spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot"}
3536
spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.7" }
3637
test-logger = { id = "com.adarshr.test-logger", version = "4.0.0" }
38+
rewrite = { id = "org.openrewrite.rewrite", version = "7.25.0" }
3739

3840
[libraries]
3941
awssdk-s3 = { module = "software.amazon.awssdk:s3", version.ref = "aws" }
@@ -64,6 +66,7 @@ junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api",
6466
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
6567
loki-logback-appender = { module = "com.github.loki4j:loki-logback-appender", version.ref = "loki4j" }
6668
re2j = { module = "com.google.re2j:re2j", version.ref = "re2j" }
69+
rewrite-java = { module = "org.openrewrite.recipe:rewrite-migrate-java", version.ref = "rewrite-java"}
6770
springdoc = { module = "org.springdoc:springdoc-openapi-starter-webmvc-ui", version.ref = "springdoc" }
6871
testcontainers-elasticsearch = { module = "org.testcontainers:elasticsearch", version.ref = "testcontainers" }
6972
testcontainers-junit-jupiter = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }

server/src/main/java/org/eclipse/openvsx/LocalRegistryService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.eclipse.openvsx.search.SearchUtilService;
2626
import org.eclipse.openvsx.search.SimilarityCheckService;
2727
import org.eclipse.openvsx.storage.StorageUtilService;
28-
import javax.annotation.Nullable;
28+
import jakarta.annotation.Nullable;
2929
import org.eclipse.openvsx.util.*;
3030
import org.slf4j.Logger;
3131
import org.slf4j.LoggerFactory;

server/src/main/java/org/eclipse/openvsx/cache/ExpiredFileListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.slf4j.Logger;
1515
import org.slf4j.LoggerFactory;
1616

17-
import javax.annotation.Nullable;
17+
import jakarta.annotation.Nullable;
1818
import java.io.IOException;
1919
import java.nio.file.Files;
2020
import java.nio.file.Path;

server/src/main/java/org/eclipse/openvsx/json/AccessTokenJson.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
********************************************************************************/
1010
package org.eclipse.openvsx.json;
1111

12-
import javax.annotation.Nullable;
12+
import jakarta.annotation.Nullable;
1313

1414
import com.fasterxml.jackson.annotation.JsonInclude;
1515
import com.fasterxml.jackson.annotation.JsonInclude.Include;

server/src/main/java/org/eclipse/openvsx/repositories/AdminScanDecisionRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.springframework.data.repository.query.Param;
2020
import org.springframework.data.util.Streamable;
2121

22-
import javax.annotation.Nullable;
22+
import jakarta.annotation.Nullable;
2323

2424
import java.time.LocalDateTime;
2525
import java.util.Collection;

server/src/main/java/org/eclipse/openvsx/repositories/ExtensionScanRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.springframework.data.repository.query.Param;
2222
import org.springframework.data.util.Streamable;
2323

24-
import javax.annotation.Nullable;
24+
import jakarta.annotation.Nullable;
2525

2626
import java.time.LocalDateTime;
2727
import java.util.Collection;

server/src/main/java/org/eclipse/openvsx/repositories/RepositoryService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.springframework.data.util.Streamable;
2121
import org.springframework.stereotype.Component;
2222

23-
import javax.annotation.Nullable;
23+
import jakarta.annotation.Nullable;
2424

2525
import java.time.LocalDateTime;
2626
import java.util.Collection;

server/src/main/java/org/eclipse/openvsx/scanning/EntropyCalculator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
********************************************************************************/
1313
package org.eclipse.openvsx.scanning;
1414

15-
import javax.annotation.Nullable;
15+
import jakarta.annotation.Nullable;
1616
import java.util.HashMap;
1717
import java.util.Map;
1818

server/src/main/java/org/eclipse/openvsx/scanning/ExtensionScanPersistenceService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import org.slf4j.LoggerFactory;
2525
import org.springframework.stereotype.Service;
2626

27-
import javax.annotation.Nonnull;
28-
import javax.annotation.Nullable;
27+
import jakarta.annotation.Nonnull;
28+
import jakarta.annotation.Nullable;
2929
import java.time.LocalDateTime;
3030
import java.util.Collections;
3131
import java.util.Map;

0 commit comments

Comments
 (0)