Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release into master branch #332

Merged
merged 14 commits into from
Jan 29, 2025
Merged

Merge release into master branch #332

merged 14 commits into from
Jan 29, 2025

Conversation

cn337131
Copy link
Member

No description provided.

Gaffer and others added 14 commits April 3, 2023 15:31
* Enable parallelism at class level with thread count equal to CPU threads
Also fix config to apply always (not just profile) and remove outdated 'junit-platform-surefire-provider' dependency

* Update versions for JUnit, AssertJ etc.

* Fix Maven default platform encoding warning message
Bumps [json](https://github.com/douglascrockford/JSON-java) from 20211205 to 20230227.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Upgrade GitHub workflows

* Version fix

* Update .github/workflows/release.yaml

Co-authored-by: GCHQDeveloper314 <[email protected]>

* Remove unsupported actions and fix git config

---------

Co-authored-by: GCHQDeveloper314 <[email protected]>
* Make IterableConcat type signature more flexible
IterableConcat can now easily accept nested Iterables which extend Iterable in more cases

* Fix example

* Update copyright

* Fix Quality Gate
fix versions, update release process and remove gh action
…ary operator (#328)

* add new iterable merge binary operator and varargs to chainedItr

* checkstyle

* address comments

* checkstyle
* Bump commons-io:commons-io from 2.11.0 to 2.14.0

Bumps commons-io:commons-io from 2.11.0 to 2.14.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update copyright for pom.xml

* copyright

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: GCHQDeveloper314 <[email protected]>
Co-authored-by: j69772 <[email protected]>
Co-authored-by: cn337131 <[email protected]>
* fix javadocs

* rephrase

* copyright

---------

Co-authored-by: j69772 <[email protected]>
Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20230227 to 20231013.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: j69772 <[email protected]>
@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
3 out of 4 committers have signed the CLA.

✅ GCHQDeveloper314
✅ t92549
✅ cn337131
❌ Gaffer


Gaffer seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

@j69772 j69772 merged commit c976d40 into master Jan 29, 2025
5 of 6 checks passed
@j69772 j69772 deleted the release/2.6.0 branch January 29, 2025 14:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants