Skip to content

Merge LGP 4.0 into Generate features update#1074

Open
turkeylurkey wants to merge 15 commits intoOpenLiberty:generate-features-updatefrom
turkeylurkey:generate-features-update
Open

Merge LGP 4.0 into Generate features update#1074
turkeylurkey wants to merge 15 commits intoOpenLiberty:generate-features-updatefrom
turkeylurkey:generate-features-update

Conversation

@turkeylurkey
Copy link
Copy Markdown
Member

The only conflicts with the feature branch were copyright comments.

sajeerzeji and others added 15 commits February 12, 2026 12:35
…erty#1045)

* Upgraded the gradle version and fixed the Core Infrastructure Tests issues (AbstractIntegrationTest.groovy, LibertyTest.groovy)

* Updated the gradle.yml to run the exclussive tests only

* Added a clean test while running server in LibertyTest.groovy

* Created a new ServerUtils utility class in io/openliberty/tools/gradle/utils/, Moved all the server verification and cleanup methods from StopTask to ServerUtils, Updated StopTask to use the methods from ServerUtils

* Removed excessive logging

* Updated the ServerUtils class to reduce the number of verification attempts from 10 to 5 and lowered the maximum wait time from 5000ms to 4000ms

* Updated the  to close all the resources those are opened. As a helper, a new class has been added  for Process/Resource operations.

* Renamed lock test file to include 'liberty' for better plugin identification

* Some of the logging was unnecessarily logger.lifecycle, changed it to debug

* Cleaning up the .force_stopped file on start and stop tasks

* Added proper debug messaged on StartTask.groovy -> start() method to address if the .liberty_plugin_force_stopped file is not delete or .liberty_plugin_force_stopped is not available

* Added the method to clean up force-stopped marker file to the Server utils and re-used it from StartTask.groovy and StopTask.groovy

* Updated copyrights for ProcessUtils.groovy and ServerUtils.groovy

* Changed the resource closings to try-with-resource way. And removed the closequitely method from ProcessUtils.groovy

* Added comments to explain wait time until server stopped

* .liberty_lock_test filename updated to .liberty_plugin_lock_test

* Updated the debug messages in the cleanupForceStoppedMarker method of ServerUtils.groovy

* forceStoppedMarker.delete() check moved to the if condition in cleanupForceStoppedMarker

* Corrected a debug log in cleanupForceStoppedMarker

* Updated the syntaxes of sourceCompatibility and targetCompatibility to support gradle 9 syntax

* Updated the method visibility to support Gradle 9 and Groovy 4 updates, private methods were having visibility issues within the groovy class

* Updated the syntaxes of sourceCompatibility and targetCompatibility to support gradle 9 syntax

* gradle.yml updates to support gradle 9 character encoding, java 17 only and newly fixed test files. build.gradle updates to support gradle 9 character encoding and java toolchain language version

* Github workflow issue fixes

* Github workflow issue fixes

* Github flow issues fixes

* Character encoding issue fixes for github workflow

* Github workflow error fixes

* Github workflow error fixes

* Github workflow error fixes - Windows was not excluding the test classes not mentioned in include

* GH Workflow issue fixes for windows runners

* Java 21 support added

* Java 21 support added

* Windows jobs updated

* Windows jobs updated

* Windows jobs updated

* Windows jobs updated

* Windows jobs updated

* Windows jobs updated

* Windows jobs updated

* Windows jobs updated

* Windows jobs updated

* Windows jobs updated

* Windows jobs updated

* Windows jobs updated

* Windows jobs updated

* Windows jobs updated

* Windows jobs updated

* Windows jobs updated

* Liberty server stop verification

* GRADLE_JAVA_HOME logic removed

* Excluded the problamatic tests from windows

* Reverted some unwanted codes from LibertyTest, bumped the RUNTIME_VERSION, Fixes gradle.yml

* Reverted some unwanted codes from LibertyTest, bumped the RUNTIME_VERSION, Fixes gradle.yml

* Java version updated in sub test projects build.gradle files and removed some redundant logs

* Fixed the issues happened in DevSkipInstallFeatureTest.groovy and DevSkipInstallFeatureConfigTest.groovy, both were the sourceCompatibility Java Language version syntax issues

* RUNTIME_VERSION updated for windows

* Method accessor issue resolved

* pull_request branch updated, the Setup Java comment updated and TEST_EXCLUDE option reverted and commented in gradle.yml, sourceCompatibility and targetCompatibility versions changed back to VERSION_1_8 from VERSION_17

* env field issue fixed in gradle.yml

* sourceCompatibility and targetCompatibility versions changed back to VERSION_1_8

* Liberty Installation Tests exit unexpectedly issue fixed

* Added Feature Installation Tests to the gradle.yml test commands. Added TEST_INCLUDE env variable to reuse it in the command, hence reduce the command length

* Fixed TEST_INCLUDE

* Removed TEST_INCLUDE

* Removed TEST_INCLUDE

* Added Liberty Installation tests to the github workflow commands

* sourceCompatibility syntaxes changed for Application Configuration Tests

* Changed the way we fetch the dep files using project.configurations.libertyApp.files(dep) which is deprecated in Gradle 9 to use detachedConfiguration

* TestAppConfig and TestAppConfigFail issues fixed

* Reduced the gradle command in gradle.yml to **/*Install*Feature*

* Reduced the command to run Liberty Installation Tests in gradle.yml to only include **/InstallLiberty*,**/InstallDir*

* LibertyApplicationConfigurationIncludeTest issues fixed

* Included Application Configuration Tests in test command of github workflow

* Updated sourceCompatibility and targetCompatibility syntaxes in gradle files for Server Environment Tests

* Method visibility issues fixed

* Included command to run Server Environment Tests in Github Workflow

* sourceCompatibility and targetCompatibility syntax changes

* Method visibility issues fixed

* Included Packaging Test in github workflow test command

* Included Packaging Test in github workflow test command

* Changed the sourceCompatibility syntax for Loose Application Tests

* getDependencyProject deprecation fix and method visibility issue fix

* Incomplete

* Server Creation Tests fixed

* Included Server Creation Test files in test command

* JSP Compilation Tests fixes

* sourceCompatibility and targetCompatibility syntax changes and method visibility changes

* Included Verification Tests files in the test command of github workflow file

* javaSourceLevel check reverted to 8

* Feature Generation Tests fixes

* Increased the process timeout in BaseGenerateFeatureTest --> runProcess

* Updated some comments and syntaxes

* Included the Feature Generation Tests in the github workflow test commands

* sourceCompatibility syntax changed and dependency.getDependencyProject() replaced with new gradle 9 codes

* Included the Eclipse Integration Tests in the github workflow command

* Log validation changes

* Changed the log file validation to match different types of gradle9 formattings across OSes

* Error log redirection

* Removed redundant code changes, unwanted code formatting and indentations, etc

* Changed task.project to task.getProject() and updated the year in copyright of DevTaskHelper.groovy

* GenerateFeaturesTest* is removed from windows action runner command as it was excluded already

* Miscellaneous Tests fixes

* Removed the earlier excluded JSPComplilation 17 test from windows runner command

* Put back the TestCompileJSP* to the windows runner command of gradle.yml

* TestLoose*Ear test files fixed

* Loose app multi module tests fixes

* Code cleanup

* Added LooseApp Tests to GH Workflow commands

* EAR issue after merging with main fixed

* Added validation for configuration:archives uses and update the gradle.yaml with the default java runtime adopt

* Configuration validation changed to throw warning instead of error

* Arquilian tests

* Added Arquilian Test to the command

* dependency-management-plugin version upgraded to 1.1.7

* Changes in validate dependency methods

* Gradle 9 migration guide for end users

* project parameter passing to validate dependency methods are corrected

* Migration guide updates

* Changed then Java Compatibility links

* Removed the link to Gradle Controlling Task Execution link since we are already referencing a subsection in that same document.

* Added '.' to the numbered points since those are full sentences

* Added '.' to the numbered points since those are full sentences

* Added '.' to the numbered points since those are full sentences

* Unwanted dots are removed

* Running full tests without any includes

* Removed TestCompileJSPSource17 from excludes, which was copied from the earlier command

* Cleaned up the gradle.yml file by removing the temporarily commented lones

* preparing for gradle 9 milestone release snapshot

Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com>

* Add Gradle 9 prerequisites to migration guide

Added prerequisites for migrating to Gradle 9, including Java and Kotlin requirements.

* Update Java requirement and add documentation link

Removed redundant note about reviewing the detailed implications section for Java requirement and added a link to Gradle official documentation.

* Confglicts resolved

* Changed pipeline config to run on personal pipeline to find out if any more failures happening

* RUNTIME_VERSION in the pipeline is changed to 25.0.0.10, to test Spring Boot failures

* Spring boot issues fixed by changing the sourceCompatibility,targetCompatibility and spring boot version

* Test failures resolved

* Java 25 related issues are fixed

* Fixed issues with TestLooseApplicationWithToolchain

* Fix for windows and java 25 test failures

* Foojay version upgraded to resolve the CI breaks in windows

* Gradle 9 related changes for making gradle build run without any fail

* Guard signing tasks so CI and local builds succeed without configured signing keys while still supporting signed release publishing

* Liberty version updated for windows pipeline

* PR Branch changed to main in gradle.yml

* Updated the copyright years and removed unwanted comments

* Removed leftover codes, adjusted commends, and reverted unwanted codes

* Readme and Migration Guide are updated with Support matrix, Springboot and Arquilian updates and Java 25 updates

* Corrected Compatibility / Support section in readme

* Added back the java support lines

---------

Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com>
Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com>
Co-authored-by: Sajeer <sajeer@Sajeers-MacBook-Pro.local>
Co-authored-by: Sajeer <sajeer@mac.in.ibm.com>
Co-authored-by: Sajeer <sajeer@Mac.lan>
Co-authored-by: Arunvenmany <arun.kumar.v.n@ibm.com>
Co-authored-by: Cheryl King <cheryllk@us.ibm.com>
Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com>
…nLiberty#1058)

* Added toolchain JDK home caching

* Added Toolchain honored message check as well to the DevMode toolchain test

---------

Co-authored-by: Sajeer <sajeer@Sajeers-MacBook-Pro.local>
* updating compatibility requirements for gradle 9

Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com>

* changes based on review comments

Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com>

* changes on content based on review comments

Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com>

* renaming file to change deploy date

Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com>

---------

Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com>
* Fixed the wrong toolchain honored log

* Fixed a test failure happened because isJavaHomeSetForEnvProperties() and isJavaHomeSetForJvmOptions() are called before loading config from properties

* Added some conditional logging and added tests for  DevMode toolchain warnings on scenarios like java home configured in JVM Options and Server Env Test

* Logging conditions changes

---------

Co-authored-by: Sajeer <sajeer@Sajeers-MacBook-Pro.local>
…ins version to support gradle 9 (OpenLiberty#1066)

* combining release.gradle into build.gradle and upgrading publish plugins version to support gradle 9

* upgradle publish plugin version

Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com>

---------

Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com>
…on (OpenLiberty#1065)

* Passing the toolchain environment variabled to InstallFeatureUtil of ci.common, so it will get the toolchain JAVA_HOME

* Added the assertion back to copyServer method

* Updated ci.common cloning references and also added product info based tests in InstallFeatureToolchainTest

* Simplified the tests

* Remove cached ci.common to ensure fresh build

* Reverted: Remove cached ci.common to ensure fresh build

* Branch reference in gradle.yml is updated

* Update Java toolchain version in Gradle build file to keep consistent with the other tests

* Added provisioning plugin for install feature test

* Removed unwanted log

* Reverting the workflow

---------

Co-authored-by: Sajeer <sajeer@Mac.lan>
Co-authored-by: Sajeer <sajeer@Sajeers-MacBook-Pro.local>
Co-authored-by: Sajeer <sajeer@dhcp-9-124-104-127.in.ibm.com>
Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com>
Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com>
Updated statement about support for Java 17, 21 and 25 for running Gradle 9.
Signed-off-by: Paul Gooderham <turkeyonmarblerye@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants