Skip to content
This repository was archived by the owner on Sep 27, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
2fb4368
Fixing version - bumping to next available SNAPSHOT (#32)
garrettjonesgoogle Nov 2, 2017
945647e
Upgrading google-java-format plus reformatting the code (#33)
garrettjonesgoogle Nov 3, 2017
fdb8102
Adding new annotation, InternalExtensionOnly (#34)
garrettjonesgoogle Nov 3, 2017
c93ad3c
Removing @BetaApi from core classes (#35)
garrettjonesgoogle Nov 8, 2017
8d8e48a
Bump to 1.2.0 for release (#36)
garrettjonesgoogle Nov 8, 2017
4a19f3f
Bumping to next snapshot version (#37)
garrettjonesgoogle Nov 8, 2017
491811f
Added transform and transformAsync overrides that accept an Executor …
hiranya911 Jan 17, 2018
5c9d9a9
Deprecating *Type and getType() for resource names (#40)
garrettjonesgoogle Feb 6, 2018
d8e6c27
Adding stageRelease/finalizeRelease + RELEASING.md (#41)
garrettjonesgoogle Feb 7, 2018
46da59a
Bumping to 1.3.0 for release (#42)
garrettjonesgoogle Feb 21, 2018
b59ece3
Fixing finalizeRelease task (#43)
garrettjonesgoogle Feb 21, 2018
1a563a3
Bumping to snapshot version for development (#44)
garrettjonesgoogle Feb 21, 2018
09e7053
Removing deprecated stuff (that won't break api-client-staging) (#45)
garrettjonesgoogle Feb 28, 2018
2952739
Bumping to 1.4.0 for release (#47)
garrettjonesgoogle Mar 1, 2018
24b3e86
Bumping to snapshot version for development (#49)
garrettjonesgoogle Mar 1, 2018
a647ed5
Add methods to ResourceName interface (#46)
andreamlin Mar 6, 2018
78680a1
bump to version 1.5.0 (#51)
andreamlin Mar 6, 2018
6de220c
bump version to 1.5.1-SNAPSHOT (#52)
andreamlin May 25, 2018
0b74c57
Promoting types in resourcenames and pathtemplate to stable (#54)
garrettjonesgoogle May 25, 2018
ba4a02c
Bump to version 1.6.0 (#55)
garrettjonesgoogle May 25, 2018
aa77f75
Bumping to snapshot version (#56)
garrettjonesgoogle May 25, 2018
60288da
Add Code of Conduct
theacodes Jul 2, 2018
bea454c
Upgrading gradle (#60)
garrettjonesgoogle Jul 30, 2018
9a3b8aa
upgrade some deps (#57)
elharo Jul 30, 2018
879c70d
remove usage of deprecated methods in guava (#61)
yihanzhen Aug 1, 2018
6812c78
bump to 1.7.0 for release (#62)
yihanzhen Aug 2, 2018
032fd87
bump to snapshot version (#63)
yihanzhen Aug 2, 2018
a4cc693
Guava 20 (#67)
elharo Sep 7, 2018
87d7d17
Fix PathTemplate matcher to match path with protocol and hostname (#68)
ajaaym Jan 4, 2019
b966ff3
Automatic-Module-Name added to the manifest. (#69)
TheIndifferent Feb 11, 2019
196128d
Upgrade dependencies for GCP orbit (#71)
elharo Feb 19, 2019
d00d97d
Current version is 1.7.0 and is stable (#70)
elharo Feb 19, 2019
3fa1b08
Using the executor in ApiFutures.catching (#73)
sduskis Mar 8, 2019
6e88441
Modify PathTemplate so that double-star (PATH_WILDCARD) matches 0+ se…
ryanpbrewster Apr 11, 2019
b7feaad
Release v1.8.0 (#76)
andreamlin Apr 11, 2019
16e788c
Bump version for development (#77)
andreamlin Apr 25, 2019
feb97c8
Upgrade errorprone and specify URL for project (#79)
elharo Apr 25, 2019
dcb7f81
Release v1.8.1 (#80)
andreamlin Apr 25, 2019
9db7d88
Bump version for development (#83)
andreamlin Apr 29, 2019
02b9530
Add renovate.json (#84)
Jun 4, 2019
0ac1348
workaround Gradle bug (#82)
elharo Jun 24, 2019
afbd00f
Update dependency gradle to v4.10.3 (#85)
renovate-bot Jun 24, 2019
d707065
build on trusty (#81)
elharo Aug 29, 2019
83b3a09
Adding title to CONTRIBUTING.md (#89)
kshithijiyer Nov 1, 2019
bcdc81c
Update guava and Truth (#90)
elharo Nov 5, 2019
147f53d
remove unused dependencies (#91)
elharo Nov 25, 2019
48e3ba5
Add Kokoro release scripts (#88)
chingor13 Nov 25, 2019
d75a5ec
update autovalue (#103)
elharo Dec 11, 2019
d0b55ad
Update dependency junit:junit to v4.13 (#105)
renovate-bot Feb 19, 2020
4aef9ae
Update dependency com.google.truth:truth to v1.0.1 (#107)
renovate-bot Feb 19, 2020
77bf911
deps: update guava to 28.2 (#110)
elharo Feb 19, 2020
594e8b9
chore(deps): update dependency com.google.errorprone:error_prone_anno…
renovate-bot Feb 24, 2020
95ef38c
Update dependency io.codearte.gradle.nexus:gradle-nexus-staging-plugi…
renovate-bot Feb 24, 2020
923f56a
chore(deps): update dependency gradle.plugin.com.github.sherter.googl…
renovate-bot Feb 28, 2020
a46286f
feat: add @BetaApi ApiFutures.catchingAsync (#117)
schmidt-sebastian Mar 13, 2020
4ae6083
chore: release v1.9.0 (#118)
chingor13 Mar 25, 2020
bf82bae
chore: support complex resource identifiers
miraleung May 6, 2020
4c68585
remove debug printf
miraleung May 6, 2020
7419e19
fix: clean up PathTemplate.java and tests
miraleung May 7, 2020
3bfdecb
-a (#138)
elharo May 18, 2020
3a1629e
chore(deps): update dependency com.google.auto.value:auto-value-annot…
renovate-bot May 18, 2020
162c04f
deps: prevent renovate-bot from updating to guava -jre versions (#142)
elharo May 18, 2020
63430bd
chore(deps): update dependency com.google.auto.value:auto-value to v1…
renovate-bot May 18, 2020
fe80f81
chore: release v1.9.1 (#144)
chingor13 May 26, 2020
2eb0534
fix: update mockito dependency (#146)
dmitry-fa May 27, 2020
007782e
fix: parse collection wildcards and _deleted-topic_ patterns
miraleung Jun 3, 2020
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
27 changes: 27 additions & 0 deletions .kokoro/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/bin/bash
# Copyright 2019 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

cd github/api-common-java/

# Print out Java
java -version
echo $JOB_TYPE

./gradlew assemble
./gradlew build install

bash $KOKORO_GFILE_DIR/codecov.sh
13 changes: 13 additions & 0 deletions .kokoro/common.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Download trampoline resources. These will be in ${KOKORO_GFILE_DIR}
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# All builds use the trampoline script to run in docker.
build_file: "api-common-java/.kokoro/trampoline.sh"

# Tell the trampoline which build file to use.
env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/api-common-java/.kokoro/build.sh"
}
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: "api-common-java/.kokoro/trampoline.sh"

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/api-common-java/.kokoro/build.sh"
}

env_vars: {
key: "JOB_TYPE"
value: "test"
}
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"
}
24 changes: 24 additions & 0 deletions .kokoro/presubmit/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: "api-common-java/.kokoro/trampoline.sh"

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/api-common-java/.kokoro/build.sh"
}

env_vars: {
key: "JOB_TYPE"
value: "test"
}
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"
}
7 changes: 7 additions & 0 deletions .kokoro/presubmit/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/presubmit/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"
}
49 changes: 49 additions & 0 deletions .kokoro/release/common.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Format: //devtools/kokoro/config/proto/build.proto

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

# Use the trampoline script to run in docker.
build_file: "api-common-java/.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"
}
}
}
40 changes: 40 additions & 0 deletions .kokoro/release/common.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#!/bin/bash
# Copyright 2019 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 GPG_KEY_ID=$(echo -n $(gpg --with-colons ${GPG_HOMEDIR}/pubring.gpg | awk -F':' '/pub/{ print $5 }'))
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_gradle_properties_file() {
echo "
signing.gnupg.executable=gpg
signing.gnupg.homeDir=${GPG_HOMEDIR}
signing.gnupg.keyName=${GPG_KEY_ID}
signing.gnupg.passphrase=${GPG_PASSPHRASE}

ossrhUsername=${SONATYPE_USERNAME}
ossrhPassword=${SONATYPE_PASSWORD}" > $1
}
5 changes: 5 additions & 0 deletions .kokoro/release/drop.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Format: //devtools/kokoro/config/proto/build.proto
env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/api-common-java/.kokoro/release/drop.sh"
}
19 changes: 19 additions & 0 deletions .kokoro/release/drop.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash
# Copyright 2019 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

echo "This dropping a staged repo does not appear supported by the gradle-nexus-staging-plugin"
exit 1
5 changes: 5 additions & 0 deletions .kokoro/release/promote.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Format: //devtools/kokoro/config/proto/build.proto
env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/api-common-java/.kokoro/release/promote.sh"
}
31 changes: 31 additions & 0 deletions .kokoro/release/promote.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/bin/bash
# Copyright 2019 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

# STAGING_REPOSITORY_ID must be set
#if [ -z "${STAGING_REPOSITORY_ID}" ]; then
# echo "Missing STAGING_REPOSITORY_ID environment variable"
# exit 1
#fi

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

setup_environment_secrets
mkdir -p ${HOME}/.gradle
create_gradle_properties_file "${HOME}/.gradle/gradle.properties"

./gradlew closeAndReleaseRepository
19 changes: 19 additions & 0 deletions .kokoro/release/publish_javadoc.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Format: //devtools/kokoro/config/proto/build.proto
env_vars: {
key: "STAGING_BUCKET"
value: "docs-staging"
}

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/api-common-java/.kokoro/release/publish_javadoc.sh"
}

before_action {
fetch_keystore {
keystore_resource {
keystore_config_id: 73713
keyname: "docuploader_service_account"
}
}
}
52 changes: 52 additions & 0 deletions .kokoro/release/publish_javadoc.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#!/bin/bash
# Copyright 2019 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

if [[ -z "${CREDENTIALS}" ]]; then
CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account
fi

if [[ -z "${STAGING_BUCKET}" ]]; then
echo "Need to set STAGING_BUCKET environment variable"
exit 1
fi

# work from the git root directory
pushd $(dirname "$0")/../../

# install docuploader package
python3 -m pip install gcp-docuploader

NAME=api-common
VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)

# build the docs
./gradlew javadocCombined

pushd tmp_docs

# create metadata
python3 -m docuploader create-metadata \
--name ${NAME} \
--version ${VERSION} \
--language java

# upload docs
python3 -m docuploader upload . \
--credentials ${CREDENTIALS} \
--staging-bucket ${STAGING_BUCKET}

popd
Loading