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

Consolidated Dependency Updates (Take2) #2832

Merged
merged 6 commits into from
Jun 26, 2023

Conversation

melba-lopez
Copy link
Contributor

Description

ORIGINAL PR #2725

Consolidated dependency updates

Package Type Update Change
'mysql:mysql-connector-java ' compile patch '8.0.29 -> 8.0.33 '
org.glassfish.jaxb:jaxb-runtime (source) compile patch 2.3.6 -> 2.3.8
org.postgresql:postgresql (source) compile minor 42.5.1 -> 42.6.0
eclipse-temurin stage patch 17.0.6_10-jre-focal -> 17.0.7_7-jre-focal
com.microsoft.sqlserver:mssql-jdbc compile major 11.2.3.jre17 -> 12.2.0.jre11
'jekyll '   major '3.8 -> 4.0 '
'org.eclipse.jetty:jetty-maven-plugin (source) ' build major '10.0.15 -> 11.0.15 '

Addressed Issue

Additional Details

Upgrades not compatible at this time:

Postponed:

Checklist

  • I have read and understand the contributing guidelines
  • This PR fixes a defect, and I have provided tests to verify that the fix is effective
  • This PR implements an enhancement, and I have provided tests to verify that it works as intended
  • This PR introduces changes to the database model, and I have added corresponding update logic
  • This PR introduces new or alters existing behavior, and I have updated the documentation accordingly

@melba-lopez
Copy link
Contributor Author

melba-lopez commented Jun 20, 2023

@nscuro not sure why DCO is failing if i did signoff on all my commits. 😿 they all say Signed-off-by: Melba Lopez <Melba.Lopez@ibm.com>

@valentijnscholten
Copy link
Contributor

I think the problem is the email address in the sign-off: https://github.com/DependencyTrack/dependency-track/pull/2832/checks?check_run_id=14392050786

@melba-lopez
Copy link
Contributor Author

I think the problem is the email address in the sign-off: https://github.com/DependencyTrack/dependency-track/pull/2832/checks?check_run_id=14392050786

Unfortunately, if you look at the other commits (which are passing) they all say Signed-off-by: Melba Lopez Melba.Lopez@ibm.com

Passing:
- 62c3418
- 6bcc4ea
- 53d023c

Failing:
- a29f033
- 4c75ef5

Interestingly enough, only Reverting Jekyll shows a red x and that its not passing. So why do the logs show 2 but only 1 gets flagged? and why are they even getting flagged if every commit says the same thing for signoff. 😞
image

@msymons
Copy link
Member

msymons commented Jun 20, 2023

@nscuro not sure why DCO is failing if i did signoff on all my commits. 😿 they all say Signed-off-by: Melba Lopez <Melba.Lopez@ibm.com>

@melba-lopez, this might be a red herring (because some of your commits were fine) but just checking... Is this what is configured as your primary email account in GitHub? That is what DCO expects.

The first time I tried to use DCO I used my secondary email. The sig was otherwise 100% correctly formatted... and DCO failed. Most annoying.

@nscuro
Copy link
Member

nscuro commented Jun 21, 2023

@melba-lopez Stupid question, but did you sign-off "manually" via commit message, or did you use the -s flag when committing? I don't know why, but I had it happen multiple times to me that the manual way was not accepted, despite it looking exactly like what -s would produce. Your commits look fine to me as well.

@valentijnscholten
Copy link
Contributor

Maybe just rebase and/or squash and sign the new commit(s)?

@nscuro
Copy link
Member

nscuro commented Jun 21, 2023

@valentijnscholten Maybe just rebase and/or squash and sign the new commit(s)?

Good call. Likely best way forward here :D

nscuro and others added 6 commits June 23, 2023 11:46
See https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/

Signed-off-by: nscuro <nscuro@protonmail.com>
Signed-off-by: Melba Lopez <Melba.Lopez@ibm.com>
Includes stevespringett/Alpine#494 among other changes so far.

Also added documentation for `alpine.datanucleus.cache.level2.type`.

Signed-off-by: nscuro <nscuro@protonmail.com>
Signed-off-by: Melba Lopez <Melba.Lopez@ibm.com>
Consolidated dependency updates

| Package | Type | Update | Change |
|---|---|---|---|
|org.glassfish.jaxb:jaxb-runtime (source) | compile | patch | 2.3.6 -> 2.3.8 |
|com.microsoft.sqlserver:mssql-jdbc | compile | major | 11.2.3.jre17 -> 12.2.0.jre11 |
|mysql:mysql-connector-java | compile | patch | 8.0.29 -> 8.0.33 |
|org.postgresql:postgresql (source) | compile | minor | 42.5.1 -> 42.6.0 |
|org.eclipse.jetty:jetty-maven-plugin (source) | build | major | 10.0.15 -> 11.0.15 |

- [x ] This PR fixes a defect, and I have provided tests to verify that the fix is effective

Signed-off-by: Melba Lopez <Melba.Lopez@ibm.com>
|eclipse-temurin | stage | patch | 17.0.6_10-jre-focal -> 17.0.7_7-jre-focal | DependencyTrack#77 |

Signed-off-by: Melba Lopez <Melba.Lopez@ibm.com>
|jekyll |   | major | '~> 3.8' -> '~> 4.0' |

Signed-off-by: Melba Lopez <Melba.Lopez@ibm.com>
Signed-off-by: Melba Lopez <Melba.Lopez@ibm.com>
@melba-lopez
Copy link
Contributor Author

it seems to be because the last 2 i signed off via the UI versus command line sigh DCO is passing now

@nscuro nscuro added this to the 4.9 milestone Jun 26, 2023
@nscuro nscuro merged commit 9ecd612 into DependencyTrack:master Jun 26, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 26, 2023
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.

4 participants