Skip to content

Commit

Permalink
Merge pull request #405 from RWS/hotfix/UDP-11119
Browse files Browse the repository at this point in the history
UDP-11119 : Fixed SCA
  • Loading branch information
ben-gineer authored Sep 22, 2024
2 parents 3f07dc0 + 354c28d commit 3a97270
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
- name: Build
run: |
mvn install --batch-mode --no-transfer-progress \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_CENTRAL_TOKEN
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,29 +86,29 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<javadoc.source.dir>${project.basedir}/src/javadoc</javadoc.source.dir>
<java.version>17</java.version>
<java.version>21</java.version>

<!-- Third party dependency versions, sorted alphabetically -->
<brave.version>4.13.6</brave.version>
<guava.version>33.2.0-jre</guava.version>
<httpcomponents.version>4.5.14</httpcomponents.version>
<jackson.version>2.14.3</jackson.version>
<jackson.version>2.17.2</jackson.version>
<!-- Note that jacoco 0.8.10 breaks mockito! -->
<jacoco.version>0.8.11</jacoco.version>
<jakarta-annotation-api.version>3.0.0</jakarta-annotation-api.version>
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
<junit-jupiter.version>5.9.2</junit-jupiter.version>
<logback.version>1.5.6</logback.version>
<logback.version>1.5.8</logback.version>
<mockito-junit5.version>4.5.1</mockito-junit5.version>
<pekko.version>1.0.3</pekko.version>
<scala-genjavadoc-plugin.version>0.19</scala-genjavadoc-plugin.version>
<scala-parser-combinators.version>2.1.1</scala-parser-combinators.version>
<scala.version>2.12.19</scala.version>
<scalatest.version>3.1.4</scalatest.version>
<slf4j.version>2.0.13</slf4j.version>
<spring-boot.version>3.3.1</spring-boot.version>
<spring.version>6.1.11</spring.version>
<tomcat.version>10.1.25</tomcat.version>
<spring-boot.version>3.3.4</spring-boot.version>
<spring.version>6.1.13</spring.version>
<tomcat.version>10.1.30</tomcat.version>
<typesafe-config.version>1.4.3</typesafe-config.version>
<xerces.version>2.12.2</xerces.version>
<zipkin-sender.version>1.1.2</zipkin-sender.version>
Expand Down Expand Up @@ -714,7 +714,7 @@
<configuration>
<rules>
<requireJavaVersion>
<version>[${java.version},18]</version>
<version>[${java.version},22]</version>
</requireJavaVersion>
<requireMavenVersion>
<version>3.8.6</version>
Expand Down

0 comments on commit 3a97270

Please sign in to comment.