Skip to content

Commit

Permalink
Merged branch '2.0.x' into '3.0.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 4, 2023
2 parents c66f240 + 71088a5 commit d95b28a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Set Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jetty-version>11.0.18</jetty-version>
<rxjava-version>3.1.8</rxjava-version>
<spring-version>5.3.30</spring-version>
<spring-version>5.3.31</spring-version>
<slf4j-version>2.0.9</slf4j-version>
<reactivestreams-version>1.0.4</reactivestreams-version>
</properties>
Expand Down Expand Up @@ -222,7 +222,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.2</version>
<configuration>
<source>8</source>
<additionalOptions>
Expand Down Expand Up @@ -255,7 +255,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.1</version>
<version>3.2.2</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
Expand Down Expand Up @@ -372,7 +372,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.10.0</version>
<version>5.10.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit d95b28a

Please sign in to comment.