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

chore(deps): bump jts.version from 1.18.2 to 1.19.0 in /dhis-2 #11143

Merged
merged 5 commits into from
Jul 30, 2022

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jun 22, 2022

Bumps jts.version from 1.18.2 to 1.19.0.
Updates jts-core from 1.18.2 to 1.19.0

Updates jts-io-common from 1.18.2 to 1.19.0

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot bot added dependencies Pull requests that update a dependency file java Pull requests that update Java code run-api-tests This label will trigger an api-test job for the PR. labels Jun 22, 2022
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@teleivo
Copy link
Contributor

teleivo commented Jul 28, 2022

@dependabot rebase

Bumps `jts.version` from 1.18.2 to 1.19.0.

Updates `jts-core` from 1.18.2 to 1.19.0

Updates `jts-io-common` from 1.18.2 to 1.19.0

---
updated-dependencies:
- dependency-name: org.locationtech.jts:jts-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.locationtech.jts.io:jts-io-common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot force-pushed the dependabot-maven-dhis-2-jts.version-1.19.0 branch from 93faa6d to 9d116ca Compare July 28, 2022 10:13
@teleivo teleivo force-pushed the dependabot-maven-dhis-2-jts.version-1.19.0 branch 2 times, most recently from f499f65 to baa024c Compare July 29, 2022 10:51
@teleivo
Copy link
Contributor

teleivo commented Jul 29, 2022

locationtech/jts parser has either gotten stricter or not reported
parser errors like when providing single quotes 'POINT (-11.4283223849698 8.06311527044516)' before locationtech/jts#786

Trim leading/trailing single quotes. The parser handles double quotes well.
Also don't call jts when geometry coming from a CSV which is a String is blank

as locationtech/jts parser has either gotten stricter or not reported
such parser errors before locationtech/jts#786
@teleivo teleivo force-pushed the dependabot-maven-dhis-2-jts.version-1.19.0 branch from baa024c to ab3c2af Compare July 29, 2022 11:00
@codecov
Copy link

codecov bot commented Jul 29, 2022

Codecov Report

Merging #11143 (7e6e3d0) into master (7ccec2a) will increase coverage by 0.02%.
The diff coverage is 87.50%.

@@             Coverage Diff              @@
##             master   #11143      +/-   ##
============================================
+ Coverage     63.12%   63.14%   +0.02%     
- Complexity    27199    27230      +31     
============================================
  Files          3187     3195       +8     
  Lines        112496   112604     +108     
  Branches      13219    13228       +9     
============================================
+ Hits          71009    71106      +97     
- Misses        35387    35398      +11     
  Partials       6100     6100              
Flag Coverage Δ
integration 45.44% <37.50%> (+0.02%) ⬆️
integration-h2 32.92% <25.00%> (+0.05%) ⬆️
unit 28.55% <50.00%> (+0.04%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
.../dxf2/events/event/csv/DefaultCsvEventService.java 47.22% <75.00%> (+1.50%) ⬆️
...controller/tracker/csv/TrackerCsvEventService.java 78.44% <100.00%> (+0.37%) ⬆️
...a/org/hisp/dhis/dxf2/common/HashCodeGenerator.java 72.72% <0.00%> (-18.19%) ⬇️
...adata/objectbundle/validation/ReferencesCheck.java 72.04% <0.00%> (-4.31%) ⬇️
...org/hisp/dhis/program/AnalyticsPeriodBoundary.java 67.21% <0.00%> (-1.64%) ⬇️
.../tracker/export/TrackerEventsExportController.java 20.00% <0.00%> (-0.84%) ⬇️
...rc/main/java/org/hisp/dhis/feedback/ErrorCode.java 100.00% <0.00%> (ø)
...main/java/org/hisp/dhis/sms/config/SMPPClient.java 4.00% <0.00%> (ø)
.../java/org/hisp/dhis/dxf2/config/ServiceConfig.java 100.00% <0.00%> (ø)
...p/dhis/cacheinvalidation/DbChangeEventHandler.java 0.00% <0.00%> (ø)
... and 11 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7ccec2a...7e6e3d0. Read the comment docs.

teleivo added 2 commits July 29, 2022 13:43
Alternatives in regular expressions should be grouped when used with anchors
This reverts commit 6f3c72c.

as Sonarqube is now saying that I should remove these unecessary groups
@teleivo
Copy link
Contributor

teleivo commented Jul 29, 2022

Ok 😂 so I tried to make Sonarqube happy as it said I should group the anchored alternatives https://rules.sonarsource.com/java/RSPEC-5850
and now its saying I should remove the unnecessary groups https://rules.sonarsource.com/java/RSPEC-6395

The example ^alt1|alt2|alt3$ does not apply to our code as we only have 2 alternatives, so the reason of alt2 then not being anchored isn't a concern for us.

I therefore marked the issues regarding the regex as won't fix in Sonarqube.

@sonarqubecloud
Copy link

sonarqubecloud bot commented Jul 29, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@teleivo teleivo enabled auto-merge (squash) July 29, 2022 12:22
@teleivo teleivo merged commit 313cbdc into master Jul 30, 2022
@teleivo teleivo deleted the dependabot-maven-dhis-2-jts.version-1.19.0 branch July 30, 2022 07:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file java Pull requests that update Java code run-api-tests This label will trigger an api-test job for the PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants