From ec79525da8bc50d4cb641a87c186a5870a61afd4 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Tue, 1 Dec 2020 14:54:14 -0800
Subject: [PATCH] deps: fix declared dependencies (#570)

* deps: fix declared dependencies

* deps: restore appengine-api-stubs for test

* ci: skip windows tests - datanucleus does not build

* chore(deps): ignore appengine-api-stubs artifact which is needed for tests
---
 .github/workflows/ci.yaml                    | 11 -----------
 google-oauth-client-appengine/pom.xml        | 18 ++++++++++++++++++
 google-oauth-client-java6/pom.xml            |  4 ++++
 google-oauth-client-jetty/pom.xml            |  4 ++++
 google-oauth-client-servlet/pom.xml          |  4 ++++
 google-oauth-client/pom.xml                  |  4 ----
 samples/dailymotion-cmdline-sample/pom.xml   |  4 ++++
 samples/keycloak-pkce-cmdline-sample/pom.xml |  8 ++++++++
 8 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 683022075..611f17cda 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -23,17 +23,6 @@ jobs:
       uses: codecov/codecov-action@v1
       with:
         name: actions ${{matrix.java}}
-  windows:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v1
-      with:
-        java-version: 8
-    - run: java -version
-    - run: .kokoro/build.bat
-      env:
-        JOB_TYPE: test
   dependencies:
     runs-on: ubuntu-latest
     strategy:
diff --git a/google-oauth-client-appengine/pom.xml b/google-oauth-client-appengine/pom.xml
index d8b6f7d3f..512d01374 100644
--- a/google-oauth-client-appengine/pom.xml
+++ b/google-oauth-client-appengine/pom.xml
@@ -10,6 +10,20 @@
   <artifactId>google-oauth-client-appengine</artifactId>
   <name>Google App Engine extensions to the Google OAuth Client Library for Java.</name>
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>3.1.2</version>
+          <configuration>
+            <ignoredUnusedDeclaredDependencies>
+              <ignoredUnusedDeclaredDependency>com.google.appengine:appengine-api-stubs</ignoredUnusedDeclaredDependency>
+            </ignoredUnusedDeclaredDependencies>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
@@ -83,6 +97,10 @@
     </plugins>
   </build>
   <dependencies>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-appengine</artifactId>
diff --git a/google-oauth-client-java6/pom.xml b/google-oauth-client-java6/pom.xml
index a7a0c459a..4c82d3661 100644
--- a/google-oauth-client-java6/pom.xml
+++ b/google-oauth-client-java6/pom.xml
@@ -86,6 +86,10 @@
       <groupId>com.google.oauth-client</groupId>
       <artifactId>google-oauth-client</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-jackson2</artifactId>
diff --git a/google-oauth-client-jetty/pom.xml b/google-oauth-client-jetty/pom.xml
index 01a702192..6484c3fc6 100644
--- a/google-oauth-client-jetty/pom.xml
+++ b/google-oauth-client-jetty/pom.xml
@@ -88,6 +88,10 @@
       <groupId>com.google.oauth-client</groupId>
       <artifactId>google-oauth-client-java6</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client</artifactId>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/google-oauth-client-servlet/pom.xml b/google-oauth-client-servlet/pom.xml
index b3a2617ff..8aa21b574 100644
--- a/google-oauth-client-servlet/pom.xml
+++ b/google-oauth-client-servlet/pom.xml
@@ -112,6 +112,10 @@
       <groupId>com.google.oauth-client</groupId>
       <artifactId>google-oauth-client</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client</artifactId>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
diff --git a/google-oauth-client/pom.xml b/google-oauth-client/pom.xml
index 7ea98a048..c8490ce11 100644
--- a/google-oauth-client/pom.xml
+++ b/google-oauth-client/pom.xml
@@ -79,10 +79,6 @@
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-jackson2</artifactId>
diff --git a/samples/dailymotion-cmdline-sample/pom.xml b/samples/dailymotion-cmdline-sample/pom.xml
index a950c449c..86767dadd 100644
--- a/samples/dailymotion-cmdline-sample/pom.xml
+++ b/samples/dailymotion-cmdline-sample/pom.xml
@@ -97,6 +97,10 @@
       <groupId>com.google.oauth-client</groupId>
       <artifactId>google-oauth-client-jetty</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-jackson2</artifactId>
diff --git a/samples/keycloak-pkce-cmdline-sample/pom.xml b/samples/keycloak-pkce-cmdline-sample/pom.xml
index c43bbe644..4e0077c0c 100644
--- a/samples/keycloak-pkce-cmdline-sample/pom.xml
+++ b/samples/keycloak-pkce-cmdline-sample/pom.xml
@@ -89,10 +89,18 @@
       <groupId>com.google.oauth-client</groupId>
       <artifactId>google-oauth-client</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.oauth-client</groupId>
+      <artifactId>google-oauth-client-java6</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.oauth-client</groupId>
       <artifactId>google-oauth-client-jetty</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-jackson2</artifactId>