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

Upgrade to target compile 17 #7413

Merged
merged 11 commits into from
Oct 31, 2024
Merged

Upgrade to target compile 17 #7413

merged 11 commits into from
Oct 31, 2024

Conversation

fsamuel-bs
Copy link
Contributor

@fsamuel-bs fsamuel-bs commented Oct 31, 2024

General

After this PR:
Upgrade AtlasDB to java 17. Follow up of #7306.

Changes:

  • remove com.google.common.primitives.Longs references
  • upgrade several dependencies

What needs to be done in the future:

  • upgrade to Dagger 2.52+ done in conjunction to adding jakarta dependencies. Because dagger.internal.Provider added a dependency on jakarta.inject.Inject.
  • upgrade to junit 5.11.0+ needs to be accompanied with a dropwizard upgrade to 3.0+. Because DropwizardExtensionsSupport uses an internal method from junit that has been removed.
    • note that org.mockito:* = 5.14.1 also bumps junit to 5.11.0+

==COMMIT_MSG==
==COMMIT_MSG==

@changelog-app
Copy link

changelog-app bot commented Oct 31, 2024

Generate changelog in changelog/@unreleased

What do the change types mean?
  • feature: A new feature of the service.
  • improvement: An incremental improvement in the functionality or operation of the service.
  • fix: Remedies the incorrect behaviour of a component of the service in a backwards-compatible way.
  • break: Has the potential to break consumers of this service's API, inclusive of both Palantir services
    and external consumers of the service's API (e.g. customer-written software or integrations).
  • deprecation: Advertises the intention to remove service functionality without any change to the
    operation of the service itself.
  • manualTask: Requires the possibility of manual intervention (running a script, eyeballing configuration,
    performing database surgery, ...) at the time of upgrade for it to succeed.
  • migration: A fully automatic upgrade migration task with no engineer input required.

Note: only one type should be chosen.

How are new versions calculated?
  • ❗The break and manual task changelog types will result in a major release!
  • 🐛 The fix changelog type will result in a minor release in most cases, and a patch release version for patch branches. This behaviour is configurable in autorelease.
  • ✨ All others will result in a minor version release.

Type

  • Feature
  • Improvement
  • Fix
  • Break
  • Deprecation
  • Manual task
  • Migration

Description

Upgrade AtlasDB to target compile 17

Check the box to generate changelog(s)

  • Generate changelog entry

Comment on lines -106 to -107
# Large internal product uses 2.x
org.codehaus.groovy:* = 2.5.14
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed they have upgraded to 3.x

Comment on lines -109 to -110
# Subsequent versions use Java 17, which we don't use right now.
com.palantir.goethe:* = 0.12.0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're now in java 17


# Large internal consumer still relies on protobuf 3.x.
# We need to bump this in coordination with them.
com.google.protobuf:* = 3.25.4
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pinned from above to 3.x

org.mockito:* = 5.12.0

# Dagger 2.52.0+ adds a dependency on jakarta. Bump this with the javax -> jakarta migration.
com.google.dagger:* = 2.51.1
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Explanation inline, pinned from above.

Comment on lines +96 to +98
org.junit.jupiter:* = 5.10.2
org.junit.platform:* = 1.10.2
org.mockito:* = 5.12.0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Explanation inline, pinned from above.

org.awaitility:awaitility = 4.2.1
org.assertj:* = 3.26.3
org.awaitility:awaitility = 4.2.2
org.codehaus.groovy:* = 3.0.9
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unpinned from below.

com.palantir.docker.proxy:* = 1.6.0
com.palantir.goethe:* = 0.12.0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unpinned from below.

com.palantir.conjure.java:* = 8.28.0
com.palantir.conjure:conjure = 4.49.0
com.palantir.dialogue:* = 3.135.0
com.palantir.dialogue:* = 4.1.0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Major version bump, but it's fine since most internal products are on 4.x already.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah confirmed large product is on 4.x

# Ksp version is temporary, can be removed once Maven calms down.
com.google.devtools.ksp:symbol-processing-api = 1.5.21-1.0.0-beta07
com.google.errorprone:* = 2.10.0 # upgrading to 2.11.0 is blocked by a google bug
com.google.errorprone:error_prone_annotations = 2.10.0
com.google.guava:guava = 33.2.1-jre
com.google.protobuf:* = 3.25.3
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pinned below.

@@ -10,73 +10,70 @@ com.google.auto.service:auto-service-annotations = 1.0
com.google.auto:auto-common = 1.2.2
com.google.code.findbugs:findbugs-annotations = 3.0.1
com.google.code.findbugs:jsr305 = 3.0.2
com.google.dagger:* = 2.51.1
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pinned below.

Copy link
Contributor

@jeremyk-91 jeremyk-91 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Couple of small bits 👍

com.palantir.conjure.java:* = 8.28.0
com.palantir.conjure:conjure = 4.49.0
com.palantir.dialogue:* = 3.135.0
com.palantir.dialogue:* = 4.1.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah confirmed large product is on 4.x

versions.lock Outdated
com.zaxxer:HikariCP:5.1.0 (1 constraints: 08050736)
commons-cli:commons-cli:1.8.0 (3 constraints: 7e249d97)
commons-codec:commons-codec:1.17.0 (2 constraints: 6d148085)
com.zaxxer:HikariCP:6.0.0 (1 constraints: 08050936)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👀 Do we know what changed here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tagging @berler @CVdV-au in case they can advise

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

@ergo14 ergo14 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the sign posted bumps, looks good to me modulo the hikari bump

@bulldozer-bot bulldozer-bot bot merged commit 7491a87 into develop Oct 31, 2024
21 checks passed
@bulldozer-bot bulldozer-bot bot deleted the ssouza/java-17 branch October 31, 2024 17:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants