diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/BigQueryRpc.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/BigQueryRpc.java index 46031adae64e..c2b61a6e5346 100644 --- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/BigQueryRpc.java +++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/BigQueryRpc.java @@ -207,7 +207,7 @@ GetQueryResultsResponse getQueryResults( /** * Opens a resumable upload session to load data into a BigQuery table and returns an upload URI. * - * @param configuration load configuration + * @param job load job * @throws BigQueryException upon failure */ String open(Job job); diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index b6672db43f90..497cdb600ac2 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -114,7 +114,7 @@ github-pages-site Deployment through GitHub's site deployment plugin - ${project.version}/ + site/${project.artifactId} @@ -955,6 +955,46 @@ false + + org.apache.maven.plugins + maven-site-plugin + 3.4 + + true + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.8.1 + + + + index + dependency-info + project-team + cim + issue-tracking + license + scm + dependency-management + distribution-management + summary + modules + + + + + true + true + true + true + google-cloud-bom + jar + + + + + diff --git a/google-cloud-bom/src/site/site.xml b/google-cloud-bom/src/site/site.xml new file mode 100644 index 000000000000..9b017fa0c74a --- /dev/null +++ b/google-cloud-bom/src/site/site.xml @@ -0,0 +1,32 @@ + + + + + org.apache.maven.skins + maven-fluido-skin + 1.4 + + + + + + + + + diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java index 37297f7a476d..97ad344d0d28 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Google Inc. All Rights Reserved. + * Copyright 2017 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializer.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializer.java index 5bcadcf9e3af..64e7c8ea8f06 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializer.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Google Inc. All Rights Reserved. + * Copyright 2017 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/SignatureInfo.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/SignatureInfo.java index bd9ae3ee34c8..47f9e6337219 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/SignatureInfo.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/SignatureInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Google Inc. All Rights Reserved. + * Copyright 2015 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializerTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializerTest.java index 599c9a5ba16d..227fe95e07af 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializerTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Google Inc. All Rights Reserved. + * Copyright 2015 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/SignatureInfoTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/SignatureInfoTest.java index cd27b6aa805e..bd3624699c18 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/SignatureInfoTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/SignatureInfoTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Google Inc. All Rights Reserved. + * Copyright 2015 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pom.xml b/pom.xml index 232a4d6af40b..b3e91973143b 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ github-pages-site Deployment through GitHub's site deployment plugin - ${project.version}/ + site @@ -675,11 +675,6 @@ true - - org.apache.maven.plugins - maven-changelog-plugin - 2.3 - org.apache.maven.plugins maven-project-info-reports-plugin @@ -689,10 +684,7 @@ index dependency-info - dependencies - dependency-convergence project-team - mailing-list cim issue-tracking license @@ -713,11 +705,6 @@ jar - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - org.apache.maven.plugins maven-javadoc-plugin @@ -769,28 +756,6 @@ - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.19.1 - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - checkstyle.xml - false - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.7 - - true - - diff --git a/src/site/site.xml b/src/site/site.xml index 6279179eb389..13981f041d2b 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,5 +1,5 @@ - + diff --git a/testing/google-cloud-appengine-flex-custom/src/main/docker/Dockerfile b/testing/google-cloud-appengine-flex-custom/src/main/docker/Dockerfile deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/utilities/add_snippets_to_file.py b/utilities/add_snippets_to_file.py index dccd02293e5d..5044eb1ea265 100644 --- a/utilities/add_snippets_to_file.py +++ b/utilities/add_snippets_to_file.py @@ -1,4 +1,4 @@ -# Copyright 2016 Google Inc. All rights reserved. +# Copyright 2016 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/utilities/create_site.sh b/utilities/create_site.sh index 9d0979bb34fe..980611ff2e3d 100755 --- a/utilities/create_site.sh +++ b/utilities/create_site.sh @@ -14,14 +14,14 @@ fi git clone --branch gh-pages --single-branch https://github.com/GoogleCloudPlatform/google-cloud-java/ tmp_gh-pages mkdir -p tmp_gh-pages/$SITE_VERSION_BASE -mvn site -DskipTests -Djava.util.logging.config.file=logging.properties +mvn site -Djava.util.logging.config.file=logging.properties +mvn site:stage --quiet -Djava.util.logging.config.file=logging.properties -DtopSiteURL=https://googlecloudplatform.github.io/google-cloud-java -version_bases=(${SITE_VERSION_BASE} latest) rm -rf tmp_gh-pages/latest mkdir tmp_gh-pages/latest +version_bases=(${SITE_VERSION_BASE} latest) for version_base in ${version_bases[@]} do - mvn site:stage --quiet -Djava.util.logging.config.file=logging.properties -DtopSiteURL=https://googlecloudplatform.github.io/google-cloud-java/site/${version_base}/ cd tmp_gh-pages cp -r ../target/staging/*/* $version_base sed -i "s/{{SITE_VERSION}}/$SITE_VERSION/g" ${version_base}/index.html # Update "Quickstart with Maven" to reflect version change