Merge pull request #18006 from famod/assertj

Move assertj from BOM to build-parent
quarkusio · Jan 27, 2022 · 7e8712c · 7e8712c
2 parents 9edb506 + 8f9c1ec
commit 7e8712c
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 12 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -129,7 +129,6 @@
         <junit.jupiter.version>5.8.2</junit.jupiter.version>
         <junit-pioneer.version>1.5.0</junit-pioneer.version>
         <testng.version>6.14.2</testng.version>
-        <assertj.version>3.21.0</assertj.version>
         <infinispan.version>13.0.5.Final</infinispan.version>
         <infinispan.protostream.version>4.4.1.Final</infinispan.protostream.version>
         <caffeine.version>2.9.3</caffeine.version>
@@ -3690,12 +3689,6 @@
                 <artifactId>logging-interceptor</artifactId>
                 <version>${okhttp.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.assertj</groupId>
-                <artifactId>assertj-core</artifactId>
-                <version>${assertj.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.mongodb</groupId>
                 <artifactId>mongodb-driver-sync</artifactId>

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -100,6 +100,8 @@
 
         <unboundid-ldap.version>6.0.3</unboundid-ldap.version>
 
+        <assertj.version>3.22.0</assertj.version>
+
         <wiremock-jre8.version>2.27.2</wiremock-jre8.version>
         <wiremock-maven-plugin.version>7.0.0</wiremock-maven-plugin.version>
 
@@ -291,6 +293,12 @@
                 <version>${project.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.assertj</groupId>
+                <artifactId>assertj-core</artifactId>
+                <version>${assertj.version}</version>
+                <scope>test</scope>
+            </dependency>
 
             <dependency>
                 <groupId>org.asciidoctor</groupId>

diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml
@@ -41,7 +41,7 @@
         <version.jandex>2.4.2.Final</version.jandex>
         <version.junit5>5.8.2</version.junit5>
         <version.maven>3.8.4</version.maven>
-        <version.assertj>3.21.0</version.assertj>
+        <version.assertj>3.22.0</version.assertj>
         <version.jboss-logging>3.4.3.Final</version.jboss-logging>
         <version.jakarta-annotation>1.3.5</version.jakarta-annotation>
         <version.gizmo>1.0.10.Final</version.gizmo>

diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml
@@ -28,7 +28,7 @@
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
 
         <!-- Dependency versions -->
-        <assertj.version>3.21.0</assertj.version>
+        <assertj.version>3.22.0</assertj.version>
         <eclipse-minimal-json.version>0.9.5</eclipse-minimal-json.version>
         <jboss-logging.version>3.4.3.Final</jboss-logging.version>
         <jsoup.version>1.14.2</jsoup.version> <!-- wagon-http dependency -->

diff --git a/independent-projects/qute/pom.xml b/independent-projects/qute/pom.xml
@@ -37,7 +37,7 @@
         <maven.compiler.target>11</maven.compiler.target>
         <maven.compiler.release>11</maven.compiler.release>
         <version.junit>5.8.2</version.junit>
-        <version.assertj>3.21.0</version.assertj>
+        <version.assertj>3.22.0</version.assertj>
         <version.gizmo>1.0.10.Final</version.gizmo>
         <version.jboss-logging>3.4.3.Final</version.jboss-logging>
         <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>

diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml
@@ -40,7 +40,7 @@
         <version.jandex>2.4.2.Final</version.jandex>
         <version.junit5>5.8.2</version.junit5>
         <version.maven>3.8.4</version.maven>
-        <version.assertj>3.21.0</version.assertj>
+        <version.assertj>3.22.0</version.assertj>
         <version.jboss-logging>3.4.3.Final</version.jboss-logging>
         <version.jakarta-annotation>1.3.5</version.jakarta-annotation>
         <version.gizmo>1.0.10.Final</version.gizmo>

diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml
@@ -38,7 +38,7 @@
         <scala-plugin.version>4.4.0</scala-plugin.version>
 
         <!-- Versions -->
-        <assertj.version>3.21.0</assertj.version>
+        <assertj.version>3.22.0</assertj.version>
         <jackson.version>2.13.1</jackson.version>
         <jakarta.enterprise.cdi-api.version>2.0.2</jakarta.enterprise.cdi-api.version>
         <jakarta.servlet-api.version>4.0.3</jakarta.servlet-api.version>

diff --git a/integration-tests/picocli-native/pom.xml b/integration-tests/picocli-native/pom.xml
@@ -20,6 +20,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <scope>compile</scope>
         </dependency>
 
         <!-- test dependencies -->

diff --git a/test-framework/devmode-test-utils/pom.xml b/test-framework/devmode-test-utils/pom.xml
@@ -21,6 +21,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>

diff --git a/test-framework/maven/pom.xml b/test-framework/maven/pom.xml
@@ -33,6 +33,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>