Skip to content

Commit

Permalink
Merge pull request #20554 from aloubyansky/exclude-jaxb
Browse files Browse the repository at this point in the history
Exclude javax.xml.bind:jaxb-api from the quarkus-bom
  • Loading branch information
aloubyansky authored Oct 8, 2021
2 parents 3d99870 + e4ae203 commit 2213c7d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
7 changes: 0 additions & 7 deletions bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@
<jakarta.websocket-api.version>1.1.2</jakarta.websocket-api.version>
<jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version>
<jaxb-runtime.version>2.3.3-b02</jaxb-runtime.version>
<!-- just for test dependency convergence -->
<jaxb-api.version>2.3.1</jaxb-api.version>
<jboss-jaxrs-api_2.1_spec.version>2.0.1.Final</jboss-jaxrs-api_2.1_spec.version>
<jboss-jaxb-api_2.3_spec.version>2.0.0.Final</jboss-jaxb-api_2.3_spec.version>
<asm.version>9.2</asm.version>
Expand Down Expand Up @@ -3100,11 +3098,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>json-schema-validator</artifactId>
Expand Down
9 changes: 9 additions & 0 deletions bom/test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
<description>Dependency management for integration tests. Importable by third party extension developers.</description>

<properties>
<!-- just for test dependency convergence -->
<jaxb-api.version>2.3.1</jaxb-api.version>

<rxjava1.version>1.3.8</rxjava1.version>
<strimzi-test-container.version>0.22.1</strimzi-test-container.version>
</properties>
Expand Down Expand Up @@ -53,6 +56,12 @@
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down

0 comments on commit 2213c7d

Please sign in to comment.