From 71a680cdabf9d42844df98f619fc047e8b3516f3 Mon Sep 17 00:00:00 2001
From: Breno Queiroz <brenoqueirozvds@gmail.com>
Date: Tue, 22 Nov 2022 08:19:42 -0300
Subject: [PATCH 1/3] ENG-4152 Updating parent data

---
 scan-prj/pom.xml     | 2 +-
 scan-prj/pom.xml.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scan-prj/pom.xml b/scan-prj/pom.xml
index 472bdcae67..6049b34150 100644
--- a/scan-prj/pom.xml
+++ b/scan-prj/pom.xml
@@ -8,7 +8,7 @@
     <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
     <parent>
         <groupId>org.entando</groupId>
-        <artifactId>entando-core-parent</artifactId>
+        <artifactId>app-engine</artifactId>
         <relativePath>../pom.xml</relativePath>
         <version>7.2.0-SNAPSHOT</version>
     </parent>
diff --git a/scan-prj/pom.xml.tpl b/scan-prj/pom.xml.tpl
index b5a3eafa01..5d0bc9659f 100644
--- a/scan-prj/pom.xml.tpl
+++ b/scan-prj/pom.xml.tpl
@@ -8,7 +8,7 @@
     <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
     <parent>
         <groupId>org.entando</groupId>
-        <artifactId>entando-core-parent</artifactId>
+        <artifactId>app-engine</artifactId>
         <relativePath>../pom.xml</relativePath>
         <version>7.2.0-SNAPSHOT</version>
     </parent>

From 833ed569ca537bc9688c5f1c268c320883de6bbc Mon Sep 17 00:00:00 2001
From: Breno Queiroz <brenoqueirozvds@gmail.com>
Date: Tue, 22 Nov 2022 08:20:10 -0300
Subject: [PATCH 2/3] ENG-4152 Removing hardcoded version from webapp app

---
 webapp/pom.xml | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/webapp/pom.xml b/webapp/pom.xml
index c3fa5f87f8..33bae27f21 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -155,6 +155,14 @@
             <artifactId>log4j-web</artifactId>
             <version>${log4j.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-policy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-wsdl</artifactId>
+        </dependency>
         <!--test dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -195,18 +203,6 @@
             <artifactId>commons-dbcp2</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <!-- TODO: move this to entando-core-parent in next release -->
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-ws-policy</artifactId>
-            <version>3.4.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-wsdl</artifactId>
-            <version>3.4.4</version>
-        </dependency>
     </dependencies>
 
     <profiles>

From 30e045330f8dbb075bfca10eb55933cac304b84a Mon Sep 17 00:00:00 2001
From: Breno Queiroz <brenoqueirozvds@gmail.com>
Date: Tue, 22 Nov 2022 08:25:52 -0300
Subject: [PATCH 3/3] ENG-4152 Moving apache.cxf dependencies to main pom

---
 pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pom.xml b/pom.xml
index 167a70d39d..bc16cb665a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1067,6 +1067,16 @@
                 <artifactId>cxf-rt-rs-client</artifactId>
                 <version>${cxf.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-ws-policy</artifactId>
+                <version>${cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-wsdl</artifactId>
+                <version>${cxf.version}</version>
+            </dependency>
             <dependency>
                 <groupId>joda-time</groupId>
                 <artifactId>joda-time</artifactId>