Skip to content

Commit

Permalink
Merge branch 'main' into COH-29462
Browse files Browse the repository at this point in the history
# Conflicts:
#	pom.xml
  • Loading branch information
vasac committed Mar 20, 2024
2 parents bb418f0 + 95d7846 commit 8631d99
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.java-version }}
uses: actions/setup-java@v4.1.0
uses: actions/setup-java@v4.2.1
with:
distribution: 'adopt'
java-version: ${{ matrix.java-version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v4.1.0
uses: actions/setup-java@v4.2.1
with:
distribution: 'oracle'
java-version: '17'
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Expand Up @@ -30,7 +30,7 @@
<container.version>${project.version}</container.version>
<jib.goal>dockerBuild</jib.goal>

<version.lib.awaitility>4.2.0</version.lib.awaitility>
<version.lib.awaitility>4.2.1</version.lib.awaitility>
<version.lib.bedrock>7.0.3</version.lib.bedrock>
<version.lib.coherence>23.09.2</version.lib.coherence>
<version.lib.coherence-spring>4.1.2</version.lib.coherence-spring>
Expand All @@ -39,10 +39,10 @@
<version.lib.rest-assured>5.4.0</version.lib.rest-assured>
<version.lib.spring-boot>3.2.3</version.lib.spring-boot>
<version.lib.spring-cloud>2023.0.0</version.lib.spring-cloud>
<version.lib.springdoc-openapi>2.3.0</version.lib.springdoc-openapi>
<version.lib.springdoc-openapi>2.4.0</version.lib.springdoc-openapi>
<version.lib.opentracing-spring-jaeger>3.3.1</version.lib.opentracing-spring-jaeger>

<version.plugin.dependency-check-maven>9.0.9</version.plugin.dependency-check-maven>
<version.plugin.dependency-check-maven>9.0.10</version.plugin.dependency-check-maven>
<version.plugin.jib>3.4.1</version.plugin.jib>
<version.plugin.failsafe>3.2.5</version.plugin.failsafe>
<version.plugin.maven-enforcer>3.4.1</version.plugin.maven-enforcer>
Expand Down

0 comments on commit 8631d99

Please sign in to comment.