Skip to content

Commit

Permalink
chore(deps): update maven all non-major dependencies (#82)
Browse files Browse the repository at this point in the history
* chore(deps): update maven all non-major dependencies

* few improvements

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: OMPRAKASH MISHRA <omprakashmishra3978@gmail.com>
  • Loading branch information
renovate[bot] and mishraomp authored Aug 20, 2024
1 parent aae0316 commit 6f4f4d0
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,16 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: bcgov-nr/action-builder-ghcr@v2.0.2
- uses: bcgov-nr/action-builder-ghcr@v2.2.0
with:
package: ${{ matrix.package }}
tag: ${{ needs.semantic-release.outputs.tag }}
tag: ${{ needs.semantic-release.outputs.version }}
token: ${{ secrets.GITHUB_TOKEN }}
build_file: ${{ matrix.build_file }}
build_context: ${{ matrix.build_context }}
triggers: ${{ matrix.triggers }}
build_args: |
APP_VERSION=${{ needs.semantic-release.outputs.tag }}
APP_VERSION=${{ needs.semantic-release.outputs.version }}
helm-release:
runs-on: ubuntu-22.04
needs: [builds,semantic-release]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-open.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: bcgov-nr/action-builder-ghcr@v2.0.2
- uses: bcgov-nr/action-builder-ghcr@v2.2.0
with:
package: ${{ matrix.package }}
tag: ${{ github.event.number }}
Expand All @@ -57,7 +57,7 @@ jobs:
secret_path_env: dev # this path is different from the path in the broker
steps:
- uses: actions/checkout@v4

- name: Deploy to Openshift
working-directory: charts/nr-oracle-service
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN ./mvnw package -Pnative -DskipTests
#RUN ./mvnw package -DskipTests for JVM mode
HEALTHCHECK --interval=300s --timeout=30s CMD ./mvnw --version || exit 1
###
FROM quay.io/quarkus/quarkus-micro-image:2.0
FROM quay.io/quarkus/quarkus-micro-image:2.0 as deploy

Check warning on line 20 in Dockerfile

View workflow job for this annotation

GitHub Actions / Builds (nr-oracle-service)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
WORKDIR /work/
RUN chown 1001 /work \
&& chmod "g+rwX" /work \
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.certs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#This Dockerfile mounts the certs
FROM eclipse-temurin:21.0.4_7-jdk-alpine AS buildCert
FROM eclipse-temurin:21.0.4_7-jdk-alpine AS build-cert

ENV LANG en_CA.UTF-8
ENV LANGUAGE en_CA.UTF-8
ENV LC_ALL en_CA.UTF-8
ENV LANG=en_CA.UTF-8
ENV LANGUAGE=en_CA.UTF-8
ENV LC_ALL=en_CA.UTF-8
WORKDIR /app

RUN apk --no-cache add openssl
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<artifactId>nr-oracle-service</artifactId>
<version>0.2.25</version>
<properties>
<compiler-plugin.version>3.12.1</compiler-plugin.version>
<compiler-plugin.version>3.13.0</compiler-plugin.version>
<maven.compiler.release>21</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>3.13.2</quarkus.platform.version>
<skipITs>true</skipITs>
<surefire-plugin.version>3.2.5</surefire-plugin.version>
<surefire-plugin.version>3.4.0</surefire-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down

0 comments on commit 6f4f4d0

Please sign in to comment.