Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deps: fix declared dependencies #570

Merged
merged 4 commits into from Dec 1, 2020
Merged

deps: fix declared dependencies #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b5214f
deps: fix declared dependencies
chingor13 Dec 1, 2020
4be2b4b
deps: restore appengine-api-stubs for test
chingor13 Dec 1, 2020
5583f60
ci: skip windows tests - datanucleus does not build
chingor13 Dec 1, 2020
acdd9ad
chore(deps): ignore appengine-api-stubs artifact which is needed for …
chingor13 Dec 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 0 additions & 11 deletions .github/workflows/ci.yaml
View file
Open in desktop
Expand Up @@ -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:
Expand Down
18 changes: 18 additions & 0 deletions google-oauth-client-appengine/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions google-oauth-client-java6/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions google-oauth-client-jetty/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions google-oauth-client-servlet/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions google-oauth-client/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions samples/dailymotion-cmdline-sample/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
8 changes: 8 additions & 0 deletions samples/keycloak-pkce-cmdline-sample/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down