Skip to content

Commit 1981dad

Browse files
suztomosuztomo
committed
chore(java-spanner-jdbc): modernize root pom.xml
1 parent 34f980b commit 1981dad

File tree

1 file changed

+11
-91
lines changed

1 file changed

+11
-91
lines changed

‎java-spanner-jdbc/pom.xml‎

Lines changed: 11 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77
<version>2.35.5-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-jdbc:current} -->
88
<packaging>jar</packaging>
99
<name>Google Cloud Spanner JDBC</name>
10-
<url>https://github.com/googleapis/java-spanner-jdbc</url>
10+
<url>https://github.com/googleapis/google-cloud-java</url>
1111
<description>
1212
JDBC driver for Google Cloud Spanner.
1313
</description>
1414
<parent>
1515
<groupId>com.google.cloud</groupId>
16-
<artifactId>sdk-platform-java-config</artifactId>
17-
<version>3.57.0</version>
16+
<artifactId>google-cloud-jar-parent</artifactId>
17+
<version>1.83.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-java:current} -->
18+
<relativePath>../google-cloud-jar-parent/pom.xml</relativePath>
1819
</parent>
1920
<developers>
2021
<developer>
@@ -31,13 +32,13 @@
3132
<name>Google LLC</name>
3233
</organization>
3334
<scm>
34-
<connection>scm:git:git@github.com:googleapis/java-spanner-jdbc.git</connection>
35-
<developerConnection>scm:git:git@github.com:googleapis/java-spanner-jdbc.git</developerConnection>
36-
<url>https://github.com/googleapis/java-spanner-jdbc</url>
35+
<connection>scm:git:git@github.com:googleapis/google-cloud-java.git</connection>
36+
<developerConnection>scm:git:git@github.com:googleapis/google-cloud-java.git</developerConnection>
37+
<url>https://github.com/googleapis/google-cloud-java</url>
3738
<tag>HEAD</tag>
3839
</scm>
3940
<issueManagement>
40-
<url>https://github.com/googleapis/java-spanner-jdbc/issues</url>
41+
<url>https://github.com/googleapis/google-cloud-java/issues</url>
4142
<system>GitHub Issues</system>
4243
</issueManagement>
4344

@@ -65,17 +66,6 @@
6566
<type>pom</type>
6667
<scope>import</scope>
6768
</dependency>
68-
<dependency>
69-
<groupId>com.google.cloud</groupId>
70-
<artifactId>grpc-gcp</artifactId>
71-
</dependency>
72-
<dependency>
73-
<groupId>com.google.cloud</groupId>
74-
<artifactId>google-cloud-shared-dependencies</artifactId>
75-
<version>${google-cloud-shared-dependencies.version}</version>
76-
<type>pom</type>
77-
<scope>import</scope>
78-
</dependency>
7969
<dependency>
8070
<groupId>io.opencensus</groupId>
8171
<artifactId>opencensus-api</artifactId>
@@ -114,7 +104,6 @@
114104
<groupId>com.google.cloud</groupId>
115105
<artifactId>google-cloud-spanner</artifactId>
116106
</dependency>
117-
<!-- TODO: Remove grpc-alts from here once it has been removed as a runtime dependency from java-spanner -->
118107
<dependency>
119108
<groupId>io.grpc</groupId>
120109
<artifactId>grpc-alts</artifactId>
@@ -160,7 +149,6 @@
160149
<artifactId>opentelemetry-api</artifactId>
161150
</dependency>
162151

163-
<!-- Test dependencies -->
164152
<dependency>
165153
<groupId>com.google.cloud</groupId>
166154
<artifactId>google-cloud-spanner</artifactId>
@@ -204,7 +192,6 @@
204192
<scope>test</scope>
205193
</dependency>
206194

207-
<!-- Add OpenTelemetry implementation and exporters for use in integration tests. -->
208195
<dependency>
209196
<groupId>com.google.cloud.opentelemetry</groupId>
210197
<artifactId>exporter-trace</artifactId>
@@ -220,13 +207,13 @@
220207
<dependency>
221208
<groupId>com.google.cloud</groupId>
222209
<artifactId>google-cloud-trace</artifactId>
223-
<version>2.86.0</version>
210+
<version>2.87.0</version><!-- {x-version-update:google-cloud-trace:current} -->
224211
<scope>test</scope>
225212
</dependency>
226213
<dependency>
227214
<groupId>com.google.api.grpc</groupId>
228215
<artifactId>proto-google-cloud-trace-v1</artifactId>
229-
<version>2.86.0</version>
216+
<version>2.87.0</version><!-- {x-version-update:proto-google-cloud-trace-v1:current} -->
230217
<scope>test</scope>
231218
</dependency>
232219

@@ -387,6 +374,7 @@
387374
<ignoredDependency>com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1</ignoredDependency>
388375
<ignoredDependency>com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1</ignoredDependency>
389376
<ignoredDependency>io.opentelemetry:*</ignoredDependency>
377+
<ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>
390378
</ignoredUnusedDeclaredDependencies>
391379
<ignoredNonTestScopedDependencies>
392380
<ignoredDependency>io.opentelemetry:*</ignoredDependency>
@@ -469,72 +457,4 @@
469457
</profile>
470458
</profiles>
471459

472-
<reporting>
473-
<plugins>
474-
<plugin>
475-
<groupId>org.apache.maven.plugins</groupId>
476-
<artifactId>maven-project-info-reports-plugin</artifactId>
477-
<version>3.9.0</version>
478-
<reportSets>
479-
<reportSet>
480-
<reports>
481-
<report>index</report>
482-
<report>dependency-info</report>
483-
<report>team</report>
484-
<report>ci-management</report>
485-
<report>issue-management</report>
486-
<report>licenses</report>
487-
<report>scm</report>
488-
<report>dependency-management</report>
489-
<report>distribution-management</report>
490-
<report>summary</report>
491-
<report>modules</report>
492-
</reports>
493-
</reportSet>
494-
</reportSets>
495-
<configuration>
496-
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
497-
<artifactId>${site.installationModule}</artifactId>
498-
<packaging>jar</packaging>
499-
</configuration>
500-
</plugin>
501-
<plugin>
502-
<groupId>org.apache.maven.plugins</groupId>
503-
<artifactId>maven-javadoc-plugin</artifactId>
504-
<reportSets>
505-
<reportSet>
506-
<id>html</id>
507-
<reports>
508-
<report>aggregate</report>
509-
<report>javadoc</report>
510-
</reports>
511-
</reportSet>
512-
</reportSets>
513-
<configuration>
514-
<doclint>none</doclint>
515-
<show>protected</show>
516-
<nohelp>true</nohelp>
517-
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
518-
<groups>
519-
<group>
520-
<title>Test helpers packages</title>
521-
<packages>com.google.cloud.testing</packages>
522-
</group>
523-
<group>
524-
<title>SPI packages</title>
525-
<packages>com.google.cloud.spi*</packages>
526-
</group>
527-
</groups>
528-
529-
<links>
530-
<link>https://grpc.io/grpc-java/javadoc/</link>
531-
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
532-
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
533-
<link>https://googleapis.dev/java/gax/latest/</link>
534-
<link>https://googleapis.github.io/api-common-java/</link>
535-
</links>
536-
</configuration>
537-
</plugin>
538-
</plugins>
539-
</reporting>
540460
</project>

0 commit comments

Comments
 (0)