Skip to content

Commit 72740f6

Browse files
committed
Merge pull request #12082 from Vedran Pavic
* gh-12082: Use Jersey BOM in dependency management
2 parents 7a97764 + da7bf05 commit 72740f6

File tree

3 files changed

+12
-58
lines changed
  • spring-boot-project
    • spring-boot-autoconfigure
    • spring-boot-dependencies
    • spring-boot-starters/spring-boot-starter-jersey

3 files changed

+12
-58
lines changed

spring-boot-project/spring-boot-autoconfigure/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@
156156
<artifactId>jersey-spring4</artifactId>
157157
<optional>true</optional>
158158
<exclusions>
159+
<exclusion>
160+
<groupId>org.glassfish.hk2.external</groupId>
161+
<artifactId>bean-validator</artifactId>
162+
</exclusion>
159163
<exclusion>
160164
<groupId>org.hibernate</groupId>
161165
<artifactId>hibernate-validator</artifactId>

spring-boot-project/spring-boot-dependencies/pom.xml

Lines changed: 4 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1705,65 +1705,11 @@
17051705
<version>${glassfish-el.version}</version>
17061706
</dependency>
17071707
<dependency>
1708-
<groupId>org.glassfish.jersey.containers</groupId>
1709-
<artifactId>jersey-container-servlet</artifactId>
1710-
<version>${jersey.version}</version>
1711-
</dependency>
1712-
<dependency>
1713-
<groupId>org.glassfish.jersey.containers</groupId>
1714-
<artifactId>jersey-container-servlet-core</artifactId>
1715-
<version>${jersey.version}</version>
1716-
</dependency>
1717-
<dependency>
1718-
<groupId>org.glassfish.jersey.core</groupId>
1719-
<artifactId>jersey-client</artifactId>
1720-
<version>${jersey.version}</version>
1721-
</dependency>
1722-
<dependency>
1723-
<groupId>org.glassfish.jersey.core</groupId>
1724-
<artifactId>jersey-common</artifactId>
1725-
<version>${jersey.version}</version>
1726-
</dependency>
1727-
<dependency>
1728-
<groupId>org.glassfish.jersey.core</groupId>
1729-
<artifactId>jersey-server</artifactId>
1730-
<version>${jersey.version}</version>
1731-
</dependency>
1732-
<dependency>
1733-
<groupId>org.glassfish.jersey.ext</groupId>
1734-
<artifactId>jersey-bean-validation</artifactId>
1735-
<version>${jersey.version}</version>
1736-
</dependency>
1737-
<dependency>
1738-
<groupId>org.glassfish.jersey.ext</groupId>
1739-
<artifactId>jersey-entity-filtering</artifactId>
1740-
<version>${jersey.version}</version>
1741-
</dependency>
1742-
<dependency>
1743-
<groupId>org.glassfish.jersey.ext</groupId>
1744-
<artifactId>jersey-spring4</artifactId>
1745-
<version>${jersey.version}</version>
1746-
<exclusions>
1747-
<exclusion>
1748-
<groupId>org.glassfish.hk2.external</groupId>
1749-
<artifactId>bean-validator</artifactId>
1750-
</exclusion>
1751-
</exclusions>
1752-
</dependency>
1753-
<dependency>
1754-
<groupId>org.glassfish.jersey.media</groupId>
1755-
<artifactId>jersey-media-jaxb</artifactId>
1756-
<version>${jersey.version}</version>
1757-
</dependency>
1758-
<dependency>
1759-
<groupId>org.glassfish.jersey.media</groupId>
1760-
<artifactId>jersey-media-json-jackson</artifactId>
1761-
<version>${jersey.version}</version>
1762-
</dependency>
1763-
<dependency>
1764-
<groupId>org.glassfish.jersey.media</groupId>
1765-
<artifactId>jersey-media-multipart</artifactId>
1708+
<groupId>org.glassfish.jersey</groupId>
1709+
<artifactId>jersey-bom</artifactId>
17661710
<version>${jersey.version}</version>
1711+
<scope>import</scope>
1712+
<type>pom</type>
17671713
</dependency>
17681714
<dependency>
17691715
<groupId>org.hamcrest</groupId>

spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@
8989
<groupId>org.jvnet</groupId>
9090
<artifactId>tiger-types</artifactId>
9191
</exclusion>
92+
<exclusion>
93+
<groupId>org.glassfish.hk2.external</groupId>
94+
<artifactId>bean-validator</artifactId>
95+
</exclusion>
9296
<exclusion>
9397
<groupId>org.glassfish.hk2.external</groupId>
9498
<artifactId>javax.inject</artifactId>

0 commit comments

Comments
 (0)