[cxf] 15/16: Fix pom

[dk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 19c4fa15311d9e426939d24b57012e0ffba927b1
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Tue Nov 3 11:14:58 2020 -0500

    Fix pom
---
 distribution/src/main/release/samples/pom.xml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 4b60ea3..734e9aa 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -30,19 +30,11 @@
         <!-- don't deploy the samples, kind of pointless -->
         <maven.deploy.skip>true</maven.deploy.skip>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-<<<<<<< HEAD
         <spring.boot.version>2.1.18.RELEASE</spring.boot.version>
         <spring.cloud.eureka.version>2.0.2.RELEASE</spring.cloud.eureka.version>
-        <cxf.jetty9.version>9.4.31.v20200723</cxf.jetty9.version>
-        <cxf.httpcomponents.client.version>4.5.12</cxf.httpcomponents.client.version>
-        <cxf.swagger.ui.version>3.24.3</cxf.swagger.ui.version>
-=======
-        <spring.boot.version>2.3.5.RELEASE</spring.boot.version>
-        <spring.cloud.eureka.version>2.2.3.RELEASE</spring.cloud.eureka.version>
         <cxf.jetty9.version>9.4.33.v20201020</cxf.jetty9.version>
         <cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
-        <cxf.swagger.ui.version>3.32.1</cxf.swagger.ui.version>
->>>>>>> f355b9b3ec... Update to latest jetty
+        <cxf.swagger.ui.version>3.24.3</cxf.swagger.ui.version>
         <cxf.tika.version>1.24.1</cxf.tika.version>
         <cxf.tomcat.version>8.5.59</cxf.tomcat.version>
     </properties>