Skip to content

Commit db13990

Browse files
chingor13chingor13
committed
chore(google-auth-library-java): modernize root pom.xml
1 parent d96f696 commit db13990

File tree

1 file changed

+6
-170
lines changed

1 file changed

+6
-170
lines changed

‎google-auth-library-java/pom.xml‎

Lines changed: 6 additions & 170 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111
<description>Client libraries providing authentication and
1212
authorization to enable calling Google APIs.
1313
</description>
14-
<url>https://github.com/googleapis/google-auth-library-java</url>
14+
<url>https://github.com/googleapis/google-cloud-java</url>
1515

1616
<parent>
1717
<groupId>com.google.cloud</groupId>
18-
<artifactId>google-cloud-shared-config</artifactId>
19-
<version>1.17.0</version>
18+
<artifactId>google-cloud-jar-parent</artifactId>
19+
<version>1.81.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-java:current} -->
20+
<relativePath>../google-cloud-jar-parent/pom.xml</relativePath>
2021
</parent>
2122

2223
<distributionManagement>
@@ -45,7 +46,6 @@
4546
<url>http://www.google.com/</url>
4647
</organization>
4748

48-
4949
<developers>
5050
<developer>
5151
<name>Jeff Ching</name>
@@ -69,7 +69,7 @@
6969
<developerConnection>
7070
scm:git:https://github.com/googleapis/google-auth-library-java.git
7171
</developerConnection>
72-
<url>https://github.com/googleapis/google-auth-library-java</url>
72+
<url>https://github.com/googleapis/google-cloud-java</url>
7373
</scm>
7474

7575
<properties>
@@ -92,143 +92,24 @@
9292

9393
<dependencyManagement>
9494
<dependencies>
95-
<dependency>
96-
<groupId>com.google.auth</groupId>
97-
<artifactId>google-auth-library-credentials</artifactId>
98-
<version>${project.version}</version>
99-
</dependency>
100-
<dependency>
101-
<groupId>com.google.auth</groupId>
102-
<artifactId>google-auth-library-oauth2-http</artifactId>
103-
<version>${project.version}</version>
104-
</dependency>
105-
<dependency>
106-
<groupId>com.google.auth</groupId>
107-
<artifactId>google-auth-library-cloudshell</artifactId>
108-
<version>${project.version}</version>
109-
</dependency>
110-
<dependency>
111-
<groupId>org.mockito</groupId>
112-
<artifactId>mockito-core</artifactId>
113-
<version>4.11.0</version>
114-
<scope>test</scope>
115-
</dependency>
11695
<dependency>
11796
<groupId>org.mockito</groupId>
11897
<artifactId>mockito-junit-jupiter</artifactId>
11998
<version>4.11.0</version>
12099
<scope>test</scope>
121100
</dependency>
122-
<dependency>
123-
<groupId>com.google.http-client</groupId>
124-
<artifactId>google-http-client-bom</artifactId>
125-
<version>${project.google.http.version}</version>
126-
<type>pom</type>
127-
<scope>import</scope>
128-
</dependency>
129101
<dependency>
130102
<groupId>com.google.appengine</groupId>
131103
<artifactId>appengine-api-1.0-sdk</artifactId>
132104
<version>${project.appengine.version}</version>
133105
</dependency>
134-
<dependency>
135-
<groupId>com.google.guava</groupId>
136-
<artifactId>guava</artifactId>
137-
<version>${project.guava.version}</version>
138-
<exclusions>
139-
<exclusion>
140-
<groupId>com.google.j2objc</groupId>
141-
<artifactId>j2objc-annotations</artifactId>
142-
</exclusion>
143-
<exclusion>
144-
<groupId>com.google.errorprone</groupId>
145-
<artifactId>error_prone_annotations</artifactId>
146-
</exclusion>
147-
</exclusions>
148-
</dependency>
149-
<dependency>
150-
<groupId>com.google.code.findbugs</groupId>
151-
<artifactId>jsr305</artifactId>
152-
<version>${project.findbugs.version}</version>
153-
</dependency>
154106
<dependency>
155107
<groupId>org.junit</groupId>
156108
<artifactId>junit-bom</artifactId>
157109
<version>${project.junit.version}</version>
158110
<type>pom</type>
159111
<scope>import</scope>
160112
</dependency>
161-
<dependency>
162-
<groupId>com.google.appengine</groupId>
163-
<artifactId>appengine</artifactId>
164-
<version>${project.appengine.version}</version>
165-
<scope>test</scope>
166-
</dependency>
167-
<dependency>
168-
<groupId>com.google.auth</groupId>
169-
<artifactId>google-auth-library-oauth2-http</artifactId>
170-
<version>${project.version}</version>
171-
<type>test-jar</type>
172-
<classifier>testlib</classifier>
173-
</dependency>
174-
<dependency>
175-
<groupId>com.google.errorprone</groupId>
176-
<artifactId>error_prone_annotations</artifactId>
177-
<version>${project.error-prone.version}</version>
178-
<scope>compile</scope>
179-
</dependency>
180-
<dependency>
181-
<groupId>com.google.protobuf</groupId>
182-
<artifactId>protobuf-java</artifactId>
183-
<version>${project.protobuf.version}</version>
184-
</dependency>
185-
<dependency>
186-
<groupId>dev.cel</groupId>
187-
<artifactId>cel</artifactId>
188-
<version>${project.cel.version}</version>
189-
<exclusions>
190-
<!-- CEL's version for guava, findbugs and errorprone is causing build errors -->
191-
<!-- so we are excluding them here. -->
192-
<exclusion>
193-
<groupId>com.google.guava</groupId>
194-
<artifactId>guava</artifactId>
195-
</exclusion>
196-
<exclusion>
197-
<groupId>com.google.code.findbugs</groupId>
198-
<artifactId>annotations</artifactId>
199-
</exclusion>
200-
<exclusion>
201-
<groupId>com.google.errorprone</groupId>
202-
<artifactId>error_prone_annotations</artifactId>
203-
</exclusion>
204-
</exclusions>
205-
</dependency>
206-
<dependency>
207-
<groupId>com.google.crypto.tink</groupId>
208-
<artifactId>tink</artifactId>
209-
<version>${project.tink.version}</version>
210-
<exclusions>
211-
<exclusion>
212-
<groupId>com.google.code.gson</groupId>
213-
<artifactId>gson</artifactId>
214-
</exclusion>
215-
</exclusions>
216-
</dependency>
217-
<dependency>
218-
<groupId>com.google.api</groupId>
219-
<artifactId>api-common</artifactId>
220-
<version>${project.api-common.version}</version>
221-
<exclusions>
222-
<exclusion>
223-
<!-- We exclude guava due to incompabilities between x.x.x-android (auth) and
224-
x.x.x-jre (api-common).
225-
TODO: Remove this once https://github.com/googleapis/google-auth-library-java/issues/1799
226-
has been solved. -->
227-
<groupId>com.google.guava</groupId>
228-
<artifactId>guava</artifactId>
229-
</exclusion>
230-
</exclusions>
231-
</dependency>
232113
</dependencies>
233114
</dependencyManagement>
234115

