Skip to content

Commit bb494ee

Browse files
authored
feat: remove deprecated OOB flow (#2242)
Also remove `google-api-client-java6` module which is empty after removal of `GooglePromptReceiver.java`.
1 parent 47cb4b8 commit bb494ee

File tree

9 files changed

+0
-196
lines changed

9 files changed

+0
-196
lines changed

docs/component-modules.md

-6
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ Jackson2 extensions to the Google API Client Library for Java
4343
(`google-api-client-jackson2`). This module depends on `google-api-client` and
4444
`google-http-client-jackson2`.
4545

46-
## google-api-client-java6
47-
48-
Java 6 (and higher) extensions to the Google API Client Library for Java
49-
(`google-api-client-java6`). This module depends on `google-api-client` and
50-
`google-oauth-client-java6`.
51-
5246
## google-api-client-protobuf
5347

5448
[Protocol buffer][protobuf] extensions to the Google API Client Library for Java

google-api-client-assembly/classpath-include

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<classpathentry kind="lib" path="libs/google-api-client-appengine-${project.version}.jar" sourcepath="libs-sources/google-api-client-appengine-${project.version}-sources.jar"/>
44
<classpathentry kind="lib" path="libs/google-api-client-gson-${project.version}.jar" sourcepath="libs-sources/google-api-client-gson-${project.version}-sources.jar"/>
55
<classpathentry kind="lib" path="libs/google-api-client-jackson2-${project.version}.jar" sourcepath="libs-sources/google-api-client-jackson2-${project.version}-sources.jar"/>
6-
<classpathentry kind="lib" path="libs/google-api-client-java6-${project.version}.jar" sourcepath="libs-sources/google-api-client-java6-${project.version}-sources.jar"/>
76
<classpathentry kind="lib" path="libs/google-api-client-protobuf-${project.version}.jar" sourcepath="libs-sources/google-api-client-protobuf-${project.version}-sources.jar"/>
87
<classpathentry kind="lib" path="libs/google-api-client-servlet-${project.version}.jar" sourcepath="libs-sources/google-api-client-servlet-${project.version}-sources.jar"/>
98
<classpathentry kind="lib" path="libs/google-api-client-xml-${project.version}.jar" sourcepath="libs-sources/google-api-client-xml-${project.version}-sources.jar"/>

google-api-client-assembly/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@
3737
<groupId>com.google.api-client</groupId>
3838
<artifactId>google-api-client-jackson2</artifactId>
3939
</dependency>
40-
<dependency>
41-
<groupId>com.google.api-client</groupId>
42-
<artifactId>google-api-client-java6</artifactId>
43-
</dependency>
4440
<dependency>
4541
<groupId>com.google.api-client</groupId>
4642
<artifactId>google-api-client-protobuf</artifactId>

google-api-client-bom/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,6 @@
9191
<artifactId>google-api-client-jackson2</artifactId>
9292
<version>2.1.5-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
9393
</dependency>
94-
<dependency>
95-
<groupId>com.google.api-client</groupId>
96-
<artifactId>google-api-client-java6</artifactId>
97-
<version>2.1.5-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
98-
</dependency>
9994
<dependency>
10095
<groupId>com.google.api-client</groupId>
10196
<artifactId>google-api-client-protobuf</artifactId>

google-api-client-java6/pom.xml

-96
This file was deleted.

google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java

-41
This file was deleted.

google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/package-info.java

-21
This file was deleted.

google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleOAuthConstants.java

-12
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,5 @@ public class GoogleOAuthConstants {
4040
public static final String DEFAULT_PUBLIC_CERTS_ENCODED_URL =
4141
"https://www.googleapis.com/oauth2/v1/certs";
4242

43-
/**
44-
* Redirect URI to use for an installed application as specified in <a
45-
* href="https://developers.google.com/identity/protocols/OAuth2InstalledApp">Using OAuth 2.0 for
46-
* Mobile & Desktop Apps</a>.
47-
*
48-
* <p>OAuth out-of-band (oob) flow has been deprecated. To migrate to an alternative flow, please
49-
* refer to <a
50-
* href="https://developers.googleblog.com/2022/02/making-oauth-flows-safer.html">Making Google
51-
* OAuth interactions safer by using more secure OAuth flows</a>.
52-
*/
53-
@Deprecated public static final String OOB_REDIRECT_URI = "urn:ietf:wg:oauth:2.0:oob";
54-
5543
private GoogleOAuthConstants() {}
5644
}

pom.xml

-10
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
<module>google-api-client-bom</module>
7979
<module>google-api-client-gson</module>
8080
<module>google-api-client-jackson2</module>
81-
<module>google-api-client-java6</module>
8281
<module>google-api-client-protobuf</module>
8382
<module>google-api-client-xml</module>
8483
</modules>
@@ -178,11 +177,6 @@
178177
<artifactId>google-api-client-android</artifactId>
179178
<version>${project.version}</version>
180179
</dependency>
181-
<dependency>
182-
<groupId>com.google.api-client</groupId>
183-
<artifactId>google-api-client-java6</artifactId>
184-
<version>${project.version}</version>
185-
</dependency>
186180
<dependency>
187181
<groupId>com.google.api-client</groupId>
188182
<artifactId>google-api-client-gson</artifactId>
@@ -410,10 +404,6 @@
410404
<title>google-api-client-jackson2</title>
411405
<packages>com.google.api.client.googleapis.notifications.json.jackson2.*</packages>
412406
</group>
413-
<group>
414-
<title>google-api-client-java6</title>
415-
<packages>com.google.api.client.googleapis.extensions.java6.*</packages>
416-
</group>
417407
<group>
418408
<title>google-api-client-protobuf</title>
419409
<packages>com.google.api.client.googleapis.services.protobuf*:com.google.api.client.googleapis.testing.services.protobuf*</packages>

0 commit comments

Comments
 (0)