diff --git a/google-auth-library-java/bom/java.header b/google-auth-library-java/bom/java.header new file mode 100644 index 000000000000..142fa6b5c4b1 --- /dev/null +++ b/google-auth-library-java/bom/java.header @@ -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\.$ +^ \*/$ diff --git a/google-auth-library-java/bom/license-checks.xml b/google-auth-library-java/bom/license-checks.xml new file mode 100644 index 000000000000..cd14ab693b23 --- /dev/null +++ b/google-auth-library-java/bom/license-checks.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/google-auth-library-java/bom/pom.xml b/google-auth-library-java/bom/pom.xml index c8d2cded4af2..a225129f02ca 100644 --- a/google-auth-library-java/bom/pom.xml +++ b/google-auth-library-java/bom/pom.xml @@ -8,9 +8,9 @@ com.google.cloud - google-cloud-pom-parent - 1.83.0 - ../../google-cloud-pom-parent/pom.xml + google-cloud-shared-config + + 1.17.0 Google Auth Library for Java BOM diff --git a/google-auth-library-java/java.header b/google-auth-library-java/java.header new file mode 100644 index 000000000000..142fa6b5c4b1 --- /dev/null +++ b/google-auth-library-java/java.header @@ -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\.$ +^ \*/$ diff --git a/google-auth-library-java/license-checks.xml b/google-auth-library-java/license-checks.xml new file mode 100644 index 000000000000..cd14ab693b23 --- /dev/null +++ b/google-auth-library-java/license-checks.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/google-auth-library-java/oauth2_http/pom.xml b/google-auth-library-java/oauth2_http/pom.xml index 09a98eb545ce..e1ec6b96c115 100644 --- a/google-auth-library-java/oauth2_http/pom.xml +++ b/google-auth-library-java/oauth2_http/pom.xml @@ -237,6 +237,10 @@ + + com.google.guava + guava + com.google.auto.value auto-value-annotations @@ -257,10 +261,6 @@ com.google.http-client google-http-client-gson - - com.google.guava - guava - com.google.errorprone error_prone_annotations diff --git a/google-auth-library-java/pom.xml b/google-auth-library-java/pom.xml index 4a32ead813d1..5c1c8315cb0b 100644 --- a/google-auth-library-java/pom.xml +++ b/google-auth-library-java/pom.xml @@ -14,12 +14,10 @@ https://github.com/googleapis/google-cloud-java - com.google.cloud - google-cloud-jar-parent - 1.83.0 - ../google-cloud-jar-parent/pom.xml + google-cloud-shared-config + + 1.17.0 @@ -82,19 +80,73 @@ 2.0.33 3.0.2 false - 2.38.0 + 2.42.0 4.33.2 0.9.0-proto3 1.15.0 2.0.17 2.12.1 2.53.0 + 3.5.2 true - true + + + com.google.http-client + google-http-client-bom + ${project.google.http.version} + pom + import + + + com.google.guava + guava-bom + ${project.guava.version} + pom + import + + + com.google.protobuf + protobuf-bom + ${project.protobuf.version} + pom + import + + + org.junit + junit-bom + ${project.junit.version} + pom + import + + + com.google.auth + google-auth-library-credentials + ${project.version} + + + com.google.auth + google-auth-library-oauth2-http + ${project.version} + + + com.google.auth + google-auth-library-oauth2-http + ${project.version} + test-jar + testlib + test + + + org.mockito + mockito-core + 4.11.0 + test + org.mockito mockito-junit-jupiter @@ -107,11 +159,29 @@ ${project.appengine.version} - org.junit - junit-bom - ${project.junit.version} - pom - import + com.google.api + api-common + ${project.api-common.version} + + + dev.cel + cel + ${project.cel.version} + + + com.google.crypto.tink + tink + ${project.tink.version} + + + com.google.code.findbugs + jsr305 + ${project.findbugs.version} + + + com.google.errorprone + error_prone_annotations + ${project.error-prone.version} diff --git a/sdk-platform-java/gapic-generator-java-bom/pom.xml b/sdk-platform-java/gapic-generator-java-bom/pom.xml index 888766c70caa..01ff874eadc8 100644 --- a/sdk-platform-java/gapic-generator-java-bom/pom.xml +++ b/sdk-platform-java/gapic-generator-java-bom/pom.xml @@ -24,10 +24,23 @@ com.google.auth - google-auth-library-bom - 1.43.0 - pom - import + google-auth-library-credentials + 1.44.0 + + + com.google.auth + google-auth-library-oauth2-http + 1.44.0 + + + com.google.auth + google-auth-library-appengine + 1.44.0 + + + com.google.auth + google-auth-library-cab-token-generator + 1.44.0 com.google.auth