Skip to content
Closed
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
4 changes: 3 additions & 1 deletion checkstyle-suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@
<suppress checks="LineLength" files="com.google.api.client.extensions.appengine.auth.AbstractAppEngineCallbackServlet.java"/>
<!-- Don't check JavaDoc on package-info. -->
<suppress checks="JavadocStyleCheck" files="package-info.java"/>

<!-- The openidconnect classes have different header (3-Clause BSD License) -->
<suppress checks="RegexpHeader" files="src/main/java/com/google/api/client/auth/openidconnect/HttpTransportFactory.java" />
<suppress checks="RegexpHeader" files="src/main/java/com/google/api/client/auth/openidconnect/Environment.java" />
</suppressions>
2 changes: 1 addition & 1 deletion checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
<!-- Checks for Javadoc comments. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
<module name="JavadocMethod">
<property name="scope" value="protected"/>
<property name="accessModifiers" value="protected"/>
<property name="severity" value="warning"/>
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
Expand Down
33 changes: 21 additions & 12 deletions google-oauth-client-appengine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
<links>
<link>https://download.oracle.com/javase/7/docs/api/</link>
<link>https://cloud.google.com/appengine/docs/standard/java/javadoc/</link>
<link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
</links>
<doctitle>${project.name} ${project.version}</doctitle>
<windowtitle>${project.artifactId} ${project.version}</windowtitle>
Expand All @@ -51,17 +50,6 @@
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>source-jar</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!--App Engine uses Java 7 or Java 8-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -94,6 +82,27 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<banDuplicateClasses>
<ignoreClasses>
<ignoreClass>javax/annotation/*</ignoreClass>
</ignoreClasses>
</banDuplicateClasses>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
Expand Down
55 changes: 0 additions & 55 deletions google-oauth-client-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,6 @@
</scm>

<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<url>https://google.oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<url>https://google.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<site>
<id>github-pages-site</id>
<name>Deployment through GitHub's site deployment plugin</name>
Expand Down Expand Up @@ -89,17 +81,6 @@
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<extensions>true</extensions>
<configuration>
<serverId>sonatype-nexus-staging</serverId>
<nexusUrl>https://google.oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.1</version>
Expand Down Expand Up @@ -132,40 +113,4 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>release-sign-artifacts</id>
<activation>
<property>
<name>performRelease</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
12 changes: 0 additions & 12 deletions google-oauth-client-java6/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<configuration>
<links>
<link>http://download.oracle.com/javase/7/docs/api/</link>
<link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
</links>
<doctitle>${project.name} ${project.version}</doctitle>
<windowtitle>${project.artifactId} ${project.version}</windowtitle>
Expand All @@ -36,17 +35,6 @@
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>source-jar</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!--Set minimum version to Java 7-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
12 changes: 0 additions & 12 deletions google-oauth-client-jetty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<configuration>
<links>
<link>http://download.oracle.com/javase/7/docs/api/</link>
<link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
</links>
<doctitle>${project.name} ${project.version}</doctitle>
<windowtitle>${project.artifactId} ${project.version}</windowtitle>
Expand All @@ -38,17 +37,6 @@
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>source-jar</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!--Minimum version is Java 7 -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
12 changes: 0 additions & 12 deletions google-oauth-client-servlet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<links>
<link>https://download.oracle.com/javase/7/docs/api/</link>
<link>https://cloud.google.com/appengine/docs/standard/java/javadoc/</link>
<link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
</links>
<doctitle>${project.name} ${project.version}</doctitle>
<windowtitle>${project.artifactId} ${project.version}</windowtitle>
Expand All @@ -37,17 +36,6 @@
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>source-jar</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId>
Expand Down
13 changes: 1 addition & 12 deletions google-oauth-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<version>1.37.0</version><!-- {x-version-update:google-oauth-client:current} -->
<relativePath>../pom.xml</relativePath>
</parent>
<version>1.37.0</version><!-- {x-version-update:google-oauth-client:current} -->
<artifactId>google-oauth-client</artifactId>
<name>Google OAuth Client Library for Java</name>
<description>
Expand All @@ -21,7 +22,6 @@
<configuration>
<links>
<link>http://download.oracle.com/javase/7/docs/api/</link>
<link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
</links>
<doctitle>${project.name} ${project.version}</doctitle>
<windowtitle>${project.artifactId} ${project.version}</windowtitle>
Expand All @@ -41,17 +41,6 @@
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>source-jar</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
*
* <p>Note that {@link #verify(IdToken)} only implements a subset of the verification steps, mostly
* just the MUST steps. Please read <a
* href="http://openid.net/specs/openid-connect-basic-1_0-27.html#id.token.validation>ID Token
* href="http://openid.net/specs/openid-connect-basic-1_0-27.html#id.token.validation">ID Token
* Validation</a> for the full list of verification steps.
*
* @since 1.16
Expand Down Expand Up @@ -228,7 +228,7 @@ public final Collection<String> getAudience() {
* </ul>
*
* 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
Expand Down
13 changes: 13 additions & 0 deletions java.header
Original file line number Diff line number Diff line change
@@ -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\.
^ \*/$
10 changes: 10 additions & 0 deletions 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>
Loading
Loading