Jakarta EE 9 migration
Upgrades many dependency declarations; removes old EJB 2.x support and outdated Servlet-based integrations (Commons FileUpload, FreeMarker JSP support, Tiles). Closes gh-22093 Closes gh-25354 Closes gh-26185 Closes gh-27423 See gh-27424
This commit is contained in:
@@ -32,9 +32,9 @@ import java.util.Set;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
import javax.annotation.Resource;
|
||||
import javax.annotation.meta.When;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
|
||||
@@ -19,8 +19,7 @@ package org.springframework.core.annotation;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Priority;
|
||||
|
||||
import jakarta.annotation.Priority;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
@@ -35,8 +35,7 @@ import java.util.NoSuchElementException;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import org.springframework.core.Ordered;
|
||||
@@ -3011,14 +3010,14 @@ class MergedAnnotationsTests {
|
||||
}
|
||||
|
||||
/**
|
||||
* Mimics javax.persistence.Id
|
||||
* Mimics jakarta.persistence.Id
|
||||
*/
|
||||
@Retention(RUNTIME)
|
||||
@interface Id {
|
||||
}
|
||||
|
||||
/**
|
||||
* Mimics javax.persistence.GeneratedValue
|
||||
* Mimics jakarta.persistence.GeneratedValue
|
||||
*/
|
||||
@Retention(RUNTIME)
|
||||
@interface GeneratedValue {
|
||||
|
||||
@@ -16,8 +16,7 @@
|
||||
|
||||
package org.springframework.core.annotation;
|
||||
|
||||
import javax.annotation.Priority;
|
||||
|
||||
import jakarta.annotation.Priority;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
@@ -18,8 +18,7 @@ package org.springframework.util;
|
||||
|
||||
import java.io.UnsupportedEncodingException;
|
||||
|
||||
import javax.xml.bind.DatatypeConverter;
|
||||
|
||||
import jakarta.xml.bind.DatatypeConverter;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
Reference in New Issue
Block a user