diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml index 8fc536a52..46827c8ae 100644 --- a/checkstyle-suppressions.xml +++ b/checkstyle-suppressions.xml @@ -11,5 +11,7 @@ - + + + diff --git a/checkstyle.xml b/checkstyle.xml index d5bf01f43..3ef76fc88 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -67,7 +67,7 @@ page at http://checkstyle.sourceforge.net/config.html --> - + diff --git a/google-oauth-client-appengine/pom.xml b/google-oauth-client-appengine/pom.xml index ec8c2a820..2158d19f0 100644 --- a/google-oauth-client-appengine/pom.xml +++ b/google-oauth-client-appengine/pom.xml @@ -31,7 +31,6 @@ https://download.oracle.com/javase/7/docs/api/ https://cloud.google.com/appengine/docs/standard/java/javadoc/ - https://googleapis.dev/java/google-http-client/${project.http.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} @@ -51,17 +50,6 @@ - - maven-source-plugin - - - source-jar - - jar - - - - org.codehaus.mojo @@ -94,6 +82,27 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce + + enforce + + + + + + javax/annotation/* + + + + + + + diff --git a/google-oauth-client-bom/pom.xml b/google-oauth-client-bom/pom.xml index c960fa87c..c01ad853e 100644 --- a/google-oauth-client-bom/pom.xml +++ b/google-oauth-client-bom/pom.xml @@ -35,14 +35,6 @@ - - sonatype-nexus-snapshots - https://google.oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - https://google.oss.sonatype.org/service/local/staging/deploy/maven2/ - github-pages-site Deployment through GitHub's site deployment plugin @@ -89,17 +81,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - true - - sonatype-nexus-staging - https://google.oss.sonatype.org/ - false - - maven-javadoc-plugin 3.4.1 @@ -132,40 +113,4 @@ - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.0.1 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - - - - - diff --git a/google-oauth-client-java6/pom.xml b/google-oauth-client-java6/pom.xml index 618a50583..9952c050b 100644 --- a/google-oauth-client-java6/pom.xml +++ b/google-oauth-client-java6/pom.xml @@ -16,7 +16,6 @@ http://download.oracle.com/javase/7/docs/api/ - https://googleapis.dev/java/google-http-client/${project.http.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} @@ -36,17 +35,6 @@ - - maven-source-plugin - - - source-jar - - jar - - - - org.codehaus.mojo diff --git a/google-oauth-client-jetty/pom.xml b/google-oauth-client-jetty/pom.xml index f7a1eda7c..da731c442 100644 --- a/google-oauth-client-jetty/pom.xml +++ b/google-oauth-client-jetty/pom.xml @@ -18,7 +18,6 @@ http://download.oracle.com/javase/7/docs/api/ - https://googleapis.dev/java/google-http-client/${project.http.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} @@ -38,17 +37,6 @@ - - maven-source-plugin - - - source-jar - - jar - - - - org.codehaus.mojo diff --git a/google-oauth-client-servlet/pom.xml b/google-oauth-client-servlet/pom.xml index e1a24eb59..abc260e58 100644 --- a/google-oauth-client-servlet/pom.xml +++ b/google-oauth-client-servlet/pom.xml @@ -17,7 +17,6 @@ https://download.oracle.com/javase/7/docs/api/ https://cloud.google.com/appengine/docs/standard/java/javadoc/ - https://googleapis.dev/java/google-http-client/${project.http.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} @@ -37,17 +36,6 @@ - - maven-source-plugin - - - source-jar - - jar - - - - org.datanucleus datanucleus-maven-plugin diff --git a/google-oauth-client/pom.xml b/google-oauth-client/pom.xml index 6d4d4a570..75860d7ac 100644 --- a/google-oauth-client/pom.xml +++ b/google-oauth-client/pom.xml @@ -7,6 +7,7 @@ 1.37.0 ../pom.xml + 1.37.0 google-oauth-client Google OAuth Client Library for Java @@ -21,7 +22,6 @@ http://download.oracle.com/javase/7/docs/api/ - https://googleapis.dev/java/google-http-client/${project.http.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} @@ -41,17 +41,6 @@ - - maven-source-plugin - - - source-jar - - jar - - - - org.apache.felix maven-bundle-plugin diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenVerifier.java b/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenVerifier.java index 8e769fd72..64b5d24ff 100644 --- a/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenVerifier.java +++ b/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenVerifier.java @@ -103,7 +103,7 @@ * *

