From 33a66231fbb6986425f9f99eca559c725e5646bb Mon Sep 17 00:00:00 2001 From: Sachin Dev Tomar Date: Thu, 2 May 2024 15:54:09 +0530 Subject: [PATCH] enhacement : Resolve conflicts and aligned Jenkins sci branch with the latest changes (#34) * Increased Read/Request timeout to 180 seconds (#53) Co-authored-by: Sachin Tomar * Revert "Increased Read/Request timeout to 180 seconds (#53)" (#54) This reverts commit 2be482af89dea963c75273d42ebed38f6f027ad6. Co-authored-by: Sachin Tomar * enhancement : Increased Read/Request timeout to 180 seconds (#55) Co-authored-by: Sachin Tomar * enhancement : Made http timeout configurable for all API Requests (default 300 seconds) (#56) * enhancement : Increased http timeout to 5 min * Made http timeout configurable in all API Requests --------- Co-authored-by: Sachin Tomar * Upgraded plugin version to 4.0.9 (#57) Co-authored-by: Sachin Tomar * Revert configurable timeout (#58) * Revert "Upgraded plugin version to 4.0.9 (#57)" This reverts commit 77c3605f601ea51e36449f100e55e09788ed7da6. * Revert "enhancement : Made http timeout configurable for all API Requests (default 300 seconds) (#56)" This reverts commit d69096e3bb2de902e6c44096b98e8a7d901df736. --------- Co-authored-by: Sachin Tomar * Sync Leapwork from JenkinsCI (#59) * Automatic plugin release (#1) * Automatic release prerequisites * Updating for CD, automatic release (#6) - Updating cd.yml file (from the master branch, not yet on the main branch) - adding yaml file (from the master branch, not yet on the main branch) - Do not ignore .mvn dir contents (already in another pull request) - Use parent pom 4.24 (would be best if dependabot were enabled on this repo) - Use changelist property for version (incrementals) (already in another pull request) - Use scmTag symbol, not explicit tag (already in another pull request) - Use most recent plugin bom release (would be best if dependabot were enabled on this repo) - Use most recent JQuery plugin release (see the comment that explains why you should use a different JQuery library) - Remove unused dependency, do not include jsr305 jar in hpi (remove jsr305 jar from the hpi because it is not needed) * chore: use jenkins infra maven cd reusable workflow (#23) Signed-off-by: Joseph Petersen Signed-off-by: Joseph Petersen * Update Jenkinsfile syntax (#24) * Increased Read/Request timeout to 180 seconds (#25) Co-authored-by: Sachin Tomar * Revert "Increased Read/Request timeout to 180 seconds (#25)" (#26) This reverts commit 3937e68567a6f4af80b0576bf44a284455e35b03. Co-authored-by: Sachin Tomar * enhancement : Increased Read/Request timeout to 180 seconds (#27) * Increased Read/Request timeout to 180 seconds (#53) Co-authored-by: Sachin Tomar * Revert "Increased Read/Request timeout to 180 seconds (#53)" (#54) This reverts commit 2be482af89dea963c75273d42ebed38f6f027ad6. Co-authored-by: Sachin Tomar * enhancement : Increased Read/Request timeout to 180 seconds (#55) Co-authored-by: Sachin Tomar --------- Co-authored-by: Sachin Tomar * enhancement : Increased Read/Request timeout to 180 seconds - 2 (#28) * Increased Read/Request timeout to 180 seconds (#53) Co-authored-by: Sachin Tomar * Revert "Increased Read/Request timeout to 180 seconds (#53)" (#54) This reverts commit 2be482af89dea963c75273d42ebed38f6f027ad6. Co-authored-by: Sachin Tomar * enhancement : Increased Read/Request timeout to 180 seconds (#55) Co-authored-by: Sachin Tomar * enhancement : Made http timeout configurable for all API Requests (default 300 seconds) (#56) * enhancement : Increased http timeout to 5 min * Made http timeout configurable in all API Requests --------- Co-authored-by: Sachin Tomar * Upgraded plugin version to 4.0.9 (#57) Co-authored-by: Sachin Tomar * Revert configurable timeout (#58) * Revert "Upgraded plugin version to 4.0.9 (#57)" This reverts commit 77c3605f601ea51e36449f100e55e09788ed7da6. * Revert "enhancement : Made http timeout configurable for all API Requests (default 300 seconds) (#56)" This reverts commit d69096e3bb2de902e6c44096b98e8a7d901df736. --------- Co-authored-by: Sachin Tomar --------- Co-authored-by: Sachin Tomar --------- Signed-off-by: Joseph Petersen Co-authored-by: BirSikanderMahajan <83980204+BirSikanderMahajan@users.noreply.github.com> Co-authored-by: Anton Liakhovich <72276668+AntonLiakhovich@users.noreply.github.com> Co-authored-by: Joseph Petersen Co-authored-by: Alexander Brandes Co-authored-by: Sachin Tomar --------- Signed-off-by: Joseph Petersen Co-authored-by: Sachin Tomar Co-authored-by: BirSikanderMahajan <83980204+BirSikanderMahajan@users.noreply.github.com> Co-authored-by: Anton Liakhovich <72276668+AntonLiakhovich@users.noreply.github.com> Co-authored-by: Joseph Petersen Co-authored-by: Alexander Brandes Co-authored-by: Sachin Tomar