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 17d6b7e79e9f6b7a95895936abbab75a2ba8a58e Merge: 1ab265d1f3 c3a663e87e Author: Andi Huber <[email protected]> AuthorDate: Thu Dec 22 10:30:39 2022 +0100 Merge remote-tracking branch 'origin/master' into spring6 bom/pom.xml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --cc bom/pom.xml index f80ba18497,49158fdf4c..7e2d1a5ae3 --- a/bom/pom.xml +++ b/bom/pom.xml @@@ -125,14 -124,14 +125,17 @@@ It is therefore a copy of org.apache:ap <guava.version>31.1-jre</guava.version> <htmlparser.version>2.1</htmlparser.version> -- - <jakartaee.version>10.0.0</jakartaee.version> ++ <javafaker.version>1.0.2</javafaker.version> <javassist.version>3.29.2-GA</javassist.version> - <jakarta-servlet.version>6.0.0</jakarta-servlet.version> - - <jakartaee.version>8.0.0</jakartaee.version> - <jakarta.inject-api.version>1.0.5</jakarta.inject-api.version> <!-- do not upgrade 1.x to 2.x until Spring 6 --> - <jakarta.servlet-api.version>4.0.4</jakarta.servlet-api.version> <!-- do not upgrade 4.x to 6.x until Spring 6 --> - <jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version> <!-- don't upgrade to 3.x before Spring 6--> ++ + <jaxb-impl.version>4.0.1</jaxb-impl.version> + <jaxws-ri.version>4.0.0</jaxws-ri.version> ++ ++ <jakartaee.version>10.0.0</jakartaee.version> ++ <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version> ++ <jakarta.inject-api.version>2.0.1</jakarta.inject-api.version> + <jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version> <jbcrypt.version>0.4</jbcrypt.version> <jboss-jaxrs-api_2.1_spec.version>2.0.2.Final</jboss-jaxrs-api_2.1_spec.version>
