From 0edf75b74e1280f1b36d2fd3107ed09e33146d4a Mon Sep 17 00:00:00 2001
From: Reingold Shekhtel <raikbitters@gmail.com>
Date: Fri, 4 Oct 2024 11:06:34 +0200
Subject: [PATCH] Remove def for daoCommitHash and commonsCommitHash

---
 Dockerfile   | 8 ++++----
 build.gradle | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e82a4a42..a9742504 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 FROM --platform=$BUILDPLATFORM gradle:8.10.0-jdk21-alpine AS build
 ARG RELEASE_MODE
 ARG APP_VERSION
-ARG DAO_COMMIT_HASH
-ARG COMMONS_COMMIT_HASH
+ARG DAO_COMMIT_HASH=develop-SNAPSHOT
+ARG COMMONS_COMMIT_HASH=develop-SNAPSHOT
 WORKDIR /usr/app
 COPY . /usr/app
 RUN if [ "${RELEASE_MODE}" = true ]; then \
@@ -10,8 +10,8 @@ RUN if [ "${RELEASE_MODE}" = true ]; then \
         -PreleaseMode=true \
         -Dorg.gradle.project.version=${APP_VERSION}; \
     else gradle build --no-build-cache --exclude-task test \
-      -PdaoCommitHash= ${DAO_COMMIT_HASH} \
-      -PcommonsCommitHash= ${COMMONS_COMMIT_HASH}\
+      -PdaoCommitHash=${DAO_COMMIT_HASH} \
+      -PcommonsCommitHash=${COMMONS_COMMIT_HASH}\
       -Dorg.gradle.project.version=${APP_VERSION}; fi
 
 FROM amazoncorretto:21.0.4
diff --git a/build.gradle b/build.gradle
index 229d9bd0..7955d4d9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,9 +6,6 @@ plugins {
     id "org.owasp.dependencycheck" version "9.0.9"
 }
 
-def daoCommitHash = project.hasProperty('daoCommitHash') ? project.daoCommitHash : 'develop-SNAPSHOT'
-def commonsCommitHash = project.hasProperty('commonsCommitHash') ? project.commonsCommitHash : 'develop-SNAPSHOT'
-
 apply from: 'project-properties.gradle'
 //apply from: "$scriptsUrl/build-docker.gradle"
 apply from: "$scriptsUrl/build-info.gradle"