Note that {@link #verify(IdToken)} only implements a subset of the verification steps, mostly * just the MUST steps. Please read ID Token * Validation for the full list of verification steps. * * @since 1.16 @@ -228,7 +228,7 @@ public final Collection getAudience() { * * * Deprecated. This method returns false if network requests to get certificates fail. Use {@link - * IdTokenVerifier.verfyOrThrow(IdToken)} instead to differentiate between potentially retryable + * IdTokenVerifier#verifyOrThrow(IdToken)} instead to differentiate between potentially retryable * network errors and false verification results. * * @param idToken ID token diff --git a/java.header b/java.header new file mode 100644 index 000000000..1f553d327 --- /dev/null +++ b/java.header @@ -0,0 +1,13 @@ +^/\*$ +^ \* Copyright( \(c\))? \d\d\d\d Google (Inc\.|LLC)$ +^ \*$ +^ \* Licensed under the Apache License, Version 2\.0 \(the "License"\); you may not use this file except +^ \* in compliance with the License\. You may obtain a copy of the License at +^ \*$ +^ \*[ ]+https?://www.apache.org/licenses/LICENSE-2\.0$ +^ \* +^ \* Unless required by applicable law or agreed to in writing, software distributed under the License +^ \* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express +^ \* or implied\. See the License for the specific language governing permissions and limitations under +^ \* the License\. +^ \*/$ \ No newline at end of file diff --git a/license-checks.xml b/license-checks.xml new file mode 100644 index 000000000..6597fced8 --- /dev/null +++ b/license-checks.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/pom.xml b/pom.xml index 82f9dc1e7..fbdbfcc37 100644 --- a/pom.xml +++ b/pom.xml @@ -11,6 +11,11 @@ Google OAuth Client Library for Java https://github.com/googleapis/google-oauth-java-client + + com.google.cloud + google-cloud-shared-config + 1.12.2 + GitHub @@ -44,16 +49,6 @@ repo - - - sonatype-nexus-snapshots - https://google.oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - https://google.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - true - - ossrh - https://google.oss.sonatype.org/ - ${deploy.autorelease} - - maven-assembly-plugin 3.4.2 maven-compiler-plugin - 2.5.1 1.7 1.7 - - org.apache.maven.plugins - maven-source-plugin - 3.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.6.3 - - - attach-javadocs - - jar - - - - org.apache.maven.plugins maven-jar-plugin @@ -257,7 +214,6 @@ maven-checkstyle-plugin - 3.0.0 org.codehaus.mojo @@ -290,21 +246,21 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.1.0 - - enforce-maven - - enforce - - - - - [3.5.4,4.0.0) - - - - - + + + enforce-maven + + enforce + + + + + [3.5.4,4.0.0) + + + + + maven-javadoc-plugin @@ -323,7 +279,6 @@ https://docs.oracle.com/javase/7/docs/api/ https://cloud.google.com/appengine/docs/java/javadoc - https://googleapis.dev/java/google-http-client/${project.http.version}/ Google OAuth Client Library for Java ${project.version} com.google.api.services @@ -432,10 +387,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - com.coveo fmt-maven-plugin @@ -484,40 +435,6 @@ - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.0.1 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - - - - - docFX diff --git a/samples/checkstyle.xml b/samples/checkstyle.xml index 66cd0c954..e38d13e72 100644 --- a/samples/checkstyle.xml +++ b/samples/checkstyle.xml @@ -84,14 +84,10 @@ page at http://checkstyle.sourceforge.net/config.html --> - + - - - - @@ -197,21 +193,6 @@ page at http://checkstyle.sourceforge.net/config.html --> --> - - - - - - - - - @@ -332,5 +313,22 @@ page at http://checkstyle.sourceforge.net/config.html --> + + + + + + + + + + + diff --git a/samples/dailymotion-cmdline-sample/pom.xml b/samples/dailymotion-cmdline-sample/pom.xml index e1bb58304..31515833d 100644 --- a/samples/dailymotion-cmdline-sample/pom.xml +++ b/samples/dailymotion-cmdline-sample/pom.xml @@ -35,7 +35,6 @@ maven-checkstyle-plugin - 3.0.0 ../checkstyle.xml true diff --git a/samples/keycloak-pkce-cmdline-sample/pom.xml b/samples/keycloak-pkce-cmdline-sample/pom.xml index 983ca6229..6f655bd83 100644 --- a/samples/keycloak-pkce-cmdline-sample/pom.xml +++ b/samples/keycloak-pkce-cmdline-sample/pom.xml @@ -35,7 +35,6 @@ maven-checkstyle-plugin - 3.0.0 ../checkstyle.xml true