Skip to content
Closed
Show file tree
Hide file tree
Changes from 45 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
e61ff6d
Make json serialization treat maps as maps, always.
mikekap Apr 15, 2018
8cd92d2
remove obsolete files (#466)
elharo Sep 21, 2018
dacf78b
update app engine SDK (#467)
elharo Sep 21, 2018
19c3c7f
Add Kokoro continuous integration config and badges (#465)
chingor13 Sep 21, 2018
68fdc05
Add CODEOWNERS and issue/pr templates (#470)
chingor13 Sep 21, 2018
2cf19f6
Fix code.google.com links. Fix maven version (#471)
chingor13 Sep 21, 2018
0cd3cbe
fix API doc links (#479)
elharo Sep 24, 2018
70a8902
update test library versions (#481)
elharo Sep 24, 2018
7a1fa3b
Add the ending Java 6 support notice to README (#483)
chingor13 Sep 27, 2018
e601d7d
Fix test to run on environments with German locale (#473) (#474)
geri-m Sep 27, 2018
c1bc063
Kokoro release jobs (#472)
chingor13 Oct 4, 2018
1f067da
add patch to google http client (#486)
cramja Oct 8, 2018
4d6a42d
XML Parsing: Enum as element type (#475) (#476)
geri-m Oct 9, 2018
d27f448
Fix CODEOWNERS path
chingor13 Oct 11, 2018
85cefab
Enable releasetool for this project (#488)
chingor13 Oct 11, 2018
9de9cbb
Revert "add patch to google http client (#486)" (#493)
chingor13 Oct 16, 2018
22b8b95
Release google-http-java-client v1.26.0 (#495)
chingor13 Oct 18, 2018
df0e9f2
Bump next snapshot (#500)
chingor13 Oct 18, 2018
d504e54
Release improvements (#501)
chingor13 Oct 29, 2018
b4770b5
Add Java 11 Kokoro config (#487)
chingor13 Oct 29, 2018
d5effe8
Remove deprecated BackOffPolicy interface (#506)
chingor13 Nov 2, 2018
b3aea0f
Set the version of the jarjar-maven-plugin in pluginManagement (#515)
chingor13 Nov 2, 2018
f4c4567
guava is not provided (#508)
elharo Nov 2, 2018
0a95dd0
Upgrade maven-javadoc-plugin to 3.0.1 (#519)
chingor13 Nov 6, 2018
e1c40f6
Add google-http-client-bom artifact (#517)
chingor13 Nov 6, 2018
287cca1
Allow Enums in DataMaps (#505)
geri-m Nov 6, 2018
710117e
Fix broken snapshot and proto tests (#512)
elharo Nov 6, 2018
c5049a7
Revert "Remove deprecated BackOffPolicy interface (#506)" (#521)
chingor13 Nov 7, 2018
80b1a9c
Fix parameter of maven-javadoc-plugin (#522) (#523)
geri-m Nov 7, 2018
d7f18a3
Skip Lint of JavaDoc (#525)
geri-m Nov 8, 2018
7b95ce8
Add write timeout for post/put requests (#485)
chingor13 Nov 9, 2018
67d8c5d
Release google-http-java-client v1.27.0 (#527)
chingor13 Nov 12, 2018
7d1f23a
Bump next snapshot (#528)
chingor13 Nov 12, 2018
ab627ed
Request charset defaults to UTF-8, Response charset defaults to ISO_8…
ajaaym Dec 4, 2018
fb18555
Update guava to 26.0-android (#531)
chingor13 Dec 4, 2018
f0ca832
Make signature of com.google.api.client.util.Data#nullOf more type sa…
ajaaym Dec 10, 2018
ff93479
GenericData can now overload setters (#538)
ajaaym Dec 10, 2018
d16ab5c
Fix UriTemplate.expand to properly escape value (#534)
ajaaym Dec 10, 2018
02a6040
Fix building HttpResponseException when charset is malformed (#535)
ajaaym Dec 11, 2018
3656dcb
Implement Closeable & Flushable in JsonGenerator and JsonParser (#540)
ajaaym Dec 11, 2018
158545f
Compile to Java 1.7 binary (#542)
chingor13 Dec 12, 2018
455d4a5
Deprecate google-http-client-jackson (#539)
chingor13 Dec 12, 2018
79ed2fe
Deprecate AndroidHttp compatibility shim (#541)
chingor13 Dec 12, 2018
bf4a8da
Split http apache artifact (#543)
chingor13 Dec 12, 2018
16ddb92
Cleanup samples (#544)
chingor13 Dec 12, 2018
c7ad7fd
Merge branch 'master' into maps-can-be-iterable
chingor13 Dec 21, 2018
76eb95d
Add common generator tests for the iterable map and normal map
chingor13 Dec 28, 2018
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
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @googleapis/yoshi-java
31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
Thanks for stopping by to let us know something could be better!

Please be sure to include as much information as possible:

#### Environment details

- OS:
- Java version:
- google-http-java-client version:

#### Steps to reproduce

1. ?
2. ?

#### Stacktrace

```
Any relevant stacktrace here.
```

#### External references such as API reference guides used

- ?

#### Any additional information below

Making sure to follow these steps will guarantee the quickest resolution possible.

Thanks!

4 changes: 4 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Fixes #<issue_number_goes_here> (it's a good idea to open an issue first for discussion)

- [ ] Tests pass
- [ ] Appropriate docs were updated (if necessary)
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
target/
bin/
*.iml
.idea
.project
.settings
.classpath

6 changes: 0 additions & 6 deletions .hgignore

This file was deleted.

4 changes: 3 additions & 1 deletion .kokoro/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@ cd github/google-http-java-client/
java -version
echo $JOB_TYPE

mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"

mvn install -DskipTests=true -B -V
mvn test -B
24 changes: 24 additions & 0 deletions .kokoro/continuous/common.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Build logs will be here
action {
define_artifacts {
regex: "**/*sponge_log.xml"
}
}

# Download trampoline resources.
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "google-http-java-client/.kokoro/trampoline.sh"

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-http-java-client/.kokoro/build.sh"
}

env_vars: {
key: "JOB_TYPE"
value: "test"
}
7 changes: 7 additions & 0 deletions .kokoro/continuous/java10.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java10"
}
7 changes: 7 additions & 0 deletions .kokoro/continuous/java11.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java11"
}
7 changes: 7 additions & 0 deletions .kokoro/continuous/java7.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java7"
}
7 changes: 7 additions & 0 deletions .kokoro/continuous/java8.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}
8 changes: 4 additions & 4 deletions .kokoro/presubmit/common.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
build_file: "google-http-java-client/.kokoro/trampoline.sh"

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-http-java-client/.kokoro/build.sh"
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-http-java-client/.kokoro/build.sh"
}

env_vars: {
key: "JOB_TYPE"
value: "test"
key: "JOB_TYPE"
value: "test"
}
4 changes: 2 additions & 2 deletions .kokoro/presubmit/java10.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java10"
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java10"
}
7 changes: 7 additions & 0 deletions .kokoro/presubmit/java11.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java11"
}
4 changes: 2 additions & 2 deletions .kokoro/presubmit/java7.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java7"
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java7"
}
4 changes: 2 additions & 2 deletions .kokoro/presubmit/java8.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}
56 changes: 56 additions & 0 deletions .kokoro/release/common.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Build logs will be here
action {
define_artifacts {
regex: "**/*sponge_log.xml"
}
}

# Download trampoline resources.
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "google-http-java-client/.kokoro/trampoline.sh"

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}

before_action {
fetch_keystore {
keystore_resource {
keystore_config_id: 70247
keyname: "maven-gpg-keyring"
}
}
}

before_action {
fetch_keystore {
keystore_resource {
keystore_config_id: 70247
keyname: "maven-gpg-passphrase"
}
}
}

before_action {
fetch_keystore {
keystore_resource {
keystore_config_id: 70247
keyname: "maven-gpg-pubkeyring"
}
}
}

before_action {
fetch_keystore {
keystore_resource {
keystore_config_id: 70247
keyname: "sonatype-credentials"
}
}
}
50 changes: 50 additions & 0 deletions .kokoro/release/common.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#!/bin/bash
# Copyright 2018 Google Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

set -eo pipefail

# Get secrets from keystore and set and environment variables
setup_environment_secrets() {
export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-passphrase)
export GPG_TTY=$(tty)
export GPG_HOMEDIR=/gpg
mkdir $GPG_HOMEDIR
mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-pubkeyring $GPG_HOMEDIR/pubring.gpg
mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-keyring $GPG_HOMEDIR/secring.gpg
export SONATYPE_USERNAME=$(cat ${KOKORO_KEYSTORE_DIR}/70247_sonatype-credentials | cut -f1 -d'|')
export SONATYPE_PASSWORD=$(cat ${KOKORO_KEYSTORE_DIR}/70247_sonatype-credentials | cut -f2 -d'|')
}

create_settings_xml_file() {
echo "<settings>
<servers>
<server>
<id>ossrh</id>
<username>${SONATYPE_USERNAME}</username>
<password>${SONATYPE_PASSWORD}</password>
</server>
<server>
<id>sonatype-nexus-staging</id>
<username>${SONATYPE_USERNAME}</username>
<password>${SONATYPE_PASSWORD}</password>
</server>
<server>
<id>sonatype-nexus-snapshots</id>
<username>${SONATYPE_USERNAME}</username>
<password>${SONATYPE_PASSWORD}</password>
</server>
</servers>
</settings>" > $1
}
7 changes: 7 additions & 0 deletions .kokoro/release/drop.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Tell the trampoline which build file to use.
env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-http-java-client/.kokoro/release/drop.sh"
}
25 changes: 25 additions & 0 deletions .kokoro/release/drop.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash
# Copyright 2018 Google Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

set -eo pipefail

source $(dirname "$0")/common.sh

pushd $(dirname "$0")/../../

setup_environment_secrets
create_settings_xml_file "settings.xml"

mvn nexus-staging:drop --settings=settings.xml
7 changes: 7 additions & 0 deletions .kokoro/release/promote.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Tell the trampoline which build file to use.
env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-http-java-client/.kokoro/release/promote.sh"
}
25 changes: 25 additions & 0 deletions .kokoro/release/promote.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash
# Copyright 2018 Google Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

set -eo pipefail

source $(dirname "$0")/common.sh

pushd $(dirname "$0")/../../

setup_environment_secrets
create_settings_xml_file "settings.xml"

mvn nexus-staging:release -DperformRelease=true --settings=settings.xml
7 changes: 7 additions & 0 deletions .kokoro/release/stage.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Tell the trampoline which build file to use.
env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-http-java-client/.kokoro/release/stage.sh"
}
32 changes: 32 additions & 0 deletions .kokoro/release/stage.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/bin/bash
# Copyright 2018 Google Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

set -eo pipefail

source $(dirname "$0")/common.sh

pushd $(dirname "$0")/../../

setup_environment_secrets
create_settings_xml_file "settings.xml"

mvn clean install deploy -B \
--settings settings.xml \
-DperformRelease=true \
-Dgpg.executable=gpg \
-Dgpg.passphrase=${GPG_PASSPHRASE} \
-Dgpg.homedir=${GPG_HOMEDIR}


Loading