@@ -416,58 +297,13 @@
416297
<ignoredUnusedDeclaredDependency>junit:junit</ignoredUnusedDeclaredDependency>
417298
<!-- maven-dependency-plugin cannot detect the runtime usage of junit-jupiter-engine for executing JUnit 5+ tests. -->
418299
<ignoredUnusedDeclaredDependency>org.junit.jupiter:junit-jupiter-engine</ignoredUnusedDeclaredDependency>
300+
<ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>
419301
</ignoredUnusedDeclaredDependencies>
420302
</configuration>
421303
</plugin>
422304
</plugins>
423305
</build>
424306

425-
<reporting>
426-
<plugins>
427-
<plugin>
428-
<groupId>org.apache.maven.plugins</groupId>
429-
<artifactId>maven-javadoc-plugin</artifactId>
430-
<version>3.11.2</version>
431-
<reportSets>
432-
<reportSet>
433-
<id>html</id>
434-
<reports>
435-
<report>aggregate</report>
436-
<report>javadoc</report>
437-
</reports>
438-
</reportSet>
439-
</reportSets>
440-
<configuration>
441-
<failOnError>false</failOnError>
442-
<doclint>none</doclint>
443-
<source>8</source>
444-
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
445-
<doctitle>Google Auth Library for Java ${project.version}</doctitle>
446-
<overview>${basedir}/overview.html</overview>
447-
<groups>
448-
<group>
449-
<title>google-auth-library-credentials</title>
450-
<packages>com.google.auth*</packages>
451-
</group>
452-
<group>
453-
<title>google-auth-library-oauth2-http</title>
454-
<packages>com.google.auth.http*:com.google.auth.oauth2*</packages>
455-
</group>
456-
<group>
457-
<title>google-auth-library-appengine</title>
458-
<packages>com.google.auth.appengine*</packages>
459-
</group>
460-
</groups>
461-
<links>
462-
<link>http://download.oracle.com/javase/7/docs/api/</link>
463-
<link>http://cloud.google.com/appengine/docs/java/javadoc</link>
464-
</links>
465-
<windowtitle>google-auth-library ${project.version}</windowtitle>
466-
</configuration>
467-
</plugin>
468-
</plugins>
469-
</reporting>
470-
471307
<profiles>
472308
<profile>
473309
<id>slf4j2x-test</id>

0 commit comments

Comments
 (0)