Skip to content

Commit

Permalink
Merge branch 'release/7.3' into IT-515
Browse files Browse the repository at this point in the history
  • Loading branch information
eugeniosant committed Jan 31, 2024
2 parents 2a4a0e8 + 141b555 commit a6724df
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.jvm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM entando/entando-k8s-operator-common:7.3.0
FROM entando/entando-k8s-operator-common:v7.3.1-ENG-5347-PR-152-BB-release-2F-7.3

ARG VERSION
LABEL name="Entando K8S Keycloak Controller" \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.native
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ARG VERSION
LABEL name="Entando K8S Keycloak Controller" \
vendor="Entando" \
version="v${VERSION}" \
release="7.0" \
release="7.3" \
summary="This container processes EntandoKeycloakServer custom resources." \
description="This is a run-to-completion container. It will deploy a Keycloak or RedHat SSO service to your cluster. \
Subsequent executions of this container against the same EntandoKeycloakServer will patch the existing \
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.entando</groupId>
<artifactId>entando-quarkus-parent</artifactId>
<version>7.3.0</version>
<version>7.3.1-ENG-5347-PR-54</version>
<relativePath/>
</parent>
<version>7.3.1</version>
Expand Down Expand Up @@ -64,7 +64,7 @@
<properties>
<github.organization>entando-k8s</github.organization>
<sonar.projectKey>${github.organization}_${project.artifactId}</sonar.projectKey>
<entando-k8s-operator-common.version>7.3.0-IT-515-PR-157</entando-k8s-operator-common.version>
<entando-k8s-operator-common.version>7.3.1-ENG-5451-PR-157</entando-k8s-operator-common.version>
<skipLicenseDownload>true</skipLicenseDownload>
<preDeploymentTestGroups>in-process</preDeploymentTestGroups>
<postDeploymentTestGroups>smoke</postDeploymentTestGroups>
Expand Down

0 comments on commit a6724df

Please sign in to comment.