From b5946ff5b7481134236a13c21c44dcec36e45b51 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 25 Aug 2021 15:16:20 -0400 Subject: [PATCH] chore: split the shared dependencies BOM into two (#419) --- first-party-dependencies/java.header | 15 ++ first-party-dependencies/license-checks.xml | 10 + first-party-dependencies/pom.xml | 192 ++++++++++++++++ pom.xml | 233 +------------------- third-party-dependencies/java.header | 15 ++ third-party-dependencies/license-checks.xml | 10 + third-party-dependencies/pom.xml | 171 ++++++++++++++ 7 files changed, 421 insertions(+), 225 deletions(-) create mode 100644 first-party-dependencies/java.header create mode 100644 first-party-dependencies/license-checks.xml create mode 100644 first-party-dependencies/pom.xml create mode 100644 third-party-dependencies/java.header create mode 100644 third-party-dependencies/license-checks.xml create mode 100644 third-party-dependencies/pom.xml diff --git a/first-party-dependencies/java.header b/first-party-dependencies/java.header new file mode 100644 index 00000000..d0970ba7 --- /dev/null +++ b/first-party-dependencies/java.header @@ -0,0 +1,15 @@ +^/\*$ +^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)$ +^ \*$ +^ \* 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$ +^ \*$ +^ \*[ ]+https?://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\.$ +^ \*/$ diff --git a/first-party-dependencies/license-checks.xml b/first-party-dependencies/license-checks.xml new file mode 100644 index 00000000..6597fced --- /dev/null +++ b/first-party-dependencies/license-checks.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml new file mode 100644 index 00000000..29a82ede --- /dev/null +++ b/first-party-dependencies/pom.xml @@ -0,0 +1,192 @@ + + + 4.0.0 + com.google.cloud + first-party-dependencies + pom + 2.1.1-SNAPSHOT + Google Cloud First-party Shared Dependencies + https://github.com/googleapis/java-shared-dependencies + + Shared first-party dependencies for Google Cloud Java libraries. + + + + com.google.cloud + google-cloud-shared-config + 1.0.1 + + + + Google LLC + + + + scm:git:git@github.com:googleapis/java-shared-dependencies.git + scm:git:git@github.com:googleapis/java-shared-dependencies.git + https://github.com/googleapis/java-shared-dependencies + HEAD + + + + https://github.com/googleapis/java-shared-dependencies/issues + GitHub Issues + + + + + sonatype-nexus-snapshots + https://google.oss.sonatype.org/content/repositories/snapshots + + + sonatype-nexus-staging + https://google.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + + UTF-8 + ${project.artifactId} + + 1.40.0 + 2.3.0 + 1.1.0 + 30.1.1-jre + 3.17.3 + 2.0.1 + 2.3.2 + 2.1.1 + 1.1.0 + 1.39.2 + 1.32.1 + 1.32.1 + 1.1.0 + + + + + + io.grpc + grpc-bom + ${grpc.version} + pom + import + + + com.google.api + gax-bom + ${gax.version} + pom + import + + + com.google.cloud + grpc-gcp + ${grpc-gcp.version} + + + com.google.guava + guava-bom + ${guava.version} + pom + import + + + + com.google.protobuf + protobuf-bom + ${protobuf.version} + pom + import + + + com.google.api + api-common + ${google.api-common.version} + + + com.google.api.grpc + proto-google-common-protos + ${google.common-protos.version} + + + com.google.api.grpc + grpc-google-common-protos + ${google.common-protos.version} + + + com.google.cloud + google-cloud-core-bom + ${google.core.version} + pom + import + + + com.google.auth + google-auth-library-bom + ${google.auth.version} + pom + import + + + com.google.http-client + google-http-client-bom + ${google.http-client.version} + pom + import + + + com.google.oauth-client + google-oauth-client-bom + ${google.oauth-client.version} + pom + import + + + com.google.api-client + google-api-client-bom + ${google.api-client.version} + pom + import + + + com.google.api.grpc + proto-google-iam-v1 + ${iam.version} + + + + + com.google.api.grpc + grpc-google-iam-v1 + ${iam.version} + + + com.google.api + gax-grpc + ${gax.version} + testlib + + + com.google.cloud + google-cloud-core + ${google.core.version} + test-jar + + + com.google.cloud + google-cloud-core + ${google.core.version} + tests + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index d9ce91bc..047758a3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,6 +5,10 @@ google-cloud-shared-dependencies pom 2.1.1-SNAPSHOT + + first-party-dependencies + third-party-dependencies + Google Cloud Shared Dependencies https://github.com/googleapis/java-shared-dependencies @@ -54,245 +58,24 @@ UTF-8 ${project.artifactId} - 1.40.0 - 2.3.0 - 1.1.0 - 30.1.1-jre - 3.17.3 - 2.0.1 - 2.3.2 - 2.1.1 - 1.1.0 - 1.39.2 - 1.32.1 - 1.32.1 - 2.8.8 - 1.5.1 - 1.3.2 - 1.20 - 1.1.0 - 0.28.0 - 3.0.2 - 2.9.0 - 2.12.4 - 1.15 - 4.4.14 - 4.5.13 - - io.grpc - grpc-bom - ${grpc.version} - pom - import - - - com.google.api - gax-bom - ${gax.version} - pom - import - com.google.cloud - grpc-gcp - ${grpc-gcp.version} - - - com.google.guava - guava-bom - ${guava.version} + first-party-dependencies + 2.1.1-SNAPSHOT pom import - - - com.google.protobuf - protobuf-bom - ${protobuf.version} - pom - import - - - - - org.apache.httpcomponents - httpcore - ${httpcomponents.httpcore.version} - - - org.apache.httpcomponents - httpclient - ${httpcomponents.httpclient.version} - - - - com.google.api - api-common - ${google.api-common.version} - - - com.google.api.grpc - proto-google-common-protos - ${google.common-protos.version} - - - com.google.api.grpc - grpc-google-common-protos - ${google.common-protos.version} - - - com.google.code.gson - gson - ${gson.version} - com.google.cloud - google-cloud-core-bom - ${google.core.version} - pom - import - - - com.google.auth - google-auth-library-bom - ${google.auth.version} - pom - import - - - com.google.http-client - google-http-client-bom - ${google.http-client.version} - pom - import - - - com.google.oauth-client - google-oauth-client-bom - ${google.oauth-client.version} - pom - import - - - com.google.api-client - google-api-client-bom - ${google.api-client.version} - pom - import - - - org.threeten - threetenbp - ${threeten.version} - - - javax.annotation - javax.annotation-api - ${javax.annotations.version} - - - org.codehaus.mojo - animal-sniffer-annotations - ${animal-sniffer.version} - - - com.google.api.grpc - proto-google-iam-v1 - ${iam.version} - - - com.google.code.findbugs - jsr305 - ${findbugs.version} - - - com.google.errorprone - error_prone_annotations - ${errorprone.version} - - - com.fasterxml.jackson - jackson-bom - ${jackson.version} + third-party-dependencies + 2.1.1-SNAPSHOT pom import - - commons-codec - commons-codec - ${codec.version} - - - - - io.opencensus - opencensus-api - ${opencensus.version} - - - io.opencensus - opencensus-contrib-grpc-util - ${opencensus.version} - - - io.opencensus - opencensus-contrib-http-util - ${opencensus.version} - - - io.opencensus - opencensus-contrib-zpages - ${opencensus.version} - - - io.opencensus - opencensus-exporter-stats-stackdriver - ${opencensus.version} - - - io.opencensus - opencensus-exporter-trace-stackdriver - ${opencensus.version} - - - io.opencensus - opencensus-impl - ${opencensus.version} - - - io.opencensus - opencensus-impl-core - ${opencensus.version} - - - - - com.google.api.grpc - grpc-google-iam-v1 - ${iam.version} - - - com.google.api - gax-grpc - ${gax.version} - testlib - - - com.google.cloud - google-cloud-core - ${google.core.version} - test-jar - - - com.google.cloud - google-cloud-core - ${google.core.version} - tests - diff --git a/third-party-dependencies/java.header b/third-party-dependencies/java.header new file mode 100644 index 00000000..d0970ba7 --- /dev/null +++ b/third-party-dependencies/java.header @@ -0,0 +1,15 @@ +^/\*$ +^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)$ +^ \*$ +^ \* 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$ +^ \*$ +^ \*[ ]+https?://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\.$ +^ \*/$ diff --git a/third-party-dependencies/license-checks.xml b/third-party-dependencies/license-checks.xml new file mode 100644 index 00000000..6597fced --- /dev/null +++ b/third-party-dependencies/license-checks.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/third-party-dependencies/pom.xml b/third-party-dependencies/pom.xml new file mode 100644 index 00000000..48b9f0ca --- /dev/null +++ b/third-party-dependencies/pom.xml @@ -0,0 +1,171 @@ + + + 4.0.0 + com.google.cloud + third-party-dependencies + pom + 2.1.1-SNAPSHOT + Google Cloud Third-party Shared Dependencies + https://github.com/googleapis/java-shared-dependencies + + Shared third-party dependencies for Google Cloud Java libraries. + + + + com.google.cloud + google-cloud-shared-config + 1.0.1 + + + + Google LLC + + + + scm:git:git@github.com:googleapis/java-shared-dependencies.git + scm:git:git@github.com:googleapis/java-shared-dependencies.git + https://github.com/googleapis/java-shared-dependencies + HEAD + + + + https://github.com/googleapis/java-shared-dependencies/issues + GitHub Issues + + + + + sonatype-nexus-snapshots + https://google.oss.sonatype.org/content/repositories/snapshots + + + sonatype-nexus-staging + https://google.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + + + UTF-8 + ${project.artifactId} + + 2.8.8 + 1.5.1 + 1.3.2 + 1.20 + 0.28.0 + 3.0.2 + 2.9.0 + 2.12.4 + 1.15 + 4.4.14 + 4.5.13 + + + + + + org.apache.httpcomponents + httpcore + ${httpcomponents.httpcore.version} + + + org.apache.httpcomponents + httpclient + ${httpcomponents.httpclient.version} + + + com.google.code.gson + gson + ${gson.version} + + + org.threeten + threetenbp + ${threeten.version} + + + javax.annotation + javax.annotation-api + ${javax.annotations.version} + + + org.codehaus.mojo + animal-sniffer-annotations + ${animal-sniffer.version} + + + com.google.code.findbugs + jsr305 + ${findbugs.version} + + + com.google.errorprone + error_prone_annotations + ${errorprone.version} + + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + + + commons-codec + commons-codec + ${codec.version} + + + + + io.opencensus + opencensus-api + ${opencensus.version} + + + io.opencensus + opencensus-contrib-grpc-util + ${opencensus.version} + + + io.opencensus + opencensus-contrib-http-util + ${opencensus.version} + + + io.opencensus + opencensus-contrib-zpages + ${opencensus.version} + + + io.opencensus + opencensus-exporter-stats-stackdriver + ${opencensus.version} + + + io.opencensus + opencensus-exporter-trace-stackdriver + ${opencensus.version} + + + io.opencensus + opencensus-impl + ${opencensus.version} + + + io.opencensus + opencensus-impl-core + ${opencensus.version} + + + + \ No newline at end of file