From 08c6da5c549fff749317ae66de11722e009bd622 Mon Sep 17 00:00:00 2001
From: Andrus Adamchik <andrus@objectstyle.com>
Date: Tue, 26 Mar 2024 17:24:21 -0400
Subject: [PATCH] pom cleanup in preparation for Jakarta upgrade

---
 bootique-cxf-jaxrs/pom.xml        |  4 ---
 bootique-cxf-jaxws-client/pom.xml |  6 ----
 bootique-cxf-jaxws-it/pom.xml     | 52 ++++++++++++++++++++++---------
 pom.xml                           |  1 +
 4 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/bootique-cxf-jaxrs/pom.xml b/bootique-cxf-jaxrs/pom.xml
index 7f9f0eb..9ad311e 100644
--- a/bootique-cxf-jaxrs/pom.xml
+++ b/bootique-cxf-jaxrs/pom.xml
@@ -77,10 +77,6 @@
 
     <dependencies>
         <!-- Compile dependencies -->
-        <dependency>
-            <groupId>io.bootique</groupId>
-            <artifactId>bootique</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.bootique.jetty</groupId>
             <artifactId>bootique-jetty</artifactId>
diff --git a/bootique-cxf-jaxws-client/pom.xml b/bootique-cxf-jaxws-client/pom.xml
index 355df51..fb033c4 100644
--- a/bootique-cxf-jaxws-client/pom.xml
+++ b/bootique-cxf-jaxws-client/pom.xml
@@ -31,11 +31,6 @@
 
     <dependencies>
         <!-- Compile dependencies -->
-        <dependency>
-            <groupId>io.bootique</groupId>
-            <artifactId>bootique</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>io.bootique.cxf</groupId>
             <artifactId>bootique-cxf-core</artifactId>
@@ -49,7 +44,6 @@
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
diff --git a/bootique-cxf-jaxws-it/pom.xml b/bootique-cxf-jaxws-it/pom.xml
index 9887230..ce37d6c 100644
--- a/bootique-cxf-jaxws-it/pom.xml
+++ b/bootique-cxf-jaxws-it/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>bootique-cxf-parent</artifactId>
         <groupId>io.bootique.cxf</groupId>
@@ -14,7 +15,33 @@
         Integration tests for various JAX-WS client / server configurations.
     </description>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.sun.xml.ws</groupId>
+                <artifactId>jaxws-ri</artifactId>
+                <type>pom</type>
+                <version>${jaxws-ri.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf.xjc-utils</groupId>
+                <artifactId>cxf-xjc-runtime</artifactId>
+                <version>${cxf.xjc.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-features-logging</artifactId>
+                <version>${cxf.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
+        <!-- Compile dependencies -->
+        <dependency>
+            <groupId>org.apache.cxf.xjc-utils</groupId>
+            <artifactId>cxf-xjc-runtime</artifactId>
+        </dependency>
 
         <!-- Unit test dependencies -->
         <dependency>
@@ -39,27 +66,22 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-features-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <!-- Java 9+ implicit deps -->
+        <!--
+            TODO: this one is weird. If this dependency is moved on top of the dependency list,
+              CXF endpoint provider is not loaded, and all the tests fail. Why is it order-dependent?
+        -->
         <dependency>
             <groupId>com.sun.xml.ws</groupId>
             <artifactId>jaxws-ri</artifactId>
-            <version>${jaxws-ri.version}</version>
             <type>pom</type>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.cxf.xjc-utils</groupId>
-            <artifactId>cxf-xjc-runtime</artifactId>
-            <version>3.3.0</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-features-logging</artifactId>
-            <version>${cxf.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index fe9b5cf..4cf0ddf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,7 @@
     <properties>
         <bootique.version>${project.version}</bootique.version>
         <cxf.version>3.5.8</cxf.version>
+        <cxf.xjc.version>3.3.3</cxf.xjc.version>
         <apache.hc.version>4.5.5</apache.hc.version>
         <jaxws-api.version>2.3.3</jaxws-api.version>
         <jaxws-ri.version>2.3.3</jaxws-ri.version>