From 4ae609400ea31ac4cb9c77906a8d0dab5c1a1733 Mon Sep 17 00:00:00 2001 From: panos-kakos Date: Fri, 3 Oct 2025 12:20:13 +0300 Subject: [PATCH] [JAVA-45071] Moved gradle-jacoco from gradle submodule to parent module(gradle-modules) --- .../{gradle => }/gradle-jacoco/build.gradle | 9 +- .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../{gradle => }/gradle-jacoco/gradlew | 0 .../{gradle => }/gradle-jacoco/gradlew.bat | 178 +++++++++--------- .../{gradle => }/gradle-jacoco/lombok.config | 0 .../gradle-jacoco/settings.gradle | 0 .../java/com/baeldung/config/AppConfig.java | 0 .../java/com/baeldung/domain/Product.java | 0 .../java/com/baeldung/dto/ExcludedPOJO.java | 0 .../java/com/baeldung/dto/ProductDTO.java | 0 .../java/com/baeldung/generated/Customer.java | 0 .../com/baeldung/generated/Generated.java | 0 .../com/baeldung/service/CustomerService.java | 0 .../com/baeldung/service/ProductService.java | 0 .../service/CustomerServiceUnitTest.java | 0 .../service/ProductServiceUnitTest.java | 0 .../features/account_credited.feature | 0 gradle-modules/settings.gradle | 1 + 19 files changed, 95 insertions(+), 95 deletions(-) rename gradle-modules/{gradle => }/gradle-jacoco/build.gradle (86%) rename gradle-modules/{gradle => }/gradle-jacoco/gradle/wrapper/gradle-wrapper.jar (100%) rename gradle-modules/{gradle => }/gradle-jacoco/gradle/wrapper/gradle-wrapper.properties (93%) rename gradle-modules/{gradle => }/gradle-jacoco/gradlew (100%) mode change 100755 => 100644 rename gradle-modules/{gradle => }/gradle-jacoco/gradlew.bat (96%) rename gradle-modules/{gradle => }/gradle-jacoco/lombok.config (100%) rename gradle-modules/{gradle => }/gradle-jacoco/settings.gradle (100%) rename gradle-modules/{gradle => }/gradle-jacoco/src/main/java/com/baeldung/config/AppConfig.java (100%) rename gradle-modules/{gradle => }/gradle-jacoco/src/main/java/com/baeldung/domain/Product.java (100%) rename gradle-modules/{gradle => }/gradle-jacoco/src/main/java/com/baeldung/dto/ExcludedPOJO.java (100%) rename gradle-modules/{gradle => }/gradle-jacoco/src/main/java/com/baeldung/dto/ProductDTO.java (100%) rename gradle-modules/{gradle => }/gradle-jacoco/src/main/java/com/baeldung/generated/Customer.java (100%) rename gradle-modules/{gradle => }/gradle-jacoco/src/main/java/com/baeldung/generated/Generated.java (100%) rename gradle-modules/{gradle => }/gradle-jacoco/src/main/java/com/baeldung/service/CustomerService.java (100%) rename gradle-modules/{gradle => }/gradle-jacoco/src/main/java/com/baeldung/service/ProductService.java (100%) rename gradle-modules/{gradle => }/gradle-jacoco/src/test/java/com/baeldung/service/CustomerServiceUnitTest.java (100%) rename gradle-modules/{gradle => }/gradle-jacoco/src/test/java/com/baeldung/service/ProductServiceUnitTest.java (100%) rename gradle-modules/{gradle => }/gradle-jacoco/src/test/resources/features/account_credited.feature (100%) diff --git a/gradle-modules/gradle/gradle-jacoco/build.gradle b/gradle-modules/gradle-jacoco/build.gradle similarity index 86% rename from gradle-modules/gradle/gradle-jacoco/build.gradle rename to gradle-modules/gradle-jacoco/build.gradle index ef9e0a9c7c6e..245e80af4274 100644 --- a/gradle-modules/gradle/gradle-jacoco/build.gradle +++ b/gradle-modules/gradle-jacoco/build.gradle @@ -1,4 +1,3 @@ - plugins { id 'java' id 'jacoco' @@ -6,7 +5,7 @@ plugins { ext { junitVersion = '5.7.2' - lombokVersion = '1.18.20' + lombokVersion = '1.18.32' } group 'com.com.baeldung' @@ -17,8 +16,8 @@ repositories { } java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } dependencies { @@ -50,5 +49,5 @@ jacocoTestReport { } jacoco { - toolVersion = "0.8.6" + toolVersion = "0.8.11" } diff --git a/gradle-modules/gradle/gradle-jacoco/gradle/wrapper/gradle-wrapper.jar b/gradle-modules/gradle-jacoco/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from gradle-modules/gradle/gradle-jacoco/gradle/wrapper/gradle-wrapper.jar rename to gradle-modules/gradle-jacoco/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle-modules/gradle/gradle-jacoco/gradle/wrapper/gradle-wrapper.properties b/gradle-modules/gradle-jacoco/gradle/wrapper/gradle-wrapper.properties similarity index 93% rename from gradle-modules/gradle/gradle-jacoco/gradle/wrapper/gradle-wrapper.properties rename to gradle-modules/gradle-jacoco/gradle/wrapper/gradle-wrapper.properties index da9702f9e70d..48c0a02ca419 100644 --- a/gradle-modules/gradle/gradle-jacoco/gradle/wrapper/gradle-wrapper.properties +++ b/gradle-modules/gradle-jacoco/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradle-modules/gradle/gradle-jacoco/gradlew b/gradle-modules/gradle-jacoco/gradlew old mode 100755 new mode 100644 similarity index 100% rename from gradle-modules/gradle/gradle-jacoco/gradlew rename to gradle-modules/gradle-jacoco/gradlew diff --git a/gradle-modules/gradle/gradle-jacoco/gradlew.bat b/gradle-modules/gradle-jacoco/gradlew.bat similarity index 96% rename from gradle-modules/gradle/gradle-jacoco/gradlew.bat rename to gradle-modules/gradle-jacoco/gradlew.bat index ac1b06f93825..107acd32c4e6 100644 --- a/gradle-modules/gradle/gradle-jacoco/gradlew.bat +++ b/gradle-modules/gradle-jacoco/gradlew.bat @@ -1,89 +1,89 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/gradle-modules/gradle/gradle-jacoco/lombok.config b/gradle-modules/gradle-jacoco/lombok.config similarity index 100% rename from gradle-modules/gradle/gradle-jacoco/lombok.config rename to gradle-modules/gradle-jacoco/lombok.config diff --git a/gradle-modules/gradle/gradle-jacoco/settings.gradle b/gradle-modules/gradle-jacoco/settings.gradle similarity index 100% rename from gradle-modules/gradle/gradle-jacoco/settings.gradle rename to gradle-modules/gradle-jacoco/settings.gradle diff --git a/gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/config/AppConfig.java b/gradle-modules/gradle-jacoco/src/main/java/com/baeldung/config/AppConfig.java similarity index 100% rename from gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/config/AppConfig.java rename to gradle-modules/gradle-jacoco/src/main/java/com/baeldung/config/AppConfig.java diff --git a/gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/domain/Product.java b/gradle-modules/gradle-jacoco/src/main/java/com/baeldung/domain/Product.java similarity index 100% rename from gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/domain/Product.java rename to gradle-modules/gradle-jacoco/src/main/java/com/baeldung/domain/Product.java diff --git a/gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/dto/ExcludedPOJO.java b/gradle-modules/gradle-jacoco/src/main/java/com/baeldung/dto/ExcludedPOJO.java similarity index 100% rename from gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/dto/ExcludedPOJO.java rename to gradle-modules/gradle-jacoco/src/main/java/com/baeldung/dto/ExcludedPOJO.java diff --git a/gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/dto/ProductDTO.java b/gradle-modules/gradle-jacoco/src/main/java/com/baeldung/dto/ProductDTO.java similarity index 100% rename from gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/dto/ProductDTO.java rename to gradle-modules/gradle-jacoco/src/main/java/com/baeldung/dto/ProductDTO.java diff --git a/gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/generated/Customer.java b/gradle-modules/gradle-jacoco/src/main/java/com/baeldung/generated/Customer.java similarity index 100% rename from gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/generated/Customer.java rename to gradle-modules/gradle-jacoco/src/main/java/com/baeldung/generated/Customer.java diff --git a/gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/generated/Generated.java b/gradle-modules/gradle-jacoco/src/main/java/com/baeldung/generated/Generated.java similarity index 100% rename from gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/generated/Generated.java rename to gradle-modules/gradle-jacoco/src/main/java/com/baeldung/generated/Generated.java diff --git a/gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/service/CustomerService.java b/gradle-modules/gradle-jacoco/src/main/java/com/baeldung/service/CustomerService.java similarity index 100% rename from gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/service/CustomerService.java rename to gradle-modules/gradle-jacoco/src/main/java/com/baeldung/service/CustomerService.java diff --git a/gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/service/ProductService.java b/gradle-modules/gradle-jacoco/src/main/java/com/baeldung/service/ProductService.java similarity index 100% rename from gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/service/ProductService.java rename to gradle-modules/gradle-jacoco/src/main/java/com/baeldung/service/ProductService.java diff --git a/gradle-modules/gradle/gradle-jacoco/src/test/java/com/baeldung/service/CustomerServiceUnitTest.java b/gradle-modules/gradle-jacoco/src/test/java/com/baeldung/service/CustomerServiceUnitTest.java similarity index 100% rename from gradle-modules/gradle/gradle-jacoco/src/test/java/com/baeldung/service/CustomerServiceUnitTest.java rename to gradle-modules/gradle-jacoco/src/test/java/com/baeldung/service/CustomerServiceUnitTest.java diff --git a/gradle-modules/gradle/gradle-jacoco/src/test/java/com/baeldung/service/ProductServiceUnitTest.java b/gradle-modules/gradle-jacoco/src/test/java/com/baeldung/service/ProductServiceUnitTest.java similarity index 100% rename from gradle-modules/gradle/gradle-jacoco/src/test/java/com/baeldung/service/ProductServiceUnitTest.java rename to gradle-modules/gradle-jacoco/src/test/java/com/baeldung/service/ProductServiceUnitTest.java diff --git a/gradle-modules/gradle/gradle-jacoco/src/test/resources/features/account_credited.feature b/gradle-modules/gradle-jacoco/src/test/resources/features/account_credited.feature similarity index 100% rename from gradle-modules/gradle/gradle-jacoco/src/test/resources/features/account_credited.feature rename to gradle-modules/gradle-jacoco/src/test/resources/features/account_credited.feature diff --git a/gradle-modules/settings.gradle b/gradle-modules/settings.gradle index e0a6a7674544..955e72e929bc 100644 --- a/gradle-modules/settings.gradle +++ b/gradle-modules/settings.gradle @@ -7,3 +7,4 @@ include 'gradle-8' include 'gradle-customization' include 'gradle-core' include 'gradle-java-config' +include 'gradle-jacoco'