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 develop into main #1524

Merged
merged 1,170 commits into from
Feb 2, 2024
Merged

Merge develop into main #1524

merged 1,170 commits into from
Feb 2, 2024

Conversation

tsaglam
Copy link
Member

@tsaglam tsaglam commented Feb 2, 2024

Updates the main branch from the development branch in preparation for the upcoming v5.0.0 major release.
This should also re-enable sonar checks on the develop branch as it updates the main branch with all its workflows to Java 21.

dependabot bot and others added 30 commits November 22, 2023 16:26
Bumps [org.eclipse.emf:org.eclipse.emf.ecore.xmi](https://github.com/eclipse-emf/org.eclipse.emf) from 2.35.0 to 2.36.0.
- [Commits](https://github.com/eclipse-emf/org.eclipse.emf/commits)

---
updated-dependencies:
- dependency-name: org.eclipse.emf:org.eclipse.emf.ecore.xmi
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
…ewer (#1388)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
#1279)

* Overhauled the end to end tests and added the test code from progpedia.

* Added missing result files for end to end tests

* Fixed test results

* Reduced epsilon value for end to end tests.

* Generate expected test values for the progpedia dataset.

* Added token output for end to end tests.

* Improved end to end test output.

* Added strict order for submissions in comparison.

* Fixed sonarcloud issues.

* Implemented timurs suggestions.

* Moved progpedia data into a zip file.

* Fixed spotless issues concerning zips.

* spotless.

* Fixed sonarcloud issues.

* Improved language in test descriptions.

* Improved handling of io streams in end to end tests.

* Added logging when permissions cannot be set on temp directory.

* Spotless

* Fixed sonarcloud issues.

---------

Co-authored-by: Dominik Fuchß <[email protected]>
Co-authored-by: Timur Saglam <[email protected]>
…0.5.7 in /report-viewer (#1390)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ort-viewer (#1391)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…0 in /report-viewer (#1392)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…viewer (#1389)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Add normalization info to cpp tokens
Kr0nox and others added 20 commits January 29, 2024 14:03
Fix version of intra-project dependency for the kotlin module
Clean up progpedia dataset in the E2E tests
…er (#1518)

Bumps [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) from 1.1.1 to 1.2.2.
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Commits](https://github.com/vitest-dev/vitest/commits/v1.2.2/packages/vitest)

---
updated-dependencies:
- dependency-name: vitest
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…2 in /report-viewer (#1517)

Bumps [@rushstack/eslint-patch](https://github.com/microsoft/rushstack/tree/HEAD/eslint/eslint-patch) from 1.7.0 to 1.7.2.
- [Changelog](https://github.com/microsoft/rushstack/blob/main/eslint/eslint-patch/CHANGELOG.md)
- [Commits](https://github.com/microsoft/rushstack/commits/@rushstack/eslint-patch_v1.7.2/eslint/eslint-patch)

---
updated-dependencies:
- dependency-name: "@rushstack/eslint-patch"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…eport-viewer (#1521)

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.19.9 to 18.19.11.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…iewer (#1519)

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.32 to 8.4.33.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@8.4.32...8.4.33)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…er (#1520)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.0.11 to 5.0.12.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.0.12/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.0.12/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…25.2 (#1523)

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.2.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](assertj/assertj@assertj-build-3.25.1...assertj-build-3.25.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…0.0 (#1522)

Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.9.0 to 5.10.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v5.9.0...v5.10.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…lrException

Changed AbstractAntlrParserAdapter to catch all exceptions during par…
Demo text in version info and page title
@tsaglam tsaglam added the release PR related to a (upcoming) release label Feb 2, 2024
# Conflicts:
#	report-viewer/package-lock.json
@tsaglam tsaglam changed the title Update main from develop Merge develop into main Feb 2, 2024
@tsaglam
Copy link
Member Author

tsaglam commented Feb 2, 2024

image
👀

@tsaglam tsaglam marked this pull request as ready for review February 2, 2024 10:05
Copy link

sonarqubecloud bot commented Feb 2, 2024

Quality Gate Failed Quality Gate failed for 'JPlag Report Viewer'

Failed conditions

C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarCloud

idea Catch issues before they fail your Quality Gate with our IDE extension SonarLint SonarLint

@tsaglam
Copy link
Member Author

tsaglam commented Feb 2, 2024

Only sonar fails, which will be addressed in a later PR.

@tsaglam tsaglam merged commit 065e79e into main Feb 2, 2024
21 of 22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release PR related to a (upcoming) release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants