Merge main into the latest generate features branch by turkeylurkey · Pull Request #1044 · OpenLiberty/ci.gradle

turkeylurkey · 2026-01-30T16:28:35Z

Here we are merging the latest main into the generate-features-update before the latest feature generation fixes have been applied.

Fix install dir bug

Use 1.8.38 ci.common release

Fix one line for Windows build

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

…p_false_fix code changes to deploy war file in devc mode with looseapp=false

Signed-off-by: Paul Gooderham <turkeyonmarblerye@gmail.com>

Add .vscode to .gitignore

Update plugin and runtime versions

Update snapshot and release URLs

Bump commons-lang3 dependency

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

…r_fix Changes to add resources output directory to EAR XML

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

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

initial commit for libDirName fix

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

…path_fix archive option fix for gradle

* toolchain initial commit Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * adding toolchain jdk setup Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * adding logs and correcting tests Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * adding branch to workflow yaml (OpenLiberty#1036) * adding branch to workflow yaml Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * adding branch to workflow yaml Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * removing env Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * sending java installation path as parameter Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * sending java installation path as parameter Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * refactoring test method, enabling back workflow steps Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * changes to fix tests Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * changes to fix tests Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> --------- Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * Toolchain v1 (OpenLiberty#1037) * adding branch to workflow yaml Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * adding branch to workflow yaml Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * removing env Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * sending java installation path as parameter Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * sending java installation path as parameter Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * refactoring test method, enabling back workflow steps Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * changes to fix tests Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * changes to fix tests Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * Adding more tests for libertyCreate and libertyStart Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * adding tests similar to LibertyTests.groovy with toolchains Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * updating tests Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * updating tests Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> --------- Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * adding jvmArgs metspace for test Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * steps in workflow to upload reports Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * increase metaspace to 1g Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * set metaspace to gradle.properties Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * adding back other java versions to matrix Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * removing toolchain branch from workflow Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * correcting copyright year Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * addresing review comments Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * new test for warning on java home already configured in jvm.options or server.env Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * new test for warning on java home already configured in jvm.options or server.env Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing windows tests Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * Adding logic to consider env variables and jvm.option variables Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * updating tests to check windows issue Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * updating tests to check windows issue Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * excluding gradle property based tests from windows Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * modifying tests to work with java 8 Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * modifying tests Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * code changes to fix split for windows Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * adding new test for libertyStop Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * adding new test for libertyStop Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * changes based on review comments * adding -D option for jvmOptions * adding changes to support mergeServerEnv config file specified in configDirectory 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 Zeji <44323186+sajeerzeji@users.noreply.github.com>

…berty#1042) * removing runtime code to add foojay plugin to settings.gradle * changes based on review comments

* toolchain initial commit Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * adding toolchain jdk setup Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * adding logs and correcting tests Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * adding branch to workflow yaml (OpenLiberty#1036) * adding branch to workflow yaml Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * adding branch to workflow yaml Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * removing env Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * sending java installation path as parameter Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * sending java installation path as parameter Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * refactoring test method, enabling back workflow steps Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * changes to fix tests Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * changes to fix tests Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> --------- Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * Toolchain v1 (OpenLiberty#1037) * adding branch to workflow yaml Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * adding branch to workflow yaml Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * removing env Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * sending java installation path as parameter Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * sending java installation path as parameter Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * trying with gradle init step Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * fixing run script Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * refactoring test method, enabling back workflow steps Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * changes to fix tests Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * changes to fix tests Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * Adding more tests for libertyCreate and libertyStart Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * adding tests similar to LibertyTests.groovy with toolchains Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * updating tests Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * updating tests Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> --------- Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * adding jvmArgs metspace for test Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * steps in workflow to upload reports Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * increase metaspace to 1g Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * set metaspace to gradle.properties Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * adding back other java versions to matrix Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * removing toolchain branch from workflow (OpenLiberty#1039) Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> * Environment variables merging processes added * Added logs for devmode recompilation for toolchain * Added test for devmode recompilation * Corrected a leftover code * Copyright years updated * DevmodeToolchainTest excluded for windows in pipeline * Toolchain doc updated for toolchain config precedence section * Updated the toolchain.md documentation by adding some examples * Added more logs as sample * Removed adding foojay plugin through test code to settings.gradle, and added it to ther test projects settings.gradle directly * Liberty version and ant version are updated * Auto provisioning link added to the toolchain.md toubleshooting section --------- Signed-off-by: Arun Venmany <arun.kumar.v.n@ibm.com> Co-authored-by: Arun Venmany <arun.kumar.v.n@ibm.com> Co-authored-by: Sajeer <sajeer@Sajeers-MacBook-Pro.local> Co-authored-by: Sajeer <sajeer@Mac.lan> Co-authored-by: Sajeer <sajeer@mac.in.ibm.com>

Signed-off-by: Paul Gooderham <turkeyonmarblerye@gmail.com>

turkeylurkey · 2026-02-03T23:32:30Z

The conflict:
build.gradle

<<<<<<< HEAD
def libertyAntVersion = "1.9.16"
def libertyCommonVersion = "1.8.38-SNAPSHOT"
=======
def libertyAntVersion = "1.9.18"
def libertyCommonVersion = "1.8.40"

>>>>>>> origin/main

cherylking and others added 30 commits June 3, 2025 17:28

Fix code

3b08a3f

Add test case and update test case

1f9fe29

Merge pull request OpenLiberty#955 from cherylking/fixInstallDirBug

d0832cf

Fix install dir bug

Use 1.8.38 ci.common release

2a8994b

Fix yaml file for ci.gradle location

ddbb2cc

Merge pull request OpenLiberty#961 from cherylking/prep394release

52c9434

Use 1.8.38 ci.common release

Fix one line for Windows build

1bebdca

yaml changes for unpredictable drive letter on windows

ca15d9c

fix working-directory path for windows

ad12752

Merge pull request OpenLiberty#962 from cherylking/fixYaml

e44a0d3

Fix one line for Windows build

prepare release liberty-gradle-plugin-3.9.4

4c8b027

prepare for next development iteration

d09882a

code changes to deploy war file in devc mode with looseapp=false

43e92f5

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

removing copyrights in test project

3c5381e

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

change in readme, based on review comment

3fc8677

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

Merge pull request OpenLiberty#967 from arunvenmany-ibm/devc_loose_ap…

1be400c

…p_false_fix code changes to deploy war file in devc mode with looseapp=false

Add .vscode to .gitignore

dbb45e0

Signed-off-by: Paul Gooderham <turkeyonmarblerye@gmail.com>

Update plugin and runtime versions

86cfee2

Merge pull request OpenLiberty#969 from turkeylurkey/issue-968

30098e3

Add .vscode to .gitignore

Merge pull request OpenLiberty#970 from OpenLiberty/yeekangc-patch-1-1

1ebd3ea

Update plugin and runtime versions

Update snapshot publishing URL

40c9e93

Update Maven Central release URL

d17c4c2

Merge pull request OpenLiberty#972 from mattbsox/jenkinsSnapshot

d71077d

Update snapshot and release URLs

update code dependency

be0ff36

Update test case dependencies

4169af0

Override transitive dependency for commons-lang3

8826c1d

Merge pull request OpenLiberty#973 from cherylking/bumpCommonsLang3

bec1595

Bump commons-lang3 dependency

Fix for compileJsp for Jakarta and update snapshot repo

39b9356

remove snapshot repo for dev-test and generate-features-test

5632ec2

few minor fixes in build config

00cf2b7

venmanyarun and others added 26 commits November 20, 2025 19:46

update tests to include jar resources test

51a0ca9

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

Merge pull request OpenLiberty#1026 from venmanyarun/ear_resources_di…

f2fe0e2

…r_fix Changes to add resources output directory to EAR XML

initial commit for libDirName fix

ab5059d

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

fixing windows tests

d582361

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

refactoring libDirName retrieval to separate method

bb8627a

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

updating readme

e565ba3

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

changes based on review comments

d1a1295

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

using paths.get instead of path.of

4704602

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

using regex pattern for file matching

fb06e02

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

using regex pattern for file matching

bfb18e9

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

using regex pattern for file matching

4a15970

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

using regex pattern to use matches

b23419e

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

using regex pattern for file matching

eaa5647

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

using regex pattern for file matching

38e3f13

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

testing file pattern with .*

d49b28e

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

reverting workflow back

412bd3b

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

Merge pull request OpenLiberty#1027 from venmanyarun/libdirname_fix

37c3764

initial commit for libDirName fix

archive option fix for gradle

7630bb2

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

rolling back workflow yaml

885994e

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

Merge pull request OpenLiberty#1029 from venmanyarun/package_archive_…

2f6f868

…path_fix archive option fix for gradle

removing runtime code to add foojay plugin to settings.gradle (OpenLi…

ba89a69

…berty#1042) * removing runtime code to add foojay plugin to settings.gradle * changes based on review comments

prepare release liberty-gradle-plugin-3.10.0

6c22937

prepare for next development iteration

a898a24

Merge the code from main into this feature branch

41fdd64

Signed-off-by: Paul Gooderham <turkeyonmarblerye@gmail.com>

turkeylurkey requested a review from TrevCraw January 30, 2026 16:28

turkeylurkey self-assigned this Jan 30, 2026

turkeylurkey added this to Open Liberty Developer Experience Jan 30, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge main into the latest generate features branch#1044

Merge main into the latest generate features branch#1044
turkeylurkey wants to merge 102 commits intoOpenLiberty:generate-features-updatefrom
turkeylurkey:merge-main-0130

turkeylurkey commented Jan 30, 2026

Uh oh!

turkeylurkey commented Feb 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

turkeylurkey commented Jan 30, 2026

Uh oh!

turkeylurkey commented Feb 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants