From ff5f9e2c3fdd51ec5eb41588124ec81e368de53f Mon Sep 17 00:00:00 2001
From: George Gastaldi <gegastaldi@gmail.com>
Date: Wed, 28 Apr 2021 13:38:36 -0300
Subject: [PATCH 1/2] Tools must use the same Smallrye Commons version from
 core

---
 .github/dependabot.yml             | 2 +-
 independent-projects/tools/pom.xml | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5dc88a398a9c6..add333a1b5c9d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -53,7 +53,7 @@ updates:
       - dependency-name: io.smallrye:smallrye-opentracing
       - dependency-name: io.smallrye:smallrye-fault-tolerance
       - dependency-name: io.smallrye:smallrye-context-propagation
-      - dependency-name: io.smallrye.common:smallrye-common-bom
+      - dependency-name: io.smallrye.common:*
       - dependency-name: io.smallrye.config:smallrye-config
       - dependency-name: io.smallrye.reactive:mutiny
       - dependency-name: io.smallrye.reactive:smallrye-reactive-messaging
diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml
index cf85d5146f5f0..a4604d774edae 100644
--- a/independent-projects/tools/pom.xml
+++ b/independent-projects/tools/pom.xml
@@ -54,7 +54,7 @@
         <quarkus.version>999-SNAPSHOT</quarkus.version>
         <maven-model-helper.version>18</maven-model-helper.version>
         <commons-io.version>2.8.0</commons-io.version>
-        <smallrye-commons.version>1.5.0</smallrye-commons.version>
+        <smallrye-common.version>1.6.0</smallrye-common.version>
     </properties>
     <modules>
         <module>artifact-api</module>
@@ -204,8 +204,10 @@
             </dependency>
             <dependency>
                 <groupId>io.smallrye.common</groupId>
-                <artifactId>smallrye-common-os</artifactId>
-                <version>${smallrye-commons.version}</version>
+                <artifactId>smallrye-common-bom</artifactId>
+                <version>${smallrye-common.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
             </dependency>
             <!-- Jackson dependencies, imported as a BOM -->
             <dependency>

From 22cc84098ba05528d52d6bef4379a490f7706a73 Mon Sep 17 00:00:00 2001
From: George Gastaldi <gegastaldi@gmail.com>
Date: Wed, 28 Apr 2021 13:41:25 -0300
Subject: [PATCH 2/2] RestEasy Reactive must use the same SmallRye Commons
 version as core

---
 independent-projects/resteasy-reactive/pom.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml
index a85f9f003a6e1..b0d185650c5db 100644
--- a/independent-projects/resteasy-reactive/pom.xml
+++ b/independent-projects/resteasy-reactive/pom.xml
@@ -51,7 +51,7 @@
         <jboss-jaxrs-api_2.1_spec.version>2.0.1.Final</jboss-jaxrs-api_2.1_spec.version>
         <jakarta.json.version>1.1.6</jakarta.json.version>
         <mutiny.version>0.16.0</mutiny.version>
-        <smallrye-common-annotation.version>1.5.0</smallrye-common-annotation.version>
+        <smallrye-common.version>1.6.0</smallrye-common.version>
         <vertx.version>4.0.3</vertx.version>
         <rest-assured.version>4.3.3</rest-assured.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
@@ -149,8 +149,10 @@
 
             <dependency>
                 <groupId>io.smallrye.common</groupId>
-                <artifactId>smallrye-common-annotation</artifactId>
-                <version>${smallrye-common-annotation.version}</version>
+                <artifactId>smallrye-common-bom</artifactId>
+                <version>${smallrye-common.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
             </dependency>
 
             <!-- JUnit 5 dependencies, imported as a BOM -->