Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 77 additions & 0 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,68 @@ limitations under the License.
<version>3.0.2</version>
<scope>provided</scope>
</dependency>

<!-- Security overrides: google-cloud-bigtable ${bigtable.version} resolves guava,
jackson-core and opentelemetry releases that have known CVEs. All three are bundled into
this jar, so manage them up to the patched releases (see the properties in the root
pom). Explicit entries take precedence over the BOMs imported above. Every
opentelemetry artifact used by the veneer is listed, because the SDK must not be older
than the API. -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-core.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-context</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-common</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-common</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-metrics</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-trace</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-logs</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -456,6 +518,21 @@ limitations under the License.
<targetDependencies>
<targetDependency>com.google.cloud:google-cloud-bigtable</targetDependency>
</targetDependencies>
<ignoredDependencies>
<!-- deliberately managed above the veneer's versions, see the security overrides
in dependencyManagement -->
<ignoredDependency>com.google.guava:guava</ignoredDependency>
<ignoredDependency>com.fasterxml.jackson.core:jackson-core</ignoredDependency>
<ignoredDependency>io.opentelemetry:opentelemetry-api</ignoredDependency>
<ignoredDependency>io.opentelemetry:opentelemetry-context</ignoredDependency>
<ignoredDependency>io.opentelemetry:opentelemetry-common</ignoredDependency>
<ignoredDependency>io.opentelemetry:opentelemetry-sdk</ignoredDependency>
<ignoredDependency>io.opentelemetry:opentelemetry-sdk-common</ignoredDependency>
<ignoredDependency>io.opentelemetry:opentelemetry-sdk-metrics</ignoredDependency>
<ignoredDependency>io.opentelemetry:opentelemetry-sdk-trace</ignoredDependency>
<ignoredDependency>io.opentelemetry:opentelemetry-sdk-logs</ignoredDependency>
<ignoredDependency>io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi</ignoredDependency>
</ignoredDependencies>
</configuration>
</execution>
</executions>
Expand Down
77 changes: 77 additions & 0 deletions bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,68 @@ limitations under the License.
<version>3.0.2</version>
<scope>provided</scope>
</dependency>

<!-- Security overrides: google-cloud-bigtable ${bigtable.version} resolves guava,
jackson-core and opentelemetry releases that have known CVEs. All three are bundled into
this jar, so manage them up to the patched releases (see the properties in the root
pom). Explicit entries take precedence over the BOMs imported above. Every
opentelemetry artifact used by the veneer is listed, because the SDK must not be older
than the API. -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-core.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-context</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-common</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-common</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-metrics</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-trace</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-logs</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -454,6 +516,21 @@ limitations under the License.
<targetDependencies>
<targetDependency>com.google.cloud:google-cloud-bigtable</targetDependency>
</targetDependencies>
<ignoredDependencies>
<!-- deliberately managed above the veneer's versions, see the security overrides
in dependencyManagement -->
<dependency>com.google.guava:guava</dependency>
<dependency>com.fasterxml.jackson.core:jackson-core</dependency>
<dependency>io.opentelemetry:opentelemetry-api</dependency>
<dependency>io.opentelemetry:opentelemetry-context</dependency>
<dependency>io.opentelemetry:opentelemetry-common</dependency>
<dependency>io.opentelemetry:opentelemetry-sdk</dependency>
<dependency>io.opentelemetry:opentelemetry-sdk-common</dependency>
<dependency>io.opentelemetry:opentelemetry-sdk-metrics</dependency>
<dependency>io.opentelemetry:opentelemetry-sdk-trace</dependency>
<dependency>io.opentelemetry:opentelemetry-sdk-logs</dependency>
<dependency>io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi</dependency>
Comment on lines +522 to +532

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

medium

For consistency with bigtable-hbase-1.x-shaded/pom.xml and to adhere to standard Maven conventions for list element naming, consider using <ignoredDependency> instead of <dependency> inside the <ignoredDependencies> block.

Suggested change
<dependency>com.google.guava:guava</dependency>
<dependency>com.fasterxml.jackson.core:jackson-core</dependency>
<dependency>io.opentelemetry:opentelemetry-api</dependency>
<dependency>io.opentelemetry:opentelemetry-context</dependency>
<dependency>io.opentelemetry:opentelemetry-common</dependency>
<dependency>io.opentelemetry:opentelemetry-sdk</dependency>
<dependency>io.opentelemetry:opentelemetry-sdk-common</dependency>
<dependency>io.opentelemetry:opentelemetry-sdk-metrics</dependency>
<dependency>io.opentelemetry:opentelemetry-sdk-trace</dependency>
<dependency>io.opentelemetry:opentelemetry-sdk-logs</dependency>
<dependency>io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi</dependency>
<ignoredDependency>com.google.guava:guava</ignoredDependency>\n <ignoredDependency>com.fasterxml.jackson.core:jackson-core</ignoredDependency>\n <ignoredDependency>io.opentelemetry:opentelemetry-api</ignoredDependency>\n <ignoredDependency>io.opentelemetry:opentelemetry-context</ignoredDependency>\n <ignoredDependency>io.opentelemetry:opentelemetry-common</ignoredDependency>\n <ignoredDependency>io.opentelemetry:opentelemetry-sdk</ignoredDependency>\n <ignoredDependency>io.opentelemetry:opentelemetry-sdk-common</ignoredDependency>\n <ignoredDependency>io.opentelemetry:opentelemetry-sdk-metrics</ignoredDependency>\n <ignoredDependency>io.opentelemetry:opentelemetry-sdk-trace</ignoredDependency>\n <ignoredDependency>io.opentelemetry:opentelemetry-sdk-logs</ignoredDependency>\n <ignoredDependency>io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi</ignoredDependency>

</ignoredDependencies>
</configuration>
</execution>
</executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,11 @@ limitations under the License.
<pattern>org.checkerframework</pattern>
<shadedPattern>${shading-prefix}.org.checkerframework</shadedPattern>
</relocation>
<!-- guava ${guava.version} depends on jspecify instead of checker-qual -->
<relocation>
<pattern>org.jspecify</pattern>
<shadedPattern>${shading-prefix}.org.jspecify</shadedPattern>
</relocation>
<relocation>
<pattern>javax.annotation</pattern>
<shadedPattern>${shading-prefix}.javax.annotation</shadedPattern>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,11 @@ limitations under the License.
<pattern>org.checkerframework</pattern>
<shadedPattern>${shading-prefix}.org.checkerframework</shadedPattern>
</relocation>
<!-- guava ${guava.version} depends on jspecify instead of checker-qual -->
<relocation>
<pattern>org.jspecify</pattern>
<shadedPattern>${shading-prefix}.org.jspecify</shadedPattern>
</relocation>
<relocation>
<pattern>javax.annotation</pattern>
<shadedPattern>${shading-prefix}.javax.annotation</shadedPattern>
Expand Down
12 changes: 10 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,18 @@ limitations under the License.
<hamcrest.version>1.3</hamcrest.version>
<mockito.version>4.11.0</mockito.version>
<beam.version>2.77.0</beam.version>
<!-- referred from bigtable-beam-import and bigtable-emulator -->
<guava.version>33.4.0-jre</guava.version>
<opencensus.version>0.31.1</opencensus.version>

<!-- Security overrides. google-cloud-bigtable ${bigtable.version} still resolves releases of
these libraries that have known CVEs. They are bundled into the
bigtable-hbase-{1,2}.x-shaded (and therefore the -hadoop) jars, so those modules manage
them up to the patched releases below. Remove an override once the veneer's deps-bom
ships the same or a newer version.
guava.version is also referred from bigtable-hbase-mirroring-client-core. -->
<guava.version>33.7.2-jre</guava.version>
<jackson-core.version>2.18.12</jackson-core.version>
<opentelemetry.version>1.67.0</opentelemetry.version>
Comment on lines +90 to +98

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

medium

By upgrading guava.version directly in the root pom.xml, unshaded modules that reference ${guava.version} (such as bigtable-beam-import and bigtable-emulator) will also have their Guava version upgraded to 33.7.2-jre. This contradicts the goal of keeping unshaded modules mirroring the veneer's dependency versions exactly (which is 33.4.0-jre).\n\nTo keep the overrides strictly scoped to the shaded modules:\n1. Keep guava.version at 33.4.0-jre in the root pom.xml.\n2. Define a new property for the override, e.g., <guava-override.version>33.7.2-jre</guava-override.version>.\n3. Use ${guava-override.version} in the dependencyManagement of bigtable-hbase-1.x-shaded and bigtable-hbase-2.x-shaded.\n4. Add a dependencyManagement section to bigtable-hbase-mirroring-client-1.x-shaded and 2.x-shaded to override guava to ${guava-override.version} during shading, while leaving the unshaded bigtable-hbase-mirroring-client-core on the standard ${guava.version}.


<!-- Enable the ability to skip unit tests and only run integration tests,
while still respecting global skipTests override. -->
<skipTests>false</skipTests>
Expand Down
Loading