Skip to content

Commit

Permalink
enhacement : Resolve conflicts and aligned Jenkins sci branch with th…
Browse files Browse the repository at this point in the history
…e latest changes (#34)

* Increased Read/Request timeout to 180 seconds (leapwork#53)

Co-authored-by: Sachin Tomar <[email protected]>

* Revert "Increased Read/Request timeout to 180 seconds (leapwork#53)" (leapwork#54)

This reverts commit 2be482a.

Co-authored-by: Sachin Tomar <[email protected]>

* enhancement :  Increased Read/Request timeout to 180 seconds (leapwork#55)

Co-authored-by: Sachin Tomar <[email protected]>

* enhancement : Made http timeout configurable for all API Requests (default 300 seconds) (leapwork#56)

* enhancement : Increased http timeout to 5 min

* Made http timeout configurable in all API Requests

---------

Co-authored-by: Sachin Tomar <[email protected]>

* Upgraded plugin version to 4.0.9 (leapwork#57)

Co-authored-by: Sachin Tomar <[email protected]>

* Revert configurable timeout (leapwork#58)

* Revert "Upgraded plugin version to 4.0.9 (leapwork#57)"

This reverts commit 77c3605.

* Revert "enhancement : Made http timeout configurable for all API Requests (default 300 seconds) (leapwork#56)"

This reverts commit d69096e.

---------

Co-authored-by: Sachin Tomar <[email protected]>

* Sync Leapwork from JenkinsCI (leapwork#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 <[email protected]>

Signed-off-by: Joseph Petersen <[email protected]>

* Update Jenkinsfile syntax (#24)

* Increased Read/Request timeout to 180 seconds (#25)

Co-authored-by: Sachin Tomar <[email protected]>

* Revert "Increased Read/Request timeout to 180 seconds (#25)" (#26)

This reverts commit 3937e68.

Co-authored-by: Sachin Tomar <[email protected]>

* enhancement : Increased Read/Request timeout to 180 seconds (#27)

* Increased Read/Request timeout to 180 seconds (leapwork#53)

Co-authored-by: Sachin Tomar <[email protected]>

* Revert "Increased Read/Request timeout to 180 seconds (leapwork#53)" (leapwork#54)

This reverts commit 2be482a.

Co-authored-by: Sachin Tomar <[email protected]>

* enhancement :  Increased Read/Request timeout to 180 seconds (leapwork#55)

Co-authored-by: Sachin Tomar <[email protected]>

---------

Co-authored-by: Sachin Tomar <[email protected]>

* enhancement : Increased Read/Request timeout to 180 seconds - 2 (#28)

* Increased Read/Request timeout to 180 seconds (leapwork#53)

Co-authored-by: Sachin Tomar <[email protected]>

* Revert "Increased Read/Request timeout to 180 seconds (leapwork#53)" (leapwork#54)

This reverts commit 2be482a.

Co-authored-by: Sachin Tomar <[email protected]>

* enhancement :  Increased Read/Request timeout to 180 seconds (leapwork#55)

Co-authored-by: Sachin Tomar <[email protected]>

* enhancement : Made http timeout configurable for all API Requests (default 300 seconds) (leapwork#56)

* enhancement : Increased http timeout to 5 min

* Made http timeout configurable in all API Requests

---------

Co-authored-by: Sachin Tomar <[email protected]>

* Upgraded plugin version to 4.0.9 (leapwork#57)

Co-authored-by: Sachin Tomar <[email protected]>

* Revert configurable timeout (leapwork#58)

* Revert "Upgraded plugin version to 4.0.9 (leapwork#57)"

This reverts commit 77c3605.

* Revert "enhancement : Made http timeout configurable for all API Requests (default 300 seconds) (leapwork#56)"

This reverts commit d69096e.

---------

Co-authored-by: Sachin Tomar <[email protected]>

---------

Co-authored-by: Sachin Tomar <[email protected]>

---------

Signed-off-by: Joseph Petersen <[email protected]>
Co-authored-by: BirSikanderMahajan <[email protected]>
Co-authored-by: Anton Liakhovich <[email protected]>
Co-authored-by: Joseph Petersen <[email protected]>
Co-authored-by: Alexander Brandes <[email protected]>
Co-authored-by: Sachin Tomar <[email protected]>

---------

Signed-off-by: Joseph Petersen <[email protected]>
Co-authored-by: Sachin Tomar <[email protected]>
Co-authored-by: BirSikanderMahajan <[email protected]>
Co-authored-by: Anton Liakhovich <[email protected]>
Co-authored-by: Joseph Petersen <[email protected]>
Co-authored-by: Alexander Brandes <[email protected]>
Co-authored-by: Sachin Tomar <[email protected]>
  • Loading branch information
7 people authored May 2, 2024
1 parent e0d8cdb commit 33a6623
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 33a6623

Please sign in to comment.