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

Fix stable/8.7 CI #1499

Merged
merged 3 commits into from
Feb 17, 2025
Merged

Fix stable/8.7 CI #1499

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4db30d3
ci: move spring boot dependency management to parent
megglos Jan 15, 2025
d783025
deps: remove explicit httpcore dep
megglos Feb 17, 2025
6678c47
deps: remove explicit spring-core dependency
megglos Feb 17, 2025
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
15 changes: 9 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
<dependency.feel.version>1.17.7</dependency.feel.version>
<dependency.findbugs.version>3.0.2</dependency.findbugs.version>
<dependency.guava.version>33.2.0-jre</dependency.guava.version>
<dependency.httpcore5.version>5.2.5</dependency.httpcore5.version>
Copy link
Contributor Author

@megglos megglos Feb 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this conflicted with camunda/camunda already being on a new minor release of http core. I decided to remove it as there is no convergence issue anymore.

<dependency.immutables.version>2.10.1</dependency.immutables.version>
<dependency.jackson.version>2.17.0</dependency.jackson.version>
<dependency.javax.version>1.3.2</dependency.javax.version>
Expand All @@ -89,6 +88,7 @@
<dependency.scala.version>2.13.16</dependency.scala.version>
<dependency.slf4j.version>2.0.16</dependency.slf4j.version>
<dependency.snakeyaml.version>2.2</dependency.snakeyaml.version>
<dependency.spring-boot.version>3.4.2</dependency.spring-boot.version>
<dependency.spring.version>6.1.14</dependency.spring.version>
<dependency.testcontainers.version>1.19.8</dependency.testcontainers.version>
<dependency.zeebe.version>8.7.0-SNAPSHOT</dependency.zeebe.version>
Expand Down Expand Up @@ -428,11 +428,6 @@
<artifactId>byte-buddy</artifactId>
<version>${dependency.bytebuddy.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5</artifactId>
<version>${dependency.httpcore5.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
Expand Down Expand Up @@ -486,6 +481,14 @@
<artifactId>spring-core</artifactId>
<version>${dependency.spring.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${dependency.spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
14 changes: 0 additions & 14 deletions spring-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,8 @@

<properties>
<plugin.version.license>4.6</plugin.version.license>
<version.spring-boot>3.3.7</version.spring-boot>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${version.spring-boot}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
Expand Down
Loading