Merge pull request #21406 from aloubyansky/jsoup-bootstrap-bom

Move jsoup from build-parent to bootstrap-bom and a few other adjustments
quarkusio · Nov 15, 2021 · eed9285 · eed9285
2 parents 7d102e4 + d9bc67e
commit eed9285
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 22 deletions.
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -42,7 +42,9 @@
         <graal-sdk.version-for-documentation>21.3.0</graal-sdk.version-for-documentation>
         <mandrel.version-for-documentation>21.3</mandrel.version-for-documentation>
 
+        <asciidoctorj.version>2.3.0</asciidoctorj.version>
         <htmlunit.version>2.40.0</htmlunit.version>
+        <javaparser-core.version>3.14.10</javaparser-core.version>
         <subethasmtp.version>3.1.7</subethasmtp.version>
 
         <!-- Dev tools -->
@@ -90,9 +92,7 @@
 
         <!-- Align various dependencies that are not really part of the bom-->
         <findbugs.version>3.0.2</findbugs.version>
-        <jsoup.version>1.14.2</jsoup.version>
         <junit4.version>4.13.2</junit4.version>
-        <wagon-provider-api.version>3.4.3</wagon-provider-api.version>
 
         <!-- The image to use for tests that run Keycloak -->
         <!-- IMPORTANT: If this is changed you must also update bom/application/pom.xml and KeycloakBuildTimeConfig/DevServicesConfig in quarkus-oidc/deployment to match the version -->
@@ -231,16 +231,6 @@
                 <artifactId>jsr305</artifactId>
                 <version>${findbugs.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.jsoup</groupId>
-                <artifactId>jsoup</artifactId>
-                <version>${jsoup.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-provider-api</artifactId>
-                <version>${wagon-provider-api.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.unboundid</groupId>
                 <artifactId>unboundid-ldapsdk</artifactId>
@@ -306,6 +296,18 @@
                 <scope>test</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.asciidoctor</groupId>
+                <artifactId>asciidoctorj</artifactId>
+                <version>${asciidoctorj.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>javax.annotation-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
             <dependency>
                 <groupId>net.sourceforge.htmlunit</groupId>
                 <artifactId>htmlunit</artifactId>

diff --git a/core/processor/pom.xml b/core/processor/pom.xml
@@ -23,13 +23,12 @@
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>${jsoup.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.github.javaparser</groupId>
             <artifactId>javaparser-core</artifactId>
-            <version>3.14.10</version>
+            <version>${javaparser-core.version}</version>
         </dependency>
 
         <dependency>
@@ -47,13 +46,6 @@
             <groupId>org.asciidoctor</groupId>
             <artifactId>asciidoctorj</artifactId>
             <scope>test</scope>
-            <version>2.3.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.annotation</groupId>
-                    <artifactId>javax.annotation-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.logmanager</groupId> 

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -15,7 +15,6 @@
 
     <packaging>jar</packaging>
     <properties>
-        <asciidoctorj.version>2.3.0</asciidoctorj.version>
         <asciidoctor-maven-plugin.version>2.0.0</asciidoctor-maven-plugin.version>
         <asciidoctorj-pdf.version>1.5.0-beta.8</asciidoctorj-pdf.version>
         <quarkus-home-url>https://quarkus.io</quarkus-home-url>

diff --git a/independent-projects/bootstrap/bom/pom.xml b/independent-projects/bootstrap/bom/pom.xml
@@ -263,6 +263,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-provider-api</artifactId>
+                <version>${maven-wagon.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
@@ -325,6 +330,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.jsoup</groupId>
+                <artifactId>jsoup</artifactId>
+                <version>${jsoup.version}</version>
+            </dependency>
             <!-- Smallrye Common dependencies, imported as a BOM -->
             <dependency>
                 <groupId>io.smallrye.common</groupId>

diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml
@@ -31,6 +31,7 @@
         <assertj.version>3.21.0</assertj.version>
         <eclipse-minimal-json.version>0.9.5</eclipse-minimal-json.version>
         <jboss-logging.version>3.4.2.Final</jboss-logging.version>
+        <jsoup.version>1.14.2</jsoup.version> <!-- wagon-http dependency -->
         <junit.jupiter.version>5.8.1</junit.jupiter.version>
         <maven-core.version>3.8.1</maven-core.version><!-- Keep in sync with sisu.version -->
         <sisu.version>0.3.4</sisu.version><!-- Keep in sync with maven-core.version -->