Skip to content

Commit

Permalink
Merged branch '4.0.x' into '4.1.x'.
Browse files Browse the repository at this point in the history
Signed-off-by: Simone Bordet <[email protected]>
  • Loading branch information
sbordet committed Dec 10, 2024
2 parents c78aa21 + 49dce00 commit 4ff7b20
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ updates:
versions: [ ">=6.0.0" ]
- dependency-name: "org.testng:testng"
versions: [ ">=7.6.0" ]
- dependency-name: "org.apache.felix:maven-bundle-plugin"
versions: [ ">=6.0.0" ]

- package-ecosystem: "maven"
directory: "/"
Expand All @@ -29,6 +31,8 @@ updates:
versions: [ ">=11.0.0" ]
- dependency-name: "org.springframework:*"
versions: [ ">=6.0.0" ]
- dependency-name: "org.apache.felix:maven-bundle-plugin"
versions: [ ">=6.0.0" ]

- package-ecosystem: "maven"
directory: "/"
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jetty-version>12.1.0.alpha0</jetty-version>
<rxjava-version>3.1.9</rxjava-version>
<spring-version>6.1.14</spring-version>
<rxjava-version>3.1.10</rxjava-version>
<spring-version>6.2.0</spring-version>
<slf4j-version>2.0.16</slf4j-version>
<reactivestreams-version>1.0.4</reactivestreams-version>
</properties>
Expand Down Expand Up @@ -226,7 +226,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.10.1</version>
<version>3.11.2</version>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
Expand Down Expand Up @@ -254,15 +254,15 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
<configuration>
<excludedGroups>external</excludedGroups>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
<version>6.0.0</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
Expand Down

0 comments on commit 4ff7b20

Please sign in to comment.