Skip to content

Commit

Permalink
Override tomcat version coming in from spring-boot (use 9.0.82)
Browse files Browse the repository at this point in the history
  • Loading branch information
@cunningt
cunningt committed Oct 17, 2023
1 parent e45e81b commit eefa076
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 0 deletions.
1 change: 1 addition & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@
<plexus-component-metadata-plugin-version>2.1.0</plexus-component-metadata-plugin-version>
<surefire.version>${maven-surefire-plugin-version}</surefire.version>
<swagger-parser-v3-version>2.1.13</swagger-parser-v3-version>
<tomcat-version>9.0.82</tomcat-version>
<undertow-version>2.2.24.Final</undertow-version>
<camel-spring-boot-community.version>3.20.1</camel-spring-boot-community.version>
<cyclonedx-maven-plugin-version>2.7.5</cyclonedx-maven-plugin-version>
Expand Down
36 changes: 36 additions & 0 deletions tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,42 @@
<artifactId>undertow-servlet</artifactId>
<version>${undertow-version}</version>
</dependency>
<!-- Overrides for tomcat -->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-annotations-api</artifactId>
<version>${tomcat-version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
<version>${tomcat-version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jsp-api</artifactId>
<version>${tomcat-version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>${tomcat-version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
<version>${tomcat-version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<version>${tomcat-version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
<version>${tomcat-version}</version>
</dependency>
<!-- Overrides avro dependency version since SB's jackson version's takes precedence in camel-jackson-avro-starter -->
<dependency>
<groupId>org.apache.avro</groupId>
Expand Down
36 changes: 36 additions & 0 deletions tooling/redhat-camel-spring-boot-bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,42 @@
<artifactId>undertow-servlet</artifactId>
<version>2.2.24.Final</version>
</dependency>
<!-- Overrides for tomcat -->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-annotations-api</artifactId>
<version>9.0.82</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
<version>9.0.82</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jsp-api</artifactId>
<version>9.0.82</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>9.0.82</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
<version>9.0.82</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<version>9.0.82</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
<version>9.0.82</version>
</dependency>
<!-- Overrides avro dependency version since SB's jackson version's takes precedence in camel-jackson-avro-starter -->
<dependency>
<groupId>org.apache.avro</groupId>
Expand Down

0 comments on commit eefa076

Please sign in to comment.