Skip to content

Commit f0af0a2

Browse files
committed
revert: undo parent POM restructuring and property consolidation
Undoes the previous property centralization and parent POM restructuring in response to PR review feedback: - Restores skipUnitTests and checkstyle.header.file properties to their original files: google-cloud-pom-parent/pom.xml and gapic-generator-java-pom-parent/pom.xml. - Restores gapic-generator-java-pom-parent/pom.xml to inherit directly from google-cloud-shared-config. - Reverts all changes to sdk-platform-java-config/pom.xml. - Retains Error Prone version updates (2.48.0) and redundant compiler flag cleanups. BUG=b/481669998 TAG=agy CONV=7b193e4d-38f8-450c-8475-0b9ae0d04507
1 parent 91f99b3 commit f0af0a2

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

  • google-cloud-pom-parent
  • sdk-platform-java

google-cloud-pom-parent/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
</parent>
2121

2222
<properties>
23+
<skipUnitTests>false</skipUnitTests>
24+
<checkstyle.header.file>java.header</checkstyle.header.file>
25+
<errorprone.version>2.48.0</errorprone.version>
2326
<!-- By default, no special internal javac flag is needed on JDK 22+.
2427
For JDK 21 specifically, profile errorprone-jdk21 activates the required flag. -->
2528
<errorprone.javac.args>-g</errorprone.javac.args>

sdk-platform-java/gapic-generator-java-pom-parent/pom.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414
</description>
1515
<parent>
1616
<groupId>com.google.cloud</groupId>
17-
<artifactId>sdk-platform-java-config</artifactId>
18-
<version>3.63.0</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
19-
<relativePath>../sdk-platform-java-config</relativePath>
17+
<artifactId>google-cloud-shared-config</artifactId>
18+
<version>1.17.0</version>
2019
</parent>
2120

2221
<properties>
22+
<skipUnitTests>false</skipUnitTests>
23+
<checkstyle.header.file>java.header</checkstyle.header.file>
2324
<maven.compiler.release>8</maven.compiler.release>
2425

2526
<!-- External dependencies, especially gRPC and Protobuf version, should be
@@ -31,6 +32,7 @@
3132
<guava.version>33.5.0-jre</guava.version>
3233
<protobuf.version>4.33.2</protobuf.version>
3334
<opentelemetry.version>1.62.0</opentelemetry.version>
35+
<errorprone.version>2.48.0</errorprone.version>
3436
<j2objc-annotations.version>3.1</j2objc-annotations.version>
3537
<threetenbp.version>1.7.0</threetenbp.version>
3638
<junit.version>5.11.4</junit.version>

sdk-platform-java/sdk-platform-java-config/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,5 @@
2121
<google-cloud-shared-dependencies.version>3.63.0</google-cloud-shared-dependencies.version> <!-- {x-version-update:google-cloud-shared-dependencies:current} -->
2222
<!-- skipping clirr check for protobuf 4.x upgrade for downstream libraries -->
2323
<clirr.skip>true</clirr.skip>
24-
<skipUnitTests>false</skipUnitTests>
25-
<checkstyle.header.file>java.header</checkstyle.header.file>
26-
<errorprone.version>2.48.0</errorprone.version>
2724
</properties>
2825
</project>

0 commit comments

Comments
 (0)