Merge remote-tracking branch 'origin/develop' into ckozak/gh1099

changelog/5.29.3/pr-1086.v2.yml

@@ -0,0 +1,7 @@
+type: fix
+fix:
+  description: The java classes for conjure enums are now annotated with `@com.google.errorprone.annotations.Immutable`,
+    which ensures that if they're used inside hand-rolled enums, Google's [ImmutableEnumChecker](https://errorprone.info/bugpattern/ImmutableEnumChecker)
+    won't complain.
+  links:
+  - https://github.com/palantir/conjure-java/pull/1086

conjure-java-core/src/main/java/com/palantir/conjure/java/types/EnumGenerator.java

@@ -21,6 +21,7 @@
 import com.google.common.base.CaseFormat;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.errorprone.annotations.Immutable;
 import com.palantir.conjure.java.ConjureAnnotations;
 import com.palantir.conjure.java.Options;
 import com.palantir.conjure.java.util.Javadoc;
@@ -74,6 +75,7 @@ private static TypeSpec createSafeEnum(
             EnumDefinition typeDef, ClassName thisClass, ClassName enumClass, ClassName visitorClass) {
         TypeSpec.Builder wrapper = TypeSpec.classBuilder(typeDef.getTypeName().getName())
                 .addAnnotation(ConjureAnnotations.getConjureGeneratedAnnotation(EnumGenerator.class))
+                .addAnnotation(Immutable.class)
                 .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
                 .addType(createEnum(enumClass, typeDef.getValues(), true))
                 .addType(createVisitor(visitorClass, typeDef.getValues()))

versions.lock

@@ -1,16 +1,16 @@
 # Run ./gradlew --write-locks to regenerate this file
 com.atlassian.commonmark:commonmark:0.12.1 (1 constraints: 36052a3b)
-com.fasterxml.jackson.core:jackson-annotations:2.11.3 (10 constraints: beb34a25)
-com.fasterxml.jackson.core:jackson-core:2.11.3 (15 constraints: 4f3cace9)
-com.fasterxml.jackson.core:jackson-databind:2.11.3 (27 constraints: 8700175c)
-com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.11.3 (2 constraints: dd333300)
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.11.3 (1 constraints: 7c1c95a4)
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.3 (3 constraints: 3425de0e)
-com.fasterxml.jackson.datatype:jackson-datatype-guava:2.11.3 (2 constraints: 2a2b65af)
-com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.3 (6 constraints: f45e5052)
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.3 (2 constraints: 2a2b65af)
-com.fasterxml.jackson.module:jackson-module-afterburner:2.11.3 (4 constraints: 3551f382)
-com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.3 (2 constraints: b52193b6)
+com.fasterxml.jackson.core:jackson-annotations:2.11.1 (10 constraints: b6b3f219)
+com.fasterxml.jackson.core:jackson-core:2.11.1 (15 constraints: 373c64bc)
+com.fasterxml.jackson.core:jackson-databind:2.11.1 (27 constraints: 6d009df3)
+com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.11.1 (2 constraints: da3385ff)
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.11.1 (1 constraints: 7b1c94a4)
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.1 (3 constraints: 3225260e)
+com.fasterxml.jackson.datatype:jackson-datatype-guava:2.11.1 (2 constraints: 292b3aaf)
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1 (6 constraints: f15ec94f)
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1 (2 constraints: 292b3aaf)
+com.fasterxml.jackson.module:jackson-module-afterburner:2.11.1 (4 constraints: 33510b82)
+com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1 (2 constraints: b52193b6)
 com.github.ben-manes.caffeine:caffeine:2.8.5 (9 constraints: f29b0724)
 com.google.code.findbugs:jsr305:3.0.2 (20 constraints: a03e988f)
 com.google.errorprone:error_prone_annotations:2.4.0 (13 constraints: d1bf42e2)
@@ -21,19 +21,19 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 c
 com.google.j2objc:j2objc-annotations:1.3 (1 constraints: b809eda0)
 com.palantir.conjure:conjure-api-objects:4.8.0 (2 constraints: ff211ba9)
 com.palantir.conjure:conjure-generator-common:4.8.0 (2 constraints: a3131b62)
-com.palantir.conjure.java.api:errors:2.16.2 (5 constraints: 54547d54)
-com.palantir.conjure.java.api:service-config:2.16.2 (4 constraints: 3b48394e)
-com.palantir.conjure.java.api:ssl-config:2.16.2 (2 constraints: a7252039)
-com.palantir.conjure.java.runtime:client-config:6.6.0 (6 constraints: 307b9b10)
-com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:6.6.0 (6 constraints: 1175c548)
-com.palantir.conjure.java.runtime:keystores:6.6.0 (5 constraints: 465ce1a9)
-com.palantir.dialogue:dialogue-apache-hc5-client:1.85.0 (2 constraints: 7829e200)
+com.palantir.conjure.java.api:errors:2.16.2 (5 constraints: 56541555)
+com.palantir.conjure.java.api:service-config:2.16.2 (4 constraints: 3c48d14e)
+com.palantir.conjure.java.api:ssl-config:2.16.2 (2 constraints: a8252139)
+com.palantir.conjure.java.runtime:client-config:6.7.0 (6 constraints: 337b2313)
+com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:6.7.0 (6 constraints: 1675444c)
+com.palantir.conjure.java.runtime:keystores:6.7.0 (5 constraints: 4a5c45ac)
+com.palantir.dialogue:dialogue-apache-hc5-client:1.85.0 (2 constraints: 7b297b01)
 com.palantir.dialogue:dialogue-blocking-channels:1.85.0 (1 constraints: 0214a182)
 com.palantir.dialogue:dialogue-clients:1.85.0 (1 constraints: 4005543b)
-com.palantir.dialogue:dialogue-core:1.85.0 (3 constraints: 793d80df)
+com.palantir.dialogue:dialogue-core:1.85.0 (3 constraints: 7c3dc7e0)
 com.palantir.dialogue:dialogue-futures:1.85.0 (3 constraints: d13383be)
-com.palantir.dialogue:dialogue-serde:1.85.0 (3 constraints: b72e1fa2)
-com.palantir.dialogue:dialogue-target:1.85.0 (7 constraints: 88764f56)
+com.palantir.dialogue:dialogue-serde:1.85.0 (3 constraints: ba2eb8a2)
+com.palantir.dialogue:dialogue-target:1.85.0 (7 constraints: 8b765559)
 com.palantir.javaformat:palantir-java-format:1.0.1 (1 constraints: 0405f135)
 com.palantir.javaformat:palantir-java-format-spi:1.0.1 (1 constraints: d5120126)
 com.palantir.refreshable:refreshable:1.0.0 (2 constraints: 5e24d0b6)
@@ -48,8 +48,8 @@ com.palantir.tracing:tracing-api:4.9.0 (5 constraints: 2d4b2b51)
 com.palantir.tracing:tracing-undertow:4.9.0 (1 constraints: 0f051a36)
 com.palantir.tritium:tritium-api:0.18.3 (2 constraints: 391f90bd)
 com.palantir.tritium:tritium-core:0.18.3 (1 constraints: 441047a2)
-com.palantir.tritium:tritium-metrics:0.18.3 (4 constraints: a44c2ad2)
-com.palantir.tritium:tritium-registry:0.18.3 (8 constraints: f79ac58c)
+com.palantir.tritium:tritium-metrics:0.18.3 (4 constraints: a74c10d4)
+com.palantir.tritium:tritium-registry:0.18.3 (8 constraints: 009bf397)
 com.squareup:javapoet:1.13.0 (1 constraints: 3705323b)
 commons-codec:commons-codec:1.13 (1 constraints: 0b13c128)
 info.picocli:picocli:4.5.1 (1 constraints: 0c050f36)
@@ -85,11 +85,11 @@ ch.qos.logback:logback-access:1.2.3 (1 constraints: b41148e2)
 ch.qos.logback:logback-classic:1.2.3 (4 constraints: d232d9c3)
 ch.qos.logback:logback-core:1.2.3 (3 constraints: 1a28577f)
 com.fasterxml:classmate:1.3.4 (1 constraints: 9b122713)
-com.fasterxml.jackson.datatype:jackson-datatype-joda:2.11.3 (1 constraints: af0e575e)
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.11.3 (2 constraints: d72ef268)
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider:2.11.3 (1 constraints: 3e1972bb)
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.11.3 (1 constraints: b70ea16b)
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.11.3 (2 constraints: d72ef268)
+com.fasterxml.jackson.datatype:jackson-datatype-joda:2.11.1 (1 constraints: af0e575e)
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.11.1 (2 constraints: d32e6c68)
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider:2.11.1 (1 constraints: 3d1971bb)
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.11.1 (1 constraints: b70ea16b)
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.11.1 (2 constraints: d32e6c68)
 com.helger:profiler:1.1.1 (1 constraints: e21053b8)
 com.jcraft:jzlib:1.1.3 (1 constraints: 0d192ea2)
 com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 7d14fe7b)
@@ -100,14 +100,14 @@ com.netflix.feign:feign-okhttp:8.18.0 (1 constraints: c718909e)
 com.netflix.feign:feign-slf4j:8.18.0 (1 constraints: c718909e)
 com.palantir.conjure:conjure-core:4.8.0 (1 constraints: 0e051736)
 com.palantir.conjure.java.api:test-utils:2.16.2 (1 constraints: 3d05433b)
-com.palantir.conjure.java.runtime:conjure-java-jaxrs-client:6.6.0 (1 constraints: 0e051b36)
-com.palantir.conjure.java.runtime:conjure-java-jersey-server:6.6.0 (1 constraints: 0e051b36)
-com.palantir.conjure.java.runtime:conjure-java-retrofit2-client:6.6.0 (1 constraints: 0e051b36)
-com.palantir.conjure.java.runtime:okhttp-clients:6.6.0 (2 constraints: 9c327961)
-com.palantir.conjure.java.runtime:refresh-utils:6.6.0 (2 constraints: 9c327961)
+com.palantir.conjure.java.runtime:conjure-java-jaxrs-client:6.7.0 (1 constraints: 0f051e36)
+com.palantir.conjure.java.runtime:conjure-java-jersey-server:6.7.0 (1 constraints: 0f051e36)
+com.palantir.conjure.java.runtime:conjure-java-retrofit2-client:6.7.0 (1 constraints: 0f051e36)
+com.palantir.conjure.java.runtime:okhttp-clients:6.7.0 (2 constraints: 9e32c761)
+com.palantir.conjure.java.runtime:refresh-utils:6.7.0 (2 constraints: 9e32c761)
 com.palantir.safe-logging:preconditions-assertj:1.13.1 (1 constraints: 3805333b)
-com.palantir.tracing:tracing-jersey:4.9.0 (1 constraints: 14194fa2)
-com.palantir.tracing:tracing-okhttp3:4.9.0 (3 constraints: 2047ca22)
+com.palantir.tracing:tracing-jersey:4.9.0 (1 constraints: 151952a2)
+com.palantir.tracing:tracing-okhttp3:4.9.0 (3 constraints: 23478d23)
 com.palantir.websecurity:dropwizard-web-security:1.1.0 (1 constraints: 0405f335)
 com.squareup.okhttp3:logging-interceptor:3.14.1 (1 constraints: b114c190)
 com.squareup.okhttp3:okhttp:3.14.1 (6 constraints: 9d560edd)

versions.props

@@ -1,12 +1,11 @@
 ch.qos.logback:* = 1.2.3
 com.atlassian.commonmark:* = 0.12.1
-com.fasterxml.jackson.*:jackson-* = 2.11.3
 com.google.code.findbugs:jsr305 = 3.0.2
 com.google.errorprone:error_prone_annotations = 2.4.0
 com.palantir.javaformat:palantir-java-format = 1.0.1
 com.google.guava:guava = 29.0-jre
 com.palantir.conjure.java.api:* = 2.16.2
-com.palantir.conjure.java.runtime:* = 6.6.0
+com.palantir.conjure.java.runtime:* = 6.7.0
 com.palantir.conjure.verification:* = 0.18.5
 com.palantir.conjure:* = 4.8.0
 com.palantir.dialogue:* = 1.85.0
@@ -36,3 +35,8 @@ org.junit.jupiter:* = 5.7.0
 org.junit.vintage:* = 5.4.2
 org.mockito:* = 3.5.13
 org.slf4j:* = 1.7.30
+
+# dependency-upgrader:OFF
+# Avoid forcing consumers to upgrade jackson
+com.fasterxml.jackson.*:jackson-* = 2.11.1
+# dependency-upgrader:ON