Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move jsoup from build-parent to bootstrap-bom and a few other adjustments #21406

Merged
merged 1 commit into from
Nov 15, 2021
+26 −22
Merged

Move jsoup from build-parent to bootstrap-bom and a few other adjustments #21406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions build-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
10 changes: 1 addition & 9 deletions core/processor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
1 change: 0 additions & 1 deletion docs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 10 additions & 0 deletions independent-projects/bootstrap/bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions independent-projects/bootstrap/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down