Skip to content

Commit ec79525

Browse files
authored
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
1 parent b533a00 commit ec79525

File tree

8 files changed

+42
-15
lines changed

8 files changed

+42
-15
lines changed

.github/workflows/ci.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,6 @@ jobs:
2323
uses: codecov/codecov-action@v1
2424
with:
2525
name: actions ${{matrix.java}}
26-
windows:
27-
runs-on: windows-latest
28-
steps:
29-
- uses: actions/checkout@v2
30-
- uses: actions/setup-java@v1
31-
with:
32-
java-version: 8
33-
- run: java -version
34-
- run: .kokoro/build.bat
35-
env:
36-
JOB_TYPE: test
3726
dependencies:
3827
runs-on: ubuntu-latest
3928
strategy:

google-oauth-client-appengine/pom.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,20 @@
1010
<artifactId>google-oauth-client-appengine</artifactId>
1111
<name>Google App Engine extensions to the Google OAuth Client Library for Java.</name>
1212
<build>
13+
<pluginManagement>
14+
<plugins>
15+
<plugin>
16+
<groupId>org.apache.maven.plugins</groupId>
17+
<artifactId>maven-dependency-plugin</artifactId>
18+
<version>3.1.2</version>
19+
<configuration>
20+
<ignoredUnusedDeclaredDependencies>
21+
<ignoredUnusedDeclaredDependency>com.google.appengine:appengine-api-stubs</ignoredUnusedDeclaredDependency>
22+
</ignoredUnusedDeclaredDependencies>
23+
</configuration>
24+
</plugin>
25+
</plugins>
26+
</pluginManagement>
1327
<plugins>
1428
<plugin>
1529
<artifactId>maven-javadoc-plugin</artifactId>
@@ -83,6 +97,10 @@
8397
</plugins>
8498
</build>
8599
<dependencies>
100+
<dependency>
101+
<groupId>com.google.http-client</groupId>
102+
<artifactId>google-http-client</artifactId>
103+
</dependency>
86104
<dependency>
87105
<groupId>com.google.http-client</groupId>
88106
<artifactId>google-http-client-appengine</artifactId>

google-oauth-client-java6/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@
8686
<groupId>com.google.oauth-client</groupId>
8787
<artifactId>google-oauth-client</artifactId>
8888
</dependency>
89+
<dependency>
90+
<groupId>com.google.http-client</groupId>
91+
<artifactId>google-http-client</artifactId>
92+
</dependency>
8993
<dependency>
9094
<groupId>com.google.http-client</groupId>
9195
<artifactId>google-http-client-jackson2</artifactId>

google-oauth-client-jetty/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@
8888
<groupId>com.google.oauth-client</groupId>
8989
<artifactId>google-oauth-client-java6</artifactId>
9090
</dependency>
91+
<dependency>
92+
<groupId>com.google.http-client</groupId>
93+
<artifactId>google-http-client</artifactId>
94+
</dependency>
9195
<dependency>
9296
<groupId>junit</groupId>
9397
<artifactId>junit</artifactId>

google-oauth-client-servlet/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,10 @@
112112
<groupId>com.google.oauth-client</groupId>
113113
<artifactId>google-oauth-client</artifactId>
114114
</dependency>
115+
<dependency>
116+
<groupId>com.google.http-client</groupId>
117+
<artifactId>google-http-client</artifactId>
118+
</dependency>
115119
<dependency>
116120
<groupId>javax.servlet</groupId>
117121
<artifactId>servlet-api</artifactId>

google-oauth-client/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,6 @@
7979
<groupId>com.google.http-client</groupId>
8080
<artifactId>google-http-client</artifactId>
8181
</dependency>
82-
<dependency>
83-
<groupId>com.google.code.findbugs</groupId>
84-
<artifactId>jsr305</artifactId>
85-
</dependency>
8682
<dependency>
8783
<groupId>com.google.http-client</groupId>
8884
<artifactId>google-http-client-jackson2</artifactId>

samples/dailymotion-cmdline-sample/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@
9797
<groupId>com.google.oauth-client</groupId>
9898
<artifactId>google-oauth-client-jetty</artifactId>
9999
</dependency>
100+
<dependency>
101+
<groupId>com.google.http-client</groupId>
102+
<artifactId>google-http-client</artifactId>
103+
</dependency>
100104
<dependency>
101105
<groupId>com.google.http-client</groupId>
102106
<artifactId>google-http-client-jackson2</artifactId>

samples/keycloak-pkce-cmdline-sample/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,18 @@
8989
<groupId>com.google.oauth-client</groupId>
9090
<artifactId>google-oauth-client</artifactId>
9191
</dependency>
92+
<dependency>
93+
<groupId>com.google.oauth-client</groupId>
94+
<artifactId>google-oauth-client-java6</artifactId>
95+
</dependency>
9296
<dependency>
9397
<groupId>com.google.oauth-client</groupId>
9498
<artifactId>google-oauth-client-jetty</artifactId>
9599
</dependency>
100+
<dependency>
101+
<groupId>com.google.http-client</groupId>
102+
<artifactId>google-http-client</artifactId>
103+
</dependency>
96104
<dependency>
97105
<groupId>com.google.http-client</groupId>
98106
<artifactId>google-http-client-jackson2</artifactId>

0 commit comments

Comments
 (0)