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 for the upcoming 5.0.0 major release #1576

Merged
merged 249 commits into from
Feb 21, 2024
Merged

Conversation

tsaglam
Copy link
Member

@tsaglam tsaglam commented Feb 20, 2024

Merge the develop branch into the main branch.

Will be merged when all remaining PRs for the develop branch are merged:

  • Minor Report Viewer Version PR
  • Code quality PR
  • Revision number PR
  • Readme update PR
  • Wiki PRs?

dfuchss and others added 30 commits July 5, 2023 23:49
…o feature/internal-web-viewer

# Conflicts:
#	cli/src/main/java/de/jplag/cli/server/ReportViewer.java
#	report-viewer/package-lock.json
…eb-viewer

# Conflicts:
#	.github/workflows/maven.yml
#	.github/workflows/publish.yml
#	.github/workflows/sonarcloud-branch.yml
#	.github/workflows/sonarcloud-pr.yml
#	.github/workflows/spotless.yml
#	pom.xml
#	report-viewer/src/components/ComparisonsTable.vue
#	report-viewer/src/viewWrapper/ComparisonViewWrapper.vue
#	report-viewer/src/views/FileUploadView.vue
…eb-viewer

# Conflicts:
#	report-viewer/src/components/ComparisonsTable.vue
@tsaglam tsaglam added the release PR related to a (upcoming) release label Feb 20, 2024
@tsaglam tsaglam added this to the v5.0.0 milestone Feb 20, 2024
Copy link

Quality Gate Passed Quality Gate passed for 'JPlag Report Viewer'

Issues
0 New issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

Copy link

Quality Gate Passed Quality Gate passed for 'JPlag Plagiarism Detector'

Issues
6 New issues

Measures
0 Security Hotspots
65.0% Coverage on New Code
1.4% Duplication on New Code

See analysis details on SonarCloud

@tsaglam tsaglam marked this pull request as ready for review February 21, 2024 10:29
@tsaglam tsaglam merged commit dc1d2df into main Feb 21, 2024
17 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.

6 participants