From 5ec9ad4d2659663d3f05c674372036a832294a1e Mon Sep 17 00:00:00 2001
From: Archimedes Trajano <arch@trajano.net>
Date: Tue, 12 Dec 2017 09:01:57 -0500
Subject: [PATCH 1/2] Relocate RestEasy dependencies to sample-ms

The multipart is only used in the sample.
---
 ms-common/pom.xml | 38 --------------------------------------
 sample-ms/pom.xml | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/ms-common/pom.xml b/ms-common/pom.xml
index 6eba6b161..e3c3516df 100644
--- a/ms-common/pom.xml
+++ b/ms-common/pom.xml
@@ -8,9 +8,6 @@
   </parent>
   <artifactId>ms-common</artifactId>
   <name>Microservice Common</name>
-  <properties>
-    <resteasy.version>3.1.4.Final</resteasy.version>
-  </properties>
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -55,41 +52,6 @@
       <groupId>org.bitbucket.b_c</groupId>
       <artifactId>jose4j</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.resteasy</groupId>
-      <artifactId>resteasy-multipart-provider</artifactId>
-      <version>${resteasy.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.activation</groupId>
-          <artifactId>activation</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.logging</groupId>
-          <artifactId>jboss-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.resteasy</groupId>
-          <artifactId>resteasy-client</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.resteasy</groupId>
-          <artifactId>resteasy-jaxb-provider</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.resteasy</groupId>
-          <artifactId>resteasy-jaxrs</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.spec.javax.annotation</groupId>
-          <artifactId>jboss-annotations-api_1.2_spec</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
diff --git a/sample-ms/pom.xml b/sample-ms/pom.xml
index 4410371e4..bbeaf804c 100644
--- a/sample-ms/pom.xml
+++ b/sample-ms/pom.xml
@@ -12,6 +12,7 @@
   <name>Sample Microservice</name>
   <properties>
     <microservice.mainClass>net.trajano.ms.example.SampleMS</microservice.mainClass>
+    <resteasy.version>3.1.4.Final</resteasy.version>
   </properties>
   <dependencies>
     <dependency>
@@ -23,6 +24,41 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-multipart-provider</artifactId>
+      <version>${resteasy.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.activation</groupId>
+          <artifactId>activation</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.resteasy</groupId>
+          <artifactId>resteasy-client</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.resteasy</groupId>
+          <artifactId>resteasy-jaxb-provider</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.resteasy</groupId>
+          <artifactId>resteasy-jaxrs</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.spec.javax.annotation</groupId>
+          <artifactId>jboss-annotations-api_1.2_spec</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
   <build>
     <finalName>sample-ms</finalName>

From 718f3a42647416f2a4743c05b528b5546c132fde Mon Sep 17 00:00:00 2001
From: Archimedes Trajano <developer@trajano.net>
Date: Wed, 13 Dec 2017 00:38:53 -0500
Subject: [PATCH 2/2] Explicitly set the version for testing

---
 ms-common/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ms-common/pom.xml b/ms-common/pom.xml
index e3c3516df..e673967fb 100644
--- a/ms-common/pom.xml
+++ b/ms-common/pom.xml
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jaxrs</artifactId>
-      <version>${resteasy.version}</version>
+      <version>3.1.4.Final</version>
       <scope>test</scope>
     </dependency>
     <dependency>