This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit a076962fce54c361c8abb18f98856ab62ba8a4c1 Author: Andriy Redko <[email protected]> AuthorDate: Thu Feb 8 17:43:20 2024 -0500 Switch back to org.jvnet.jaxb/jaxb-plugins (new releases available) (cherry picked from commit e926c47df7219e72d17d4f532bd8641fa28921d9) # Conflicts: # parent/pom.xml # tools/wadlto/jaxrs/pom.xml --- parent/pom.xml | 1 + tools/wadlto/jaxrs/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 658a3ac078..a7fdacc261 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -106,6 +106,7 @@ <cxf.ehcache3.version>3.10.8</cxf.ehcache3.version> <cxf.el-api.version>3.0.3</cxf.el-api.version> <cxf.findbugs.version>3.0.2</cxf.findbugs.version> + <cxf.jvnet.jaxb.version>2.0.9</cxf.jvnet.jaxb.version> <cxf.geronimo.j2ee.management.version>1.0.1</cxf.geronimo.j2ee.management.version> <cxf.geronimo.jms.version>1.1.1</cxf.geronimo.jms.version> <cxf.geronimo.json.version>1.4</cxf.geronimo.json.version> diff --git a/tools/wadlto/jaxrs/pom.xml b/tools/wadlto/jaxrs/pom.xml index ada30b73d6..adf8142ffc 100644 --- a/tools/wadlto/jaxrs/pom.xml +++ b/tools/wadlto/jaxrs/pom.xml @@ -60,9 +60,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jvnet.jaxb2_commons</groupId> + <groupId>org.jvnet.jaxb</groupId> <artifactId>jaxb2-basics</artifactId> - <version>0.12.0</version> + <version>${cxf.jvnet.jaxb.version}</version> <scope>test</scope> </dependency> <dependency>
