[OCG] fix: Scheduler reliably remove jobs from schedule #75
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…reations [DHIS2-11752] (2.37) (dhis2#8734) Co-authored-by: Stian Sandvold <[email protected]> Co-authored-by: Gintare Vilkelyte <[email protected]>
…ar names [DHIS2-11946] (2.37) (dhis2#9265)
* fix: OuMode validation in event query * fix: OuMode validation
* fix: fixes ImportConflict NPE [DHIS2-12162] * fix: added a test case [DHIS2-12162] * fix: more NPE fixed [DHIS2-12162]
….37) (dhis2#9318) * fix: data value import - delete with zero or no value [DHIS2-11624] (dhis2#8610) Takes care of three cases: * delete by updating to zero should work * delete by using strategy DELETE with no value or the old value should work * delete by using strategy DELETE with new value different to the old one should work (did work before but now is tested as well) * fix: check if OU is in user hierarchy when moving OUs [DHIS2-2162] (dhis2#8874) * fix: check if OU is in user hierarchy when moving OUs [DHIS2-2162] * fix: expectations in unit tests using same changed tests data [DHIS2-2162]
…11589] (2.37) (dhis2#9317) * fix: data value import - delete with zero or no value [DHIS2-11624] (dhis2#8610) Takes care of three cases: * delete by updating to zero should work * delete by using strategy DELETE with no value or the old value should work * delete by using strategy DELETE with new value different to the old one should work (did work before but now is tested as well) * fix: only remind users about account disable on specific days [DHIS2-11589] (dhis2#8846) Co-authored-by: Morten Hansen <[email protected]>
…erly [DHIS2-11281] [DHIS2-DHIS2-11301] (dhis2#9319) (cherry picked from commit e2415a2)
Automatically merged.
…his2#9321) (cherry picked from commit 51ad37d)
…is2#9297) (dhis2#9304) Co-authored-by: Stian Sandvold <[email protected]>
…842] (dhis2#9313) * fix: Grid Caching is not properly used in analytics [2.37-DHIS2-TECH-842] * QA issue (sonar qube) * QA issue (sonar qube) Co-authored-by: Lars Helge Øverland <[email protected]>
… (2.37) (dhis2#9326) * fix: OrgUnitIdScheme not working when adding enrollment [DHIS2-12181] (2.37) * Remove unnecessary check line
…s2#9331) * chore: provide meaningful error message DHIS2-12123 the failed event import in NTI is due to a missing reference from a program stage to a program. this should not happen but it does occasionally, due to the way the metadata import is implemented. provide an error message guiding the user to a solution for this edge case, until the root cause is fixed. * fix: add programs without registration to preheat DHIS2-12123 https://docs.dhis2.org/en/develop/using-the-api/dhis-core-version-master/new-tracker.html\#events states that program is not required. In this case the program and then program instance are not in the preheat. This leads to an error in the SQL insert statement as program instance needs to be specified on the program stage instance. Since programs without registration are expected/estimated to be in the order of a dozen we are fetching all of them
) (dhis2#9360) instead of throwing a more detailed exception. * EventProgramPreProcessor * EventWithoutRegistrationPreProcessor are 2 pre-processors where we discovered an NPE due to a missing reference in the DB from program stage to program. This is an edge case due to how the metadata import is currently implemented. Since pre-processing is done before validation we opted for returning before an NPE occurs. Validation will then find that a reference to a program is missing in the DB and create an error report. Note that the program field is not a mandatory field in the payload according to our NTI API documentation. I therefore needed an extra error code and return before adding E1123 which would only confuse the user.
…S2-TECH-842] (dhis2#9313)" This reverts commit 5affdec.
…2#9415) (dhis2#9433) quoting the userId parameter leads to an OR clause like OR sharing->'users'->'''ILK8ARxOS1V'''->>'access' LIKE '__r%' in the ACL query which does not contribute any results to the overall query
…9431) (dhis2#9440) Bumps log4j-core from 2.14.1 to 2.15.0. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit d68ea62) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…his2#11481) * fix: NoEntityFound exception for userService.getDisplayName() * Update UserServiceTest.java
* fix: Fix enrollment error message [DHIS2-11410] * fix: Fix enrollment error message [DHIS2-11410] make test methods public
We did not run all tests on Jenkins since our default profile which we activate by default only runs unit tests (excludes tests tagged with integration). by excluding the default profile with -default surefire will pick up all tests no matter what group/tag they belong to. Note that we are then running without any profile, which you can check using mvn help:active-profiles -P -default -f dhis-2/pom.xml Adapted pipelines to use the pom.xml instead of the pom-full.xml since having 2 has the risk of them diverging as they have. pom-full.xml only being used on Jenkins and pom.xml locally and on GitHub.
Automatically merged.
dhis2#11547 fixed potential issues that could cause the count of tests running on Jenkins/GitHub to divert. The actual root cause for version 2.37 is that we were using an old version of surefire org.apache.maven.plugins:maven-surefire-plugin:2.12.4 which you can see by running the tests without default or integration profile. So with only jdk8 or jdk11. When profiles default or integration are used like they are on GitHub where unit and integration tests run in parallel we actually use org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M5 The newer plugin has support for JUnit 5 as described in https://maven.apache.org/surefire/maven-surefire-plugin/examples/junit-platform.html which is why you also see the build log Using the provider org.apache.maven.surefire.junitplatform.JUnitPlatformProvider when running the build with -X in a module that has a JUnit 5 dependency. Ultimately, the test count differed by the number of JUnit 5 tests which did not run using maven-surefire-plugin 2.12.4
…1591) to not set skipTests when we do not want to
…ching on Jenkins [skip ci] (dhis2#11614)
…-13429] [2.37] (dhis2#11669) * fix: Use inheritance instead of partitions in analytics export [DHIS2-13429] * fix: Sonar issues [DHIS2-13429] * fix: Add back final for injections [DHIS2-13429]
Merges latest security advisories 2.37.8.1 * CVE-2022-41948 * CVE-2022-41947 * CVE-2022-41949
fix: getSystemSetting causes performance issue
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
There was a problem hiding this comment.
CodeQL found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Required by: https://app.clickup.com/t/8696q5hym
This is just a cherry-pick from upstream fix (applied to 2.37.10)
dhis2#12815
For more details: https://app.clickup.com/t/8696q5hym?comment=90120096087640