Skip to content

Commit 9740b96

Browse files
suztomosuztomo
committed
chore: untangling auth library parent and imported BOM
1 parent 55c9857 commit 9740b96

File tree

8 files changed

+185
-23
lines changed

8 files changed

+185
-23
lines changed

‎google-auth-library-java/bom/java.header‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
^/\*$
2+
^ \* Copyright \d\d\d\d, Google (Inc\. All rights reserved\.|LLC)$
3+
^ \*$
4+
^ \* Redistribution and use in source and binary forms, with or without$
5+
^ \* modification, are permitted provided that the following conditions are$
6+
^ \* met:$
7+
^ \*$
8+
^ \* \* Redistributions of source code must retain the above copyright$
9+
^ \* notice, this list of conditions and the following disclaimer\.$
10+
^ \* \* Redistributions in binary form must reproduce the above$
11+
^ \* copyright notice, this list of conditions and the following disclaimer$
12+
^ \* in the documentation and/or other materials provided with the$
13+
^ \* distribution\.$
14+
^ \*$
15+
^ \* \* Neither the name of Google (Inc\.|LLC) nor the names of its$
16+
^ \* contributors may be used to endorse or promote products derived from$
17+
^ \* this software without specific prior written permission\.$
18+
^ \*$
19+
^ \* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS$
20+
^ \* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT$
21+
^ \* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR$
22+
^ \* A PARTICULAR PURPOSE ARE DISCLAIMED\. IN NO EVENT SHALL THE COPYRIGHT$
23+
^ \* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,$
24+
^ \* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES \(INCLUDING, BUT NOT$
25+
^ \* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,$
26+
^ \* DATA, OR PROFITS; OR BUSINESS INTERRUPTION\) HOWEVER CAUSED AND ON ANY$
27+
^ \* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT$
28+
^ \* \(INCLUDING NEGLIGENCE OR OTHERWISE\) ARISING IN ANY WAY OUT OF THE USE$
29+
^ \* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE\.$
30+
^ \*/$

‎google-auth-library-java/bom/license-checks.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE module PUBLIC
3+
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
4+
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
5+
<module name="Checker">
6+
<module name="RegexpHeader">
7+
<property name="fileExtensions" value="java"/>
8+
<property name="headerFile" value="${checkstyle.header.file}"/>
9+
</module>
10+
</module>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
<parent>
1010
<groupId>com.google.cloud</groupId>
11-
<artifactId>google-cloud-pom-parent</artifactId>
12-
<version>1.83.0</version><!-- {x-version-update:google-cloud-java:current} -->
13-
<relativePath>../../google-cloud-pom-parent/pom.xml</relativePath>
11+
<artifactId>google-cloud-shared-config</artifactId>
12+
<!-- Do not depend on the version in this monorepo. It causes the publication order problem. -->
13+
<version>1.17.0</version>
1414
</parent>
1515

1616
<name>Google Auth Library for Java BOM</name>

‎google-auth-library-java/java.header‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
^/\*$
2+
^ \* Copyright \d\d\d\d, Google (Inc\. All rights reserved\.|LLC)$
3+
^ \*$
4+
^ \* Redistribution and use in source and binary forms, with or without$
5+
^ \* modification, are permitted provided that the following conditions are$
6+
^ \* met:$
7+
^ \*$
8+
^ \* \* Redistributions of source code must retain the above copyright$
9+
^ \* notice, this list of conditions and the following disclaimer\.$
10+
^ \* \* Redistributions in binary form must reproduce the above$
11+
^ \* copyright notice, this list of conditions and the following disclaimer$
12+
^ \* in the documentation and/or other materials provided with the$
13+
^ \* distribution\.$
14+
^ \*$
15+
^ \* \* Neither the name of Google (Inc\.|LLC) nor the names of its$
16+
^ \* contributors may be used to endorse or promote products derived from$
17+
^ \* this software without specific prior written permission\.$
18+
^ \*$
19+
^ \* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS$
20+
^ \* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT$
21+
^ \* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR$
22+
^ \* A PARTICULAR PURPOSE ARE DISCLAIMED\. IN NO EVENT SHALL THE COPYRIGHT$
23+
^ \* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,$
24+
^ \* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES \(INCLUDING, BUT NOT$
25+
^ \* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,$
26+
^ \* DATA, OR PROFITS; OR BUSINESS INTERRUPTION\) HOWEVER CAUSED AND ON ANY$
27+
^ \* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT$
28+
^ \* \(INCLUDING NEGLIGENCE OR OTHERWISE\) ARISING IN ANY WAY OUT OF THE USE$
29+
^ \* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE\.$
30+
^ \*/$

‎google-auth-library-java/license-checks.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE module PUBLIC
3+
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
4+
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
5+
<module name="Checker">
6+
<module name="RegexpHeader">
7+
<property name="fileExtensions" value="java"/>
8+
<property name="headerFile" value="${checkstyle.header.file}"/>
9+
</module>
10+
</module>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,10 @@
237237
</build>
238238

239239
<dependencies>
240+
<dependency>
241+
<groupId>com.google.guava</groupId>
242+
<artifactId>guava</artifactId>
243+
</dependency>
240244
<dependency>
241245
<groupId>com.google.auto.value</groupId>
242246
<artifactId>auto-value-annotations</artifactId>
@@ -257,10 +261,6 @@
257261
<groupId>com.google.http-client</groupId>
258262
<artifactId>google-http-client-gson</artifactId>
259263
</dependency>
260-
<dependency>
261-
<groupId>com.google.guava</groupId>
262-
<artifactId>guava</artifactId>
263-
</dependency>
264264
<dependency>
265265
<groupId>com.google.errorprone</groupId>
266266
<artifactId>error_prone_annotations</artifactId>

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

Lines changed: 81 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@
1414
<url>https://github.com/googleapis/google-cloud-java</url>
1515

1616
<parent>
17-
<!-- Because we cannot release com.google.auth and com.google.cloud together,
18-
we skip the deployment of this module <maven.deploy.skip>true</maven.deploy.skip> -->
1917
<groupId>com.google.cloud</groupId>
20-
<artifactId>google-cloud-jar-parent</artifactId>
21-
<version>1.83.0</version><!-- {x-version-update:google-cloud-java:current} -->
22-
<relativePath>../google-cloud-jar-parent/pom.xml</relativePath>
18+
<artifactId>google-cloud-shared-config</artifactId>
19+
<!-- Do not depend on the version in this monorepo. It causes the publication order problem. -->
20+
<version>1.17.0</version>
2321
</parent>
2422

2523
<distributionManagement>
@@ -82,19 +80,72 @@
8280
<project.appengine.version>2.0.33</project.appengine.version>
8381
<project.findbugs.version>3.0.2</project.findbugs.version>
8482
<deploy.autorelease>false</deploy.autorelease>
85-
<project.error-prone.version>2.38.0</project.error-prone.version>
83+
<project.error-prone.version>2.42.0</project.error-prone.version>
8684
<project.protobuf.version>4.33.2</project.protobuf.version>
8785
<project.cel.version>0.9.0-proto3</project.cel.version>
8886
<project.tink.version>1.15.0</project.tink.version>
8987
<project.slf4j.version>2.0.17</project.slf4j.version>
9088
<project.gson.version>2.12.1</project.gson.version>
9189
<project.api-common.version>2.53.0</project.api-common.version>
90+
<surefire.version>3.5.2</surefire.version>
9291
<clirr.skip>true</clirr.skip>
93-
<maven.deploy.skip>true</maven.deploy.skip>
9492
</properties>
9593

9694
<dependencyManagement>
95+
<!-- Do not import -->
9796
<dependencies>
97+
<dependency>
98+
<groupId>com.google.http-client</groupId>
99+
<artifactId>google-http-client-bom</artifactId>
100+
<version>${project.google.http.version}</version>
101+
<type>pom</type>
102+
<scope>import</scope>
103+
</dependency>
104+
<dependency>
105+
<groupId>com.google.guava</groupId>
106+
<artifactId>guava-bom</artifactId>
107+
<version>${project.guava.version}</version>
108+
<type>pom</type>
109+
<scope>import</scope>
110+
</dependency>
111+
<dependency>
112+
<groupId>com.google.protobuf</groupId>
113+
<artifactId>protobuf-bom</artifactId>
114+
<version>${project.protobuf.version}</version>
115+
<type>pom</type>
116+
<scope>import</scope>
117+
</dependency>
118+
<dependency>
119+
<groupId>org.junit</groupId>
120+
<artifactId>junit-bom</artifactId>
121+
<version>${project.junit.version}</version>
122+
<type>pom</type>
123+
<scope>import</scope>
124+
</dependency>
125+
<dependency>
126+
<groupId>com.google.auth</groupId>
127+
<artifactId>google-auth-library-credentials</artifactId>
128+
<version>${project.version}</version>
129+
</dependency>
130+
<dependency>
131+
<groupId>com.google.auth</groupId>
132+
<artifactId>google-auth-library-oauth2-http</artifactId>
133+
<version>${project.version}</version>
134+
</dependency>
135+
<dependency>
136+
<groupId>com.google.auth</groupId>
137+
<artifactId>google-auth-library-oauth2-http</artifactId>
138+
<version>${project.version}</version>
139+
<type>test-jar</type>
140+
<classifier>testlib</classifier>
141+
<scope>test</scope>
142+
</dependency>
143+
<dependency>
144+
<groupId>org.mockito</groupId>
145+
<artifactId>mockito-core</artifactId>
146+
<version>4.11.0</version>
147+
<scope>test</scope>
148+
</dependency>
98149
<dependency>
99150
<groupId>org.mockito</groupId>
100151
<artifactId>mockito-junit-jupiter</artifactId>
@@ -107,11 +158,29 @@
107158
<version>${project.appengine.version}</version>
108159
</dependency>
109160
<dependency>
110-
<groupId>org.junit</groupId>
111-
<artifactId>junit-bom</artifactId>
112-
<version>${project.junit.version}</version>
113-
<type>pom</type>
114-
<scope>import</scope>
161+
<groupId>com.google.api</groupId>
162+
<artifactId>api-common</artifactId>
163+
<version>${project.api-common.version}</version>
164+
</dependency>
165+
<dependency>
166+
<groupId>dev.cel</groupId>
167+
<artifactId>cel</artifactId>
168+
<version>${project.cel.version}</version>
169+
</dependency>
170+
<dependency>
171+
<groupId>com.google.crypto.tink</groupId>
172+
<artifactId>tink</artifactId>
173+
<version>${project.tink.version}</version>
174+
</dependency>
175+
<dependency>
176+
<groupId>com.google.code.findbugs</groupId>
177+
<artifactId>jsr305</artifactId>
178+
<version>${project.findbugs.version}</version>
179+
</dependency>
180+
<dependency>
181+
<groupId>com.google.errorprone</groupId>
182+
<artifactId>error_prone_annotations</artifactId>
183+
<version>${project.error-prone.version}</version>
115184
</dependency>
116185
</dependencies>
117186
</dependencyManagement>

‎sdk-platform-java/gapic-generator-java-bom/pom.xml‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,23 @@
2424
<!-- Major external dependencies -->
2525
<dependency>
2626
<groupId>com.google.auth</groupId>
27-
<artifactId>google-auth-library-bom</artifactId>
28-
<version>1.43.0</version><!-- {x-version-update:google-auth-library:current} -->
29-
<type>pom</type>
30-
<scope>import</scope>
27+
<artifactId>google-auth-library-credentials</artifactId>
28+
<version>1.44.0</version><!-- {x-version-update:google-auth-library:current} -->
29+
</dependency>
30+
<dependency>
31+
<groupId>com.google.auth</groupId>
32+
<artifactId>google-auth-library-oauth2-http</artifactId>
33+
<version>1.44.0</version><!-- {x-version-update:google-auth-library:current} -->
34+
</dependency>
35+
<dependency>
36+
<groupId>com.google.auth</groupId>
37+
<artifactId>google-auth-library-appengine</artifactId>
38+
<version>1.44.0</version><!-- {x-version-update:google-auth-library:current} -->
39+
</dependency>
40+
<dependency>
41+
<groupId>com.google.auth</groupId>
42+
<artifactId>google-auth-library-cab-token-generator</artifactId>
43+
<version>1.44.0</version><!-- {x-version-update:google-auth-library:current} -->
3144
</dependency>
3245
<dependency>
3346
<groupId>com.google.auth</groupId>

0 commit comments

Comments
 (0)