Skip to content

Commit 7f33b68

Browse files
committed
refactor(config): clarify POM profiles and fix test formatting
- Rename profiles in google-cloud-pom-parent for clarity: - jdk-old -> errorprone-jdk11 - jdk-mid -> errorprone-jdk17 - Add comments explaining Error Prone downgrades and compiler flags. - Reformat EnvInfoTest.java to comply with style guide. BUG=b/481669998 TAG=agy CONV=7b193e4d-38f8-450c-8475-0b9ae0d04507
1 parent e5e8cd5 commit 7f33b68

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

  • google-cloud-pom-parent
  • java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/attributes

google-cloud-pom-parent/pom.xml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<skipUnitTests>false</skipUnitTests>
2424
<checkstyle.header.file>java.header</checkstyle.header.file>
2525
<errorprone.version>2.48.0</errorprone.version>
26+
<!-- Error Prone 2.43.0+ running on JDK 21+ requires this javac flag to
27+
correctly handle type annotations in javac. -->
2628
<errorprone.javac.args>-XDaddTypeAnnotationsToSymbol=true</errorprone.javac.args>
2729
</properties>
2830

@@ -132,7 +134,11 @@
132134
</build>
133135
</profile>
134136
<profile>
135-
<id>jdk-old</id>
137+
<!-- Error Prone 2.43.0+ requires JDK 21+ to run.
138+
For JDK < 17, we downgrade to Error Prone 2.38.0.
139+
We also use a dummy '-g' javac arg because the default JDK 21+ arg
140+
'-XDaddTypeAnnotationsToSymbol=true' is invalid on older JDKs. -->
141+
<id>errorprone-jdk11</id>
136142
<activation>
137143
<jdk>[1.8,17)</jdk>
138144
</activation>
@@ -142,7 +148,11 @@
142148
</properties>
143149
</profile>
144150
<profile>
145-
<id>jdk-mid</id>
151+
<!-- Error Prone 2.43.0+ requires JDK 21+ to run.
152+
For JDK 17, we downgrade to Error Prone 2.42.0 (latest version supporting JDK 17).
153+
We also use a dummy '-g' javac arg because the default JDK 21+ arg
154+
'-XDaddTypeAnnotationsToSymbol=true' is invalid on older JDKs. -->
155+
<id>errorprone-jdk17</id>
146156
<activation>
147157
<jdk>[17,21)</jdk>
148158
</activation>

java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/attributes/EnvInfoTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.google.cloud.opentelemetry.detection.GCPPlatformDetector.SupportedPlatform;
2424
import com.google.common.base.Function;
2525
import com.google.common.base.Supplier;
26-
import com.google.common.base.Suppliers;
2726
import com.google.common.collect.ImmutableMap;
2827
import java.util.Map;
2928
import org.junit.jupiter.api.Test;

0 commit comments

Comments
 (0)