Skip to content

Update http/oauth dependencies to 1.29 #1259

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

Merged
chingor13 merged 4 commits into from
May 20, 2019
Merged

Update http/oauth dependencies to 1.29 #1259

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
9382522
Declare test dependency for protobuf. Stop version bumping http/oauth…
chingor13 May 16, 2019
49eba1a
Fix dependencies
chingor13 May 17, 2019
dc9a1db
Fix version in OSGI metadata
chingor13 May 17, 2019
4e4d363
google-api-client-protobuf needs protobuf-java at compile time
chingor13 May 17, 2019
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
2 changes: 1 addition & 1 deletion google-api-client-appengine/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</executions>
<configuration>
<instructions>
<Bundle-DocURL>https://googleapis.dev/java/google-api-client/1.28.0/index.html</Bundle-DocURL>
<Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
<Bundle-Description>App Engine extensions to the Google APIs Client Library for Java</Bundle-Description>
<Bundle-SymbolicName>com.google.api.client.appengine</Bundle-SymbolicName>
</instructions>
Expand Down
2 changes: 1 addition & 1 deletion google-api-client-gson/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</executions>
<configuration>
<instructions>
<Bundle-DocURL>https://googleapis.dev/java/google-api-client/1.28.0/index.html</Bundle-DocURL>
<Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
<Bundle-Description>GSON extensions to the Google APIs Client Library for Java</Bundle-Description>
<Bundle-SymbolicName>com.google.api.client.googleapis.notifications.json.gson</Bundle-SymbolicName>
</instructions>
Expand Down
2 changes: 1 addition & 1 deletion google-api-client-jackson2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</executions>
<configuration>
<instructions>
<Bundle-DocURL>https://googleapis.dev/java/google-api-client/1.28.0/index.html</Bundle-DocURL>
<Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
<Bundle-Description>Low-level implementation of the JSON parser library based on the Jackson 2 JSON library.</Bundle-Description>
<Bundle-SymbolicName>com.google.api.client.jackson2</Bundle-SymbolicName>
</instructions>
Expand Down
2 changes: 1 addition & 1 deletion google-api-client-java6/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</executions>
<configuration>
<instructions>
<Bundle-DocURL>https://googleapis.dev/java/google-api-client/1.28.0/index.html</Bundle-DocURL>
<Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
<Bundle-Description>Java 6 extensions to the Google APIs Client Library for Java</Bundle-Description>
<Bundle-SymbolicName>com.google.api.client.java6</Bundle-SymbolicName>
</instructions>
Expand Down
7 changes: 6 additions & 1 deletion google-api-client-protobuf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
</executions>
<configuration>
<instructions>
<Bundle-DocURL>https://googleapis.dev/java/google-api-client/1.28.0/index.html</Bundle-DocURL>
<Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
<Bundle-Description>Protobuf extensions to the Google APIs Client Library for Java</Bundle-Description>
<Bundle-SymbolicName>com.google.api.client.protobuf</Bundle-SymbolicName>
</instructions>
Expand Down Expand Up @@ -107,5 +107,10 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion google-api-client-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</executions>
<configuration>
<instructions>
<Bundle-DocURL>https://googleapis.dev/java/google-api-client/1.28.0/index.html</Bundle-DocURL>
<Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
<Bundle-Description>Servlet extensions to the Google APIs Client Library for Java</Bundle-Description>
<Bundle-SymbolicName>com.google.api.client.servlet</Bundle-SymbolicName>
</instructions>
Expand Down
2 changes: 1 addition & 1 deletion google-api-client-xml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</executions>
<configuration>
<instructions>
<Bundle-DocURL>https://googleapis.dev/java/google-api-client/1.28.0/index.html</Bundle-DocURL>
<Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
<Bundle-Description>XML extensions to the Google APIs Client Library for Java</Bundle-Description>
<Bundle-SymbolicName>com.google.api.client.xml</Bundle-SymbolicName>
</instructions>
Expand Down
4 changes: 0 additions & 4 deletions google-api-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,6 @@
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-jackson2</artifactId>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-apache</artifactId>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-gson</artifactId>
Expand Down
17 changes: 9 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,6 @@
<artifactId>google-http-client-android</artifactId>
<version>${project.http.version}</version>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-apache</artifactId>
<version>${project.http-apache.version}</version>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-appengine</artifactId>
Expand Down Expand Up @@ -280,6 +275,13 @@
<artifactId>google-play-services</artifactId>
<version>1</version>
</dependency>

<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${project.protobuf-java.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -554,9 +556,8 @@
- Internally, update the default features.json file
-->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.http.version>1.28.0</project.http.version><!-- {x-version-update:google-http-client:released} -->
<project.http-apache.version>2.0.0</project.http-apache.version><!-- {x-version-update:google-http-client-apache:released} -->
<project.oauth.version>1.28.0</project.oauth.version><!-- {x-version-update:google-oauth-client:released} -->
<project.http.version>1.29.1</project.http.version>
<project.oauth.version>1.29.0</project.oauth.version>
<project.jsr305.version>3.0.2</project.jsr305.version>
<project.gson.version>2.1</project.gson.version>
<project.jackson-core-asl.version>1.9.13</project.jackson-core-asl.version>
Expand Down
3 changes: 0 additions & 3 deletions versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@
# module:released-version:current-version

google-api-client:1.28.0:1.28.1-SNAPSHOT
google-http-client:1.28.0:1.28.1-SNAPSHOT
google-http-client-apache:2.0.0:2.0.1-SNAPSHOT
google-oauth-client:1.28.0:1.28.1-SNAPSHOT