From a455c0557295088c23e502b438e15d2d409e7a04 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 5 Feb 2017 17:32:19 -0500 Subject: [PATCH 1/6] add OSGI metadata --- google-api-client/pom.xml | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 71edbb65a..032cd52f7 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -36,20 +36,42 @@ - true +true + ${project.build.outputDirectory}/META-INF/MANIFEST.MF jar - compile + package jar + + org.apache.felix + maven-bundle-plugin + 2.5.4 + + + bundle-manifest + process-classes + + manifest + + + + + + https://developers.google.com/api-client-library/java/ + The Google API Client Library for Java provides functionality common to all Google APIs; for example HTTP transport, error handling, authentication, JSON parsing, media download/upload, and batching. + com.google.api.client.googleapis + + + maven-source-plugin From 3a4a3fdc7a25978aa2a9c41332a5093023a10de0 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 6 Feb 2017 14:51:54 -0500 Subject: [PATCH 2/6] more default behavior --- google-api-client/pom.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 032cd52f7..cf2f93ebc 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -41,15 +41,6 @@ ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - jar - package - - jar - - - org.apache.felix @@ -77,7 +68,6 @@ source-jar - compile jar From 4d85d84955dc028e0a2089122230e85d2f566684 Mon Sep 17 00:00:00 2001 From: Elliotte Harold Date: Thu, 6 Sep 2018 18:12:02 -0400 Subject: [PATCH 3/6] add OSGI info --- google-api-client-jackson2/pom.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index 17bb9bba4..e2be54ecd 100644 --- a/google-api-client-jackson2/pom.xml +++ b/google-api-client-jackson2/pom.xml @@ -41,6 +41,27 @@ + + org.apache.felix + maven-bundle-plugin + 2.5.4 + + + bundle-manifest + process-classes + + manifest + + + + + + https://developers.google.com/api-client-library/java/google-http-java-client/reference/1.20.0/jdiff/Google_HTTP_Client_Library_for_Java_1.19.0/com/google/api/client/json/jackson2/package-summary + Low-level implementation of the JSON parser library based on the Jackson 2 JSON library. + com.google.api.client.jackson2 + + + maven-source-plugin From b7f568eda8b848afe0897d31b4ed6a185c843d32 Mon Sep 17 00:00:00 2001 From: Elliotte Harold Date: Thu, 6 Sep 2018 18:14:27 -0400 Subject: [PATCH 4/6] whitespace --- google-api-client/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index d43a91bbf..03542e7e4 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -36,7 +36,7 @@ -true + true ${project.build.outputDirectory}/META-INF/MANIFEST.MF @@ -50,7 +50,7 @@ bundle-manifest process-classes - + manifest From 8936b0a48e8ed09778f5468473abd31bc955cb33 Mon Sep 17 00:00:00 2001 From: Elliotte Harold Date: Tue, 18 Sep 2018 06:16:47 -0400 Subject: [PATCH 5/6] update javadoc URLs --- google-api-client/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 03542e7e4..545f162b7 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -22,10 +22,10 @@ maven-javadoc-plugin - http://download.oracle.com/javase/1.5.0/docs/api/ - http://code.google.com/appengine/docs/java/javadoc - http://javadoc.google-http-java-client.googlecode.com/hg/${project.http.version} - http://javadoc.google-oauth-java-client.googlecode.com/hg/${project.oauth.version} + https://docs.oracle.com/javase/6/docs/api/ + https://cloud.google.com/appengine/docs/standard/java/javadoc/ + https://developers.google.com/api-client-library/java/google-http-java-client/reference/1.20.0/ + https://developers.google.com/api-client-library/java/google-oauth-java-client/reference/1.20.0/ ${project.name} ${project.version} ${project.artifactId} ${project.version} From 7832d7e2b9cd676d07e64ca060f55baec5182c50 Mon Sep 17 00:00:00 2001 From: Elliotte Harold Date: Tue, 18 Sep 2018 06:25:46 -0400 Subject: [PATCH 6/6] use github instead --- google-api-client/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 545f162b7..92e0fff68 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -24,8 +24,8 @@ https://docs.oracle.com/javase/6/docs/api/ https://cloud.google.com/appengine/docs/standard/java/javadoc/ - https://developers.google.com/api-client-library/java/google-http-java-client/reference/1.20.0/ - https://developers.google.com/api-client-library/java/google-oauth-java-client/reference/1.20.0/ + https://googleapis.github.io/google-http-java-client/releases/1.25.0/javadoc/ + https://googleapis.github.io/google-oauth-java-client/releases/1.25.0/javadoc/ ${project.name} ${project.version} ${project.artifactId} ${project.version}