From 9731526fe47478ae8356c60d38579ff389eb11ed Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 15:30:15 +0530 Subject: [PATCH 01/25] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2b60d6a0..9723c821 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ test { sonarqube { properties { - property 'sonar.host.url', 'http://34.125.201.58:9000' + property 'sonar.host.url', 'http://3.110.169.100:9000' property 'sonar.login', '******' } } From 8b85841003dd07c5d2f354bba1d5cb38179a2481 Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 15:36:24 +0530 Subject: [PATCH 02/25] Update build.gradle --- build.gradle | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 9723c821..f75f4af0 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,10 @@ test { sonarqube { properties { - property 'sonar.host.url', 'http://3.110.169.100:9000' - property 'sonar.login', '******' + // Dynamically fetch the SonarQube host URL from environment variable or default to localhost + property 'sonar.host.url', System.getenv('SONAR_HOST_URL') ?: 'http://localhost:9000' + + // Dynamically fetch the SonarQube login token from environment variable or set it manually + property 'sonar.login', System.getenv('SONAR_LOGIN') ?: 'default-sonar-token' } } From 634709f609182fc132fa0b6038961a24abdd6000 Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 15:49:00 +0530 Subject: [PATCH 03/25] Update build.gradle --- build.gradle | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index f75f4af0..9723c821 100644 --- a/build.gradle +++ b/build.gradle @@ -28,10 +28,7 @@ test { sonarqube { properties { - // Dynamically fetch the SonarQube host URL from environment variable or default to localhost - property 'sonar.host.url', System.getenv('SONAR_HOST_URL') ?: 'http://localhost:9000' - - // Dynamically fetch the SonarQube login token from environment variable or set it manually - property 'sonar.login', System.getenv('SONAR_LOGIN') ?: 'default-sonar-token' + property 'sonar.host.url', 'http://3.110.169.100:9000' + property 'sonar.login', '******' } } From cfe4bff364aced9c45c74dfb3395fd5da4d4ff20 Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 15:54:47 +0530 Subject: [PATCH 04/25] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9723c821..ec2c9582 100644 --- a/build.gradle +++ b/build.gradle @@ -29,6 +29,6 @@ test { sonarqube { properties { property 'sonar.host.url', 'http://3.110.169.100:9000' - property 'sonar.login', '******' + property 'sonar.login', 'squ_e94fbf0cf2b3c558e7296ad8fcb7fbc503dde079' } } From 16f64db7cbe11689c4982657839d20a33085eb2a Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 16:03:29 +0530 Subject: [PATCH 05/25] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ec2c9582..8391ef4a 100644 --- a/build.gradle +++ b/build.gradle @@ -29,6 +29,6 @@ test { sonarqube { properties { property 'sonar.host.url', 'http://3.110.169.100:9000' - property 'sonar.login', 'squ_e94fbf0cf2b3c558e7296ad8fcb7fbc503dde079' + property 'sonar.login', 'squ_40e8fe9e2db4b6c2e2dac615738348162d8151c5' } } From 77279cb93825861d8a5e52bd5d65c26985d79f01 Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 16:07:08 +0530 Subject: [PATCH 06/25] Update gradle-wrapper.properties --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 05679dc3..831986c6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 95c4a2269fbc6a2566762b6308be68dd2e9b1087 Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 16:09:04 +0530 Subject: [PATCH 07/25] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8391ef4a..9723c821 100644 --- a/build.gradle +++ b/build.gradle @@ -29,6 +29,6 @@ test { sonarqube { properties { property 'sonar.host.url', 'http://3.110.169.100:9000' - property 'sonar.login', 'squ_40e8fe9e2db4b6c2e2dac615738348162d8151c5' + property 'sonar.login', '******' } } From 3e9a85264e0d9e5f7aaace8a42e20e6c296f2b05 Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 16:25:51 +0530 Subject: [PATCH 08/25] Update build.gradle --- build.gradle | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 9723c821..448e0ffd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,9 @@ plugins { - id 'org.springframework.boot' version '2.5.4' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' - id 'java' - id 'war' - id 'org.sonarqube' version '3.3' + id 'org.springframework.boot' version '2.5.4' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' + id 'war' + id 'org.sonarqube' version '3.3' } group = 'com.example' @@ -11,24 +11,23 @@ version = '0.0.1-SNAPSHOT' sourceCompatibility = '1.8' repositories { - mavenCentral() + mavenCentral() } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' - implementation 'org.springframework.boot:spring-boot-starter-web' - providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat' - testImplementation 'org.springframework.boot:spring-boot-starter-test' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-starter-web' + providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat' + testImplementation 'org.springframework.boot:spring-boot-starter-test' } test { - useJUnitPlatform() + useJUnitPlatform() } - sonarqube { properties { property 'sonar.host.url', 'http://3.110.169.100:9000' - property 'sonar.login', '******' + property 'sonar.login', System.getenv('SONAR_TOKEN') // Secure the token using environment variables } } From a4c717ff83fb4174cf910a29c7237c3f2317137a Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 17:00:29 +0530 Subject: [PATCH 09/25] Update build.gradle --- build.gradle | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 448e0ffd..907664ef 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,10 @@ plugins { group = 'com.example' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' + +// Update Java compatibility to Java 17 +sourceCompatibility = '17' +targetCompatibility = '17' repositories { mavenCentral() @@ -25,9 +28,10 @@ test { useJUnitPlatform() } +// SonarQube configuration with dynamic project key and secure token from environment variables sonarqube { properties { - property 'sonar.host.url', 'http://3.110.169.100:9000' - property 'sonar.login', System.getenv('SONAR_TOKEN') // Secure the token using environment variables + property 'sonar.host.url', 'http://3.110.169.100:9000' // Update if necessary + property 'sonar.login', System.getenv('SONAR_TOKEN') // Secure token from environmen } } From 674bd93e20b1fd25055b5ac0902ed527a17d38be Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 17:07:07 +0530 Subject: [PATCH 10/25] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 907664ef..04e503de 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,6 @@ test { sonarqube { properties { property 'sonar.host.url', 'http://3.110.169.100:9000' // Update if necessary - property 'sonar.login', System.getenv('SONAR_TOKEN') // Secure token from environmen + property 'sonar.login', System.getenv('SONAR_TOKEN') // Secure token from environme } } From 74e41844215dd5e2602d976be9dbd32919f1cbde Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 17:23:25 +0530 Subject: [PATCH 11/25] Update build.gradle --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 04e503de..7ca99aa1 100644 --- a/build.gradle +++ b/build.gradle @@ -10,8 +10,8 @@ group = 'com.example' version = '0.0.1-SNAPSHOT' // Update Java compatibility to Java 17 -sourceCompatibility = '17' -targetCompatibility = '17' +sourceCompatibility = '1.8' +//targetCompatibility = '17' repositories { mavenCentral() From 27fcacfff922ea49ace2b547ef1c016a1c7e7d09 Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 17:26:48 +0530 Subject: [PATCH 12/25] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7ca99aa1..01060d1c 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,6 @@ test { sonarqube { properties { property 'sonar.host.url', 'http://3.110.169.100:9000' // Update if necessary - property 'sonar.login', System.getenv('SONAR_TOKEN') // Secure token from environme + property 'sonar.login', '******' // Secure token from environme } } From f5218d6303dc9d21c413e5072860c8385b1710c7 Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 17:35:42 +0530 Subject: [PATCH 13/25] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 01060d1c..e9e2a643 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,6 @@ test { sonarqube { properties { property 'sonar.host.url', 'http://3.110.169.100:9000' // Update if necessary - property 'sonar.login', '******' // Secure token from environme + property 'sonar.login', 'squ_dcab12b8c2d7158bdbc0912bb0e5f20d936bd6d2' // Secure token from environme } } From 3e4ea13cc9f015257ce6e22a9b3c1db2fdc3869e Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 17:39:44 +0530 Subject: [PATCH 14/25] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f02131ce..a8ab551f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v2 with: - java-version: '11' + java-version: '17' distribution: 'adopt' cache: gradle - name: Grant execute permission for gradlew From ea5bcca98f4ed3f5d2c7b36b4c9968da0855ad69 Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 17:40:10 +0530 Subject: [PATCH 15/25] Update cicd.yml --- .github/workflows/cicd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index d6773d69..37da87e4 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -18,7 +18,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v2 with: - java-version: '11' + java-version: '17' distribution: 'adopt' cache: gradle - name: Grant execute permission for gradlew From a7b2fb2c787c7f2f6bd9469fdb65dedafe55f5f4 Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 17:41:39 +0530 Subject: [PATCH 16/25] Update sonar-project.properties --- sonar-project.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/sonar-project.properties b/sonar-project.properties index 3f7e5334..52fbfab0 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,3 +1,4 @@ sonar.projectKey=CICD_Java_gradle_application sonar.java.binaries=. sonar.exclusions=build/** +sonar.source=. From 1900e89163dd442785dc9e31474815e57eca3914 Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 17:53:11 +0530 Subject: [PATCH 17/25] Update build.gradle --- build.gradle | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e9e2a643..59cd54dc 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,9 @@ test { // SonarQube configuration with dynamic project key and secure token from environment variables sonarqube { properties { - property 'sonar.host.url', 'http://3.110.169.100:9000' // Update if necessary - property 'sonar.login', 'squ_dcab12b8c2d7158bdbc0912bb0e5f20d936bd6d2' // Secure token from environme + property 'sonar.host.url', 'http://3.110.169.100:9000' // Update with the correct SonarQube server URL + property 'sonar.login', System.getenv('SONAR_TOKEN') // Secure token from environment variable + property 'sonar.projectKey', 'CICD_Java_gradle_application' // Replace with your project's unique key + property 'sonar.projectName', 'CICD_Java_gradle_application' // Replace with your project's name } } From b0fc0fcfcc9379ffcfcf6c71de9a8d5bb9d9758a Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 17:56:18 +0530 Subject: [PATCH 18/25] Update build.gradle --- build.gradle | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 59cd54dc..7219ea2f 100644 --- a/build.gradle +++ b/build.gradle @@ -29,11 +29,4 @@ test { } // SonarQube configuration with dynamic project key and secure token from environment variables -sonarqube { - properties { - property 'sonar.host.url', 'http://3.110.169.100:9000' // Update with the correct SonarQube server URL - property 'sonar.login', System.getenv('SONAR_TOKEN') // Secure token from environment variable - property 'sonar.projectKey', 'CICD_Java_gradle_application' // Replace with your project's unique key - property 'sonar.projectName', 'CICD_Java_gradle_application' // Replace with your project's name - } -} + From f4b6e29fc383999c476c687c58578c48a56c9194 Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Thu, 9 Jan 2025 18:24:17 +0530 Subject: [PATCH 19/25] Update build.gradle --- build.gradle | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 7219ea2f..1e8ba502 100644 --- a/build.gradle +++ b/build.gradle @@ -1,32 +1,34 @@ plugins { - id 'org.springframework.boot' version '2.5.4' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' - id 'java' - id 'war' - id 'org.sonarqube' version '3.3' + id 'org.springframework.boot' version '2.5.4' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' + id 'war' + id 'org.sonarqube' version '3.3' } group = 'com.example' version = '0.0.1-SNAPSHOT' - -// Update Java compatibility to Java 17 sourceCompatibility = '1.8' -//targetCompatibility = '17' repositories { - mavenCentral() + mavenCentral() } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' - implementation 'org.springframework.boot:spring-boot-starter-web' - providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat' - testImplementation 'org.springframework.boot:spring-boot-starter-test' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-starter-web' + providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat' + testImplementation 'org.springframework.boot:spring-boot-starter-test' } test { - useJUnitPlatform() + useJUnitPlatform() } -// SonarQube configuration with dynamic project key and secure token from environment variables +sonarqube { + properties { + property 'sonar.host.url', 'http://34.125.75.197:9000' + property 'sonar.login', '******' + } +} From 6f7acbd9098a3be04b6ed4815f41013f2ed8d3e0 Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Fri, 10 Jan 2025 00:45:51 +0530 Subject: [PATCH 20/25] Update gradle-wrapper.properties --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 831986c6..e750102e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 6b18fdd6c887ce9177a13d3dd5cf545c7eb9ea0c Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Fri, 10 Jan 2025 00:49:17 +0530 Subject: [PATCH 21/25] Update gradlew --- gradlew | 195 +++++++++++--------------------------------------------- 1 file changed, 36 insertions(+), 159 deletions(-) diff --git a/gradlew b/gradlew index 744e882e..f865c259 100644 --- a/gradlew +++ b/gradlew @@ -1,185 +1,62 @@ #!/usr/bin/env sh # -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Gradle start-up script for UN*X systems # -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link +# Resolve APP_HOME PRG="$0" -# Need this for relative symlinks. while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then + link=`ls -ld "$PRG" | sed 's/.*-> //'` + if echo "$link" | grep '^/' >/dev/null; then PRG="$link" else - PRG=`dirname "$PRG"`"/$link" + PRG="`dirname \"$PRG\"`/$link" fi done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null +APP_HOME="`cd \"\`dirname \"$PRG\"\`\" && pwd`" APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MSYS* | MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME +# Default JVM options +DEFAULT_JVM_OPTS='"-Xmx256m" "-Xms256m"' -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." +# Ensure JAVA_HOME is set +if [ -n "$JAVA_HOME" ]; then + JAVACMD="$JAVA_HOME/bin/java" + if [ ! -x "$JAVACMD" ]; then + echo "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME" + echo "Please set JAVA_HOME to the correct location of your Java installation." + exit 1 fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + JAVACMD=`which java 2>/dev/null` + if [ -z "$JAVACMD" ]; then + echo "ERROR: JAVA_HOME is not set, and no 'java' command could be found in your PATH." + echo "Please set JAVA_HOME to the correct location of your Java installation." + exit 1 fi fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +# Verify Java version (ensure compatibility with Java 17) +JAVA_VERSION=$("$JAVACMD" -version 2>&1 | awk -F '"' '/version/ {print $2}') +if [ "${JAVA_VERSION%%.*}" -lt 17 ]; then + echo "ERROR: Java 17 or later is required. Current version is $JAVA_VERSION." + exit 1 fi -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi +# Determine the classpath +CLASSPATH="$APP_HOME/gradle/wrapper/gradle-wrapper.jar" -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Prepare Gradle options +GRADLE_OPTS="${GRADLE_OPTS:-""}" -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Build the Java command +COMMAND="\"$JAVACMD\"" +COMMAND="$COMMAND $DEFAULT_JVM_OPTS" +COMMAND="$COMMAND -Dorg.gradle.appname=\"$APP_BASE_NAME\"" +COMMAND="$COMMAND -classpath \"$CLASSPATH\" org.gradle.wrapper.GradleWrapperMain \"$@\"" -exec "$JAVACMD" "$@" +# Execute the command +eval exec $COMMAND From c7f875447a2a5fd843ee1f7f680fda83f679dc0c Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Fri, 10 Jan 2025 00:51:04 +0530 Subject: [PATCH 22/25] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1e8ba502..f0b3b71b 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ test { sonarqube { properties { - property 'sonar.host.url', 'http://34.125.75.197:9000' + property 'sonar.host.url', 'http://3.111.157.83:9000' property 'sonar.login', '******' } } From 870c177030a99ffe97de3a98824f13b60ceee300 Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Fri, 10 Jan 2025 01:03:07 +0530 Subject: [PATCH 23/25] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f0b3b71b..f45e72b0 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ test { sonarqube { properties { - property 'sonar.host.url', 'http://3.111.157.83:9000' + property 'sonar.host.url', 'http:/65.2.166.247:9000' property 'sonar.login', '******' } } From b74ef3c3d6326cf0be5622327987efa51e5f3430 Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:24:53 +0530 Subject: [PATCH 24/25] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f45e72b0..e600ad7f 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ test { sonarqube { properties { - property 'sonar.host.url', 'http:/65.2.166.247:9000' + property 'sonar.host.url', 'http://3.6.86.249/:9000' property 'sonar.login', '******' } } From ff994dace3d55bce256a70c5e5fdc492a0b4145a Mon Sep 17 00:00:00 2001 From: Atharva Kumbhar <160429511+atharva5683@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:43:23 +0530 Subject: [PATCH 25/25] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f9c20863..4e5bf999 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # this is multi stage -FROM openjdk:11 as base +FROM openjdk:17 as base WORKDIR /app COPY . . RUN chmod +x gradlew