Skip to content

Commit e9e7870

Browse files
chore: clean up pom.xml variables (#4205)
This is a purely cosmetic change Change-Id: Ia3750c137ae9f40c2e8124dbe5a807cbd706df6f Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [ ] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-bigtable-hbase/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [ ] Ensure the tests and linter pass - [ ] Code coverage does not decrease (if any source code was changed) - [ ] Appropriate docs were updated (if necessary) Fixes #<issue_number_goes_here> ☕️ If you write sample code, please follow the [samples format]( https://togithub.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).
1 parent 62ed2d0 commit e9e7870

File tree

6 files changed

+8
-10
lines changed
  • bigtable-client-core-parent/bigtable-hbase
  • bigtable-hbase-1.x-parent
  • bigtable-hbase-2.x-parent

6 files changed

+8
-10
lines changed

bigtable-client-core-parent/bigtable-hbase/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ limitations under the License.
5555
<dependency>
5656
<groupId>${project.groupId}</groupId>
5757
<artifactId>bigtable-metrics-api</artifactId>
58-
<version>${bigtable-client-core.version}</version>
58+
<version>${bigtable-metrics-api.version}</version>
5959
<exclusions>
6060
<exclusion>
6161
<groupId>com.google.api</groupId>

bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ limitations under the License.
9595
<dependency>
9696
<groupId>com.google.cloud.bigtable</groupId>
9797
<artifactId>bigtable-metrics-api</artifactId>
98-
<version>${bigtable-client-core.version}</version>
98+
<version>${bigtable-metrics-api.version}</version>
9999
<exclusions>
100100
<exclusion>
101101
<groupId>com.google.api</groupId>

bigtable-hbase-1.x-parent/bigtable-hbase-1.x/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ limitations under the License.
6161
<dependency>
6262
<groupId>com.google.cloud.bigtable</groupId>
6363
<artifactId>bigtable-metrics-api</artifactId>
64-
<version>${bigtable-client-core.version}</version>
64+
<version>${bigtable-metrics-api.version}</version>
6565
<exclusions>
6666
<exclusion>
6767
<groupId>com.google.api</groupId>

bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ limitations under the License.
9595
<dependency>
9696
<groupId>com.google.cloud.bigtable</groupId>
9797
<artifactId>bigtable-metrics-api</artifactId>
98-
<version>${bigtable-client-core.version}</version>
98+
<version>${bigtable-metrics-api.version}</version>
9999
</dependency>
100100
<!-- Since opencensus-api is a transitive dep, we have to shade its impl as well.
101101
Otherwise the -api will be permanently severed from the impl and exporters -->

bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ limitations under the License.
7676
<dependency>
7777
<groupId>com.google.cloud.bigtable</groupId>
7878
<artifactId>bigtable-metrics-api</artifactId>
79-
<version>${bigtable-client-core.version}</version>
79+
<version>${bigtable-metrics-api.version}</version>
8080
<exclusions>
8181
<exclusion>
8282
<groupId>com.google.api</groupId>

pom.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ limitations under the License.
5858
<!-- core dependency versions -->
5959
<bigtable.version>2.28.0</bigtable.version>
6060
<google-cloud-bigtable-emulator.version>0.165.0</google-cloud-bigtable-emulator.version>
61-
<bigtable-client-core.version>1.29.2</bigtable-client-core.version>
61+
<bigtable-metrics-api.version>1.29.2</bigtable-metrics-api.version>
62+
6263
<!-- keeping at this version to align with hbase-->
6364
<slf4j.version>1.7.25</slf4j.version>
6465
<commons-logging.version>1.2</commons-logging.version>
@@ -83,13 +84,9 @@ limitations under the License.
8384
<beam.version>2.43.0</beam.version>
8485
<!-- referred from bigtable-beam-import and bigtable-emulator -->
8586
<guava.version>31.1-jre</guava.version>
86-
<gcs-guava.version>29.0-jre</gcs-guava.version>
8787
<beam-slf4j.version>1.7.30</beam-slf4j.version>
8888
<opencensus.version>0.31.1</opencensus.version>
8989

90-
<!-- Benchmarks related dependencies -->
91-
<jmh.version>1.36</jmh.version>
92-
9390
<!-- Enable the ability to skip unit tests and only run integration tests,
9491
while still respecting global skipTests override. -->
9592
<skipTests>false</skipTests>
@@ -369,6 +366,7 @@ limitations under the License.
369366
<rules>
370367
<bannedDependencies>
371368
<excludes>
369+
<!-- Ban all known dependencies with CVEs -->
372370
<exclude>commons-codec:commons-codec:[,1.15)</exclude>
373371
<exclude>org.apache.commons:commons-compress:[,1.20)</exclude>
374372
<!-- ban all log4j 2.x deps with CVEs -->

0 commit comments

Comments
 (0)