This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch spring6 in repository https://gitbox.apache.org/repos/asf/isis.git
commit efc6b10178913a9dd0df13fc6d70c4eabc9b91b0 Merge: 0ae277e4c0 0be204b169 Author: Andi Huber <[email protected]> AuthorDate: Thu Dec 1 14:05:35 2022 +0100 ISIS-3275: merge from master .../causeway/applib/services/bookmark/Bookmark.java | 21 ++++++++++++++++++++- .../integtests/OutboxRestClient_IntegTest.java | 5 ----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --cc api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Bookmark.java index a2a5085d8a,8367e0e625..67cdcaff96 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Bookmark.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Bookmark.java @@@ -22,6 -22,10 +22,11 @@@ import java.util.Objects import java.util.Optional; import java.util.StringTokenizer; -import javax.inject.Named; -import javax.xml.bind.annotation.adapters.XmlAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; ++ ++import jakarta.inject.Named; ++import jakarta.xml.bind.annotation.adapters.XmlAdapter; ++import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.springframework.lang.Nullable; import org.apache.causeway.applib.CausewayModuleApplib;
