Skip to content
This repository was archived by the owner on Jun 6, 2025. It is now read-only.

Comments

Merge release into master branch#331

Merged
j69772 merged 13 commits intomasterfrom
release/2.6.0
Jan 29, 2025
Merged

Merge release into master branch#331
j69772 merged 13 commits intomasterfrom
release/2.6.0

Conversation

@t92549
Copy link
Contributor

@t92549 t92549 commented Jan 28, 2025

Created by GH Action

Gaffer and others added 12 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] <support@github.com>
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 <94527357+GCHQDeveloper314@users.noreply.github.com>

* Remove unsupported actions and fix git config

---------

Co-authored-by: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com>
* 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] <support@github.com>

* Update copyright for pom.xml

* copyright

---------

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

* rephrase

* copyright

---------

Co-authored-by: j69772 <172510359+j69772@users.noreply.github.com>
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] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: j69772 <172510359+j69772@users.noreply.github.com>
@CLAassistant
Copy link

CLAassistant commented Jan 28, 2025

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.

✅ t92549
✅ GCHQDeveloper314
✅ 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.

@sonarqubecloud
Copy link

@j69772 j69772 merged commit 534efd6 into master Jan 29, 2025
4 of 5 checks passed
@j69772 j69772 deleted the release/2.6.0 branch January 29, 2025 12:55
@cn337131 cn337131 restored the release/2.6.0 branch January 29, 2025 14:08
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants