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/5] 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/5] 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/5] 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/5] 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 bf48c241b0d744dbf92e997c8ab40163f8efce9b Mon Sep 17 00:00:00 2001 From: Elliotte Harold Date: Fri, 21 Sep 2018 06:20:37 -0400 Subject: [PATCH 5/5] Remove out of date docs we don't use anymore now that we're on Github and git --- .hgignore | 6 ---- instructions.html | 73 ----------------------------------------------- overview.html | 17 ----------- 3 files changed, 96 deletions(-) delete mode 100644 .hgignore delete mode 100644 instructions.html delete mode 100644 overview.html diff --git a/.hgignore b/.hgignore deleted file mode 100644 index 88774422d..000000000 --- a/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ - -syntax: regexp -^(.*/)?target$ - -syntax: regexp -^(.*/)?bin$ diff --git a/instructions.html b/instructions.html deleted file mode 100644 index 52a65eb12..000000000 --- a/instructions.html +++ /dev/null @@ -1,73 +0,0 @@ - -Setup Instructions for the Google API Client Library for Java - -

Setup Instructions for the Google API Client Library for Java

- -

Browse Online

- - - -

Checkout Instructions

- -

Prerequisites: install Java 6, Mercurial and Maven. You may need to set -your JAVA_HOME.

- -
hg clone https://google-api-java-client.googlecode.com/hg/ google-api-java-client
-cd google-api-java-client
-mvn install
- -There are two named branches: -
    -
  • The "default" branch has the stable 1.4 library. This is the default - branch that is checked out with the instructions above.
    • -
  • The "dev" branch has the development 1.5 library. To switch to this - branch, run: 
    hg update dev
-mvn clean install
    • -
- -

Setup Project in Eclipse 3.5

- -

Prerequisites: install Eclipse, -the Mercurial plugin, the Maven -plugin, and the Android -plugin.

- -
    -
  • Setup Eclipse Preferences -
      -
    • Window > Preferences... (or on Mac, Eclipse > Preferences...)
      • -
    • Select Maven -
        -
      • check on "Download Artifact Sources"
        • -
      • check on "Download Artifact JavaDoc"
        • -
      -
      • -
    • Select Android -
        -
      • setup SDK location
        • -
      -
      • -
    -
    • -
  • Import projects -
      -
    • File > Import...
      • -
    • Select "General > Existing Project into Workspace" and click - "Next"
      • -
    • Click "Browse" next to "Select root directory", find [someDirectory]/google-api-java-client - and click OK
      • -
    • Click "Next" and "Finish"
      • -
    -
    • -
- - - diff --git a/overview.html b/overview.html deleted file mode 100644 index a4274fa2b..000000000 --- a/overview.html +++ /dev/null @@ -1,17 +0,0 @@ - - - Written by Google, the - google-api-java-client library is an easy-to-use and efficient Java client library for - accessing Google APIs using JSON and OAuth 2.0. - -

- This library is built on top of two common libraries, also built by Google, but designed to - work with any HTTP service on the web: the Google HTTP Client Library for Java and the Google - OAuth Client Library for Java. - @see - Google HTTP Java Client Library Javadoc - @see - Google OAuth Java Client Library Javadoc -

- -