diff --git a/.github/release-please.yml b/.github/release-please.yml index 827446828..dce2c8450 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1 +1,2 @@ releaseType: java-yoshi +bumpMinorPreMajor: true \ No newline at end of file diff --git a/.gitignore b/.gitignore index dc2d514ce..3ca4b1fa5 100644 --- a/.gitignore +++ b/.gitignore @@ -17,8 +17,6 @@ nosetests.xml # Mr Developer .mr.developer.cfg - -.metadata .project .pydevproject *.iml @@ -30,16 +28,5 @@ nosetests.xml # Built documentation docs/ - -# Wheel directory used in Travis builds. -gcloud-java-wheels/ -src/test/resources/gcd-head.zip -src/test/resources/gcd-v1beta2-rev1-2.1.1.zip - -# API key file containing value of GOOGLE_API_KEY for integration tests -api_key - # Python utilities *.pyc -artman-genfiles -venv \ No newline at end of file diff --git a/.kokoro/build.sh b/.kokoro/build.sh index fa132f410..aa6d4f647 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -27,6 +27,7 @@ echo ${JOB_TYPE} mvn install -B -V \ -DskipTests=true \ -Dclirr.skip=true \ + -Denforcer.skip=true \ -Dmaven.javadoc.skip=true \ -Dgcloud.download.skip=true \ -T 1C @@ -38,7 +39,7 @@ fi case ${JOB_TYPE} in test) - mvn test -B -Dclirr.skip=true + mvn test -B -Dclirr.skip=true -Denforcer.skip=true bash ${KOKORO_GFILE_DIR}/codecov.sh bash .kokoro/coerce_logs.sh ;; @@ -57,4 +58,4 @@ clirr) ;; *) ;; -esac \ No newline at end of file +esac diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 1a430aa3c..2a1e678f4 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -23,5 +23,9 @@ echo $JOB_TYPE export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" -mvn install -DskipTests=true -B -V +# this should run maven enforcer +mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true + mvn -B dependency:analyze -DfailOnWarning=true diff --git a/.kokoro/release/drop.cfg b/.kokoro/release/drop.cfg index 1767cdd95..a9cc5b734 100644 --- a/.kokoro/release/drop.cfg +++ b/.kokoro/release/drop.cfg @@ -4,6 +4,3 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/java-logging/.kokoro/release/drop.sh" } - -# Download staging properties file. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-logging" \ No newline at end of file diff --git a/.kokoro/release/promote.cfg b/.kokoro/release/promote.cfg index 11ab526ac..d8bc16d90 100644 --- a/.kokoro/release/promote.cfg +++ b/.kokoro/release/promote.cfg @@ -4,7 +4,3 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/java-logging/.kokoro/release/promote.sh" } - -# Download staging properties file. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-logging" - diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index fcd03d18d..368a3f4e6 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -33,7 +33,7 @@ python3 -m pip install gcp-docuploader # compile all packages mvn clean install -B -DskipTests=true -NAME=logging +NAME=google-cloud-logging VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) # build the docs diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java index 65563e76b..43ca1a2ee 100644 --- a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java +++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java @@ -59,6 +59,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; +import java.util.UUID; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -82,7 +83,7 @@ public static void startStaticServer() { mockMetricsServiceV2 = new MockMetricsServiceV2(); serviceHelper = new MockServiceHelper( - "in-process-1", + UUID.randomUUID().toString(), Arrays.asList( mockConfigServiceV2, mockLoggingServiceV2, mockMetricsServiceV2)); serviceHelper.start(); diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java index 84c52e53d..c0ceb84ce 100644 --- a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java +++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java @@ -51,6 +51,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.UUID; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -74,7 +75,7 @@ public static void startStaticServer() { mockMetricsServiceV2 = new MockMetricsServiceV2(); serviceHelper = new MockServiceHelper( - "in-process-1", + UUID.randomUUID().toString(), Arrays.asList( mockConfigServiceV2, mockLoggingServiceV2, mockMetricsServiceV2)); serviceHelper.start(); diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java index f1c04174f..30e175d97 100644 --- a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java +++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java @@ -45,6 +45,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; +import java.util.UUID; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -68,7 +69,7 @@ public static void startStaticServer() { mockMetricsServiceV2 = new MockMetricsServiceV2(); serviceHelper = new MockServiceHelper( - "in-process-1", + UUID.randomUUID().toString(), Arrays.asList( mockConfigServiceV2, mockLoggingServiceV2, mockMetricsServiceV2)); serviceHelper.start(); diff --git a/grpc-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ConfigServiceV2Grpc.java b/grpc-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ConfigServiceV2Grpc.java index a050b42f3..95a4453a2 100644 --- a/grpc-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ConfigServiceV2Grpc.java +++ b/grpc-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ConfigServiceV2Grpc.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.google.logging.v2; import static io.grpc.MethodDescriptor.generateFullMethodName; diff --git a/grpc-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingServiceV2Grpc.java b/grpc-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingServiceV2Grpc.java index e7bd1e480..de42c7682 100644 --- a/grpc-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingServiceV2Grpc.java +++ b/grpc-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingServiceV2Grpc.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.google.logging.v2; import static io.grpc.MethodDescriptor.generateFullMethodName; diff --git a/grpc-google-cloud-logging-v2/src/main/java/com/google/logging/v2/MetricsServiceV2Grpc.java b/grpc-google-cloud-logging-v2/src/main/java/com/google/logging/v2/MetricsServiceV2Grpc.java index f4921cc47..68d4ac2b4 100644 --- a/grpc-google-cloud-logging-v2/src/main/java/com/google/logging/v2/MetricsServiceV2Grpc.java +++ b/grpc-google-cloud-logging-v2/src/main/java/com/google/logging/v2/MetricsServiceV2Grpc.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.google.logging.v2; import static io.grpc.MethodDescriptor.generateFullMethodName; diff --git a/synth.metadata b/synth.metadata index 4c0891953..e70d7eee0 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,19 +1,33 @@ { - "updateTime": "2019-10-02T07:47:52.258007Z", + "updateTime": "2019-11-19T22:55:20.728150Z", "sources": [ { "generator": { "name": "artman", - "version": "0.37.1", - "dockerImage": "googleapis/artman@sha256:6068f67900a3f0bdece596b97bda8fc70406ca0e137a941f4c81d3217c994a80" + "version": "0.42.1", + "dockerImage": "googleapis/artman@sha256:c773192618c608a7a0415dd95282f841f8e6bcdef7dd760a988c93b77a64bd57" + } + }, + { + "generator": { + "name": "artman", + "version": "0.42.1", + "dockerImage": "googleapis/artman@sha256:c773192618c608a7a0415dd95282f841f8e6bcdef7dd760a988c93b77a64bd57" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "2123bcae97debe57e0870fca157cdf21e32bf3fb", - "internalRef": "272289410" + "sha": "5af83f47b9656261cafcf88b0b3334521ab266b3", + "internalRef": "281334391" + } + }, + { + "template": { + "name": "java_library", + "origin": "synthtool.gcp", + "version": "2019.10.17" } } ], diff --git a/synth.py b/synth.py index 8ca734f72..f212374be 100644 --- a/synth.py +++ b/synth.py @@ -25,23 +25,12 @@ config_pattern = '/google/logging/artman_logging.yaml' for version in versions: - library = gapic.java_library( + library = java.gapic_library( service=service, version=version, - config_path=config_pattern.format(version=version), - artman_output_name='') - - package_name = f'com.google.cloud.{service}.{version}' - java.fix_proto_headers(library / f'proto-google-cloud-{service}-{version}') - java.fix_grpc_headers(library / f'grpc-google-cloud-{service}-{version}', package_name) - - s.copy(library / f'gapic-google-cloud-{service}-{version}/src', f'google-cloud-{service}/src') - s.copy(library / f'grpc-google-cloud-{service}-{version}/src', f'grpc-google-cloud-{service}-{version}/src') - s.copy(library / f'proto-google-cloud-{service}-{version}/src', f'proto-google-cloud-{service}-{version}/src') - - java.format_code(f'google-cloud-{service}/src') - java.format_code(f'grpc-google-cloud-{service}-{version}/src') - java.format_code(f'proto-google-cloud-{service}-{version}/src') + config_pattern=config_pattern, + package_pattern='com.google.{service}.{version}' + ) common_templates = gcp.CommonTemplates() templates = common_templates.java_library()