From 956ac1a9624e4b5b47b0691ce4fef4eedf914fb0 Mon Sep 17 00:00:00 2001
From: Stuart Douglas <stuart.w.douglas@gmail.com>
Date: Thu, 14 Feb 2019 11:20:38 +1100
Subject: [PATCH] Fixes #880, add Resteasy to the bom so the version aligns

---
 bom/pom.xml          | 62 ++++++++++++++++++++++++++++++++++++
 build-parent/pom.xml | 75 +++++---------------------------------------
 2 files changed, 69 insertions(+), 68 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 93ce25eb26364..1000b67c3375b 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -22,6 +22,10 @@
    <name>Shamrock - BOM</name>
    <packaging>pom</packaging>
 
+   <properties>
+      <resteasy.version>4.0.0.Beta8</resteasy.version>
+   </properties>
+
    <dependencyManagement>
       <dependencies>
 
@@ -234,6 +238,64 @@
             <version>${project.version}</version>
             <scope>test</scope>
          </dependency>
+
+         <!-- Additional artifacts that we need to specify the version for-->
+
+         <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-bom</artifactId>
+            <version>${resteasy.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+         </dependency>
+
+         <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-rxjava2</artifactId>
+            <version>${resteasy.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-core</artifactId>
+            <version>${resteasy.version}</version>
+            <exclusions>
+               <exclusion>
+                  <groupId>org.jboss.spec.javax.annotation</groupId>
+                  <artifactId>jboss-annotations-api_1.3_spec</artifactId>
+               </exclusion>
+               <exclusion>
+                  <groupId>javax.activation</groupId>
+                  <artifactId>activation</artifactId>
+               </exclusion>
+            </exclusions>
+         </dependency>
+         <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-core-spi</artifactId>
+            <version>${resteasy.version}</version>
+            <exclusions>
+               <exclusion>
+                  <groupId>org.jboss.spec.javax.annotation</groupId>
+                  <artifactId>jboss-annotations-api_1.3_spec</artifactId>
+               </exclusion>
+               <exclusion>
+                  <groupId>javax.activation</groupId>
+                  <artifactId>activation</artifactId>
+               </exclusion>
+            </exclusions>
+         </dependency>
+         <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxb-provider</artifactId>
+            <version>${resteasy.version}</version>
+            <exclusions>
+               <!-- The JBoss JAXB API artifact is used instead -->
+               <exclusion>
+                  <groupId>javax.xml.bind</groupId>
+                  <artifactId>jaxb-api</artifactId>
+               </exclusion>
+            </exclusions>
+         </dependency>
       </dependencies>
    </dependencyManagement>
 
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 4f02643450d3c..bd0dfc6a30c2e 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -29,7 +29,6 @@
       
       <aesh.version>1.11</aesh.version>
       <jandex.version>2.1.0.Final</jandex.version>
-      <resteasy.version>4.0.0.Beta8</resteasy.version>
       <opentracing.version>0.31.0</opentracing.version>
       <opentracing-jaxrs.version>0.3.1</opentracing-jaxrs.version>
       <opentracing-web-servlet-filter.version>0.2.2</opentracing-web-servlet-filter.version>
@@ -128,6 +127,13 @@
 
    <dependencyManagement>
       <dependencies>
+         <dependency>
+            <groupId>org.jboss.shamrock</groupId>
+            <artifactId>shamrock-bom</artifactId>
+            <version>${project.version}</version>
+             <type>pom</type>
+             <scope>import</scope>
+         </dependency>
          <dependency>
             <groupId>org.jboss.shamrock</groupId>
             <artifactId>shamrock-agroal-deployment</artifactId>
@@ -1049,73 +1055,6 @@
             <artifactId>narayana-jts-integration</artifactId>
             <version>${narayana.version}</version>
          </dependency>
-         <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-cdi</artifactId>
-            <version>${resteasy.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-client</artifactId>
-            <version>${resteasy.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-core</artifactId>
-            <version>${resteasy.version}</version>
-            <exclusions>
-               <exclusion>
-                  <groupId>org.jboss.spec.javax.annotation</groupId>
-                  <artifactId>jboss-annotations-api_1.3_spec</artifactId>
-               </exclusion>
-               <exclusion>
-                  <groupId>javax.activation</groupId>
-                  <artifactId>activation</artifactId>
-               </exclusion>
-            </exclusions>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-core-spi</artifactId>
-            <version>${resteasy.version}</version>
-            <exclusions>
-               <exclusion>
-                  <groupId>org.jboss.spec.javax.annotation</groupId>
-                  <artifactId>jboss-annotations-api_1.3_spec</artifactId>
-               </exclusion>
-               <exclusion>
-                  <groupId>javax.activation</groupId>
-                  <artifactId>activation</artifactId>
-               </exclusion>
-            </exclusions>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-json-binding-provider</artifactId>
-            <version>${resteasy.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-json-p-provider</artifactId>
-            <version>${resteasy.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-jaxb-provider</artifactId>
-            <version>${resteasy.version}</version>
-            <exclusions>
-               <!-- The JBoss JAXB API artifact is used instead -->
-               <exclusion>
-                  <groupId>javax.xml.bind</groupId>
-                  <artifactId>jaxb-api</artifactId>
-               </exclusion>
-            </exclusions>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-rxjava2</artifactId>
-            <version>${resteasy.version}</version>
-         </dependency>
 
          <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>