Skip to content
Draft
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
30 changes: 30 additions & 0 deletions google-auth-library-java/bom/java.header
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
^/\*$
^ \* Copyright \d\d\d\d, Google (Inc\. All rights reserved\.|LLC)$
^ \*$
^ \* Redistribution and use in source and binary forms, with or without$
^ \* modification, are permitted provided that the following conditions are$
^ \* met:$
^ \*$
^ \* \* Redistributions of source code must retain the above copyright$
^ \* notice, this list of conditions and the following disclaimer\.$
^ \* \* Redistributions in binary form must reproduce the above$
^ \* copyright notice, this list of conditions and the following disclaimer$
^ \* in the documentation and/or other materials provided with the$
^ \* distribution\.$
^ \*$
^ \* \* Neither the name of Google (Inc\.|LLC) nor the names of its$
^ \* contributors may be used to endorse or promote products derived from$
^ \* this software without specific prior written permission\.$
^ \*$
^ \* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS$
^ \* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT$
^ \* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR$
^ \* A PARTICULAR PURPOSE ARE DISCLAIMED\. IN NO EVENT SHALL THE COPYRIGHT$
^ \* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,$
^ \* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES \(INCLUDING, BUT NOT$
^ \* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,$
^ \* DATA, OR PROFITS; OR BUSINESS INTERRUPTION\) HOWEVER CAUSED AND ON ANY$
^ \* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT$
^ \* \(INCLUDING NEGLIGENCE OR OTHERWISE\) ARISING IN ANY WAY OUT OF THE USE$
^ \* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE\.$
^ \*/$
10 changes: 10 additions & 0 deletions google-auth-library-java/bom/license-checks.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<module name="Checker">
<module name="RegexpHeader">
<property name="fileExtensions" value="java"/>
<property name="headerFile" value="${checkstyle.header.file}"/>
</module>
</module>
6 changes: 3 additions & 3 deletions google-auth-library-java/bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

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

<name>Google Auth Library for Java BOM</name>
Expand Down
30 changes: 30 additions & 0 deletions google-auth-library-java/java.header
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
^/\*$
^ \* Copyright \d\d\d\d, Google (Inc\. All rights reserved\.|LLC)$
^ \*$
^ \* Redistribution and use in source and binary forms, with or without$
^ \* modification, are permitted provided that the following conditions are$
^ \* met:$
^ \*$
^ \* \* Redistributions of source code must retain the above copyright$
^ \* notice, this list of conditions and the following disclaimer\.$
^ \* \* Redistributions in binary form must reproduce the above$
^ \* copyright notice, this list of conditions and the following disclaimer$
^ \* in the documentation and/or other materials provided with the$
^ \* distribution\.$
^ \*$
^ \* \* Neither the name of Google (Inc\.|LLC) nor the names of its$
^ \* contributors may be used to endorse or promote products derived from$
^ \* this software without specific prior written permission\.$
^ \*$
^ \* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS$
^ \* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT$
^ \* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR$
^ \* A PARTICULAR PURPOSE ARE DISCLAIMED\. IN NO EVENT SHALL THE COPYRIGHT$
^ \* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,$
^ \* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES \(INCLUDING, BUT NOT$
^ \* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,$
^ \* DATA, OR PROFITS; OR BUSINESS INTERRUPTION\) HOWEVER CAUSED AND ON ANY$
^ \* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT$
^ \* \(INCLUDING NEGLIGENCE OR OTHERWISE\) ARISING IN ANY WAY OUT OF THE USE$
^ \* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE\.$
^ \*/$
10 changes: 10 additions & 0 deletions google-auth-library-java/license-checks.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<module name="Checker">
<module name="RegexpHeader">
<property name="fileExtensions" value="java"/>
<property name="headerFile" value="${checkstyle.header.file}"/>
</module>
</module>
8 changes: 4 additions & 4 deletions google-auth-library-java/oauth2_http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,10 @@
</build>

<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value-annotations</artifactId>
Expand All @@ -257,10 +261,6 @@
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-gson</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
Expand Down
94 changes: 82 additions & 12 deletions google-auth-library-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@
<url>https://github.com/googleapis/google-cloud-java</url>

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

<distributionManagement>
Expand Down Expand Up @@ -82,19 +80,73 @@
<project.appengine.version>2.0.33</project.appengine.version>
<project.findbugs.version>3.0.2</project.findbugs.version>
<deploy.autorelease>false</deploy.autorelease>
<project.error-prone.version>2.38.0</project.error-prone.version>
<project.error-prone.version>2.42.0</project.error-prone.version>
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.

Anything that requires this update?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Guava depends on this newer version and upper-bound check was failing.

<project.protobuf.version>4.33.2</project.protobuf.version>
<project.cel.version>0.9.0-proto3</project.cel.version>
<project.tink.version>1.15.0</project.tink.version>
<project.slf4j.version>2.0.17</project.slf4j.version>
<project.gson.version>2.12.1</project.gson.version>
<project.api-common.version>2.53.0</project.api-common.version>
<surefire.version>3.5.2</surefire.version>
<clirr.skip>true</clirr.skip>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>

<dependencyManagement>
<!-- Do not import BOMs in this monorepo. Maven Central publication
does not allow uploads of multiple artifacts with different group IDs. -->
<dependencies>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-bom</artifactId>
<version>${project.google.http.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-bom</artifactId>
<version>${project.guava.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
<version>${project.protobuf.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${project.junit.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-credentials</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<classifier>testlib</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.11.0</version>
<scope>test</scope>
</dependency>
Comment on lines +145 to +149
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.

high

The version for mockito-core is hardcoded here. It is recommended to use a property for consistency with other dependencies in this file. Additionally, the subsequent dependency mockito-junit-jupiter (starting at line 149) is missing a version; since the parent has changed from google-cloud-jar-parent to google-cloud-shared-config, it is likely no longer managed and will cause a build failure if a version is not explicitly provided.

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
Expand All @@ -107,11 +159,29 @@
<version>${project.appengine.version}</version>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${project.junit.version}</version>
<type>pom</type>
<scope>import</scope>
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
<version>${project.api-common.version}</version>
</dependency>
<dependency>
<groupId>dev.cel</groupId>
<artifactId>cel</artifactId>
<version>${project.cel.version}</version>
</dependency>
<dependency>
<groupId>com.google.crypto.tink</groupId>
<artifactId>tink</artifactId>
<version>${project.tink.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>${project.findbugs.version}</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>${project.error-prone.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
21 changes: 17 additions & 4 deletions sdk-platform-java/gapic-generator-java-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,23 @@
<!-- Major external dependencies -->
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-bom</artifactId>
<version>1.43.0</version><!-- {x-version-update:google-auth-library:current} -->
<type>pom</type>
<scope>import</scope>
<artifactId>google-auth-library-credentials</artifactId>
<version>1.44.0</version><!-- {x-version-update:google-auth-library:current} -->
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
<version>1.44.0</version><!-- {x-version-update:google-auth-library:current} -->
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-appengine</artifactId>
<version>1.44.0</version><!-- {x-version-update:google-auth-library:current} -->
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-cab-token-generator</artifactId>
<version>1.44.0</version><!-- {x-version-update:google-auth-library:current} -->
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
Expand Down
Loading