From 5b6843626d22d623060fe2966da3e73463892e5d Mon Sep 17 00:00:00 2001
From: yangnuoyu <46553752+yangnuoyu@users.noreply.github.com>
Date: Wed, 17 Jun 2020 15:34:08 -0700
Subject: [PATCH] feat(deps): adopt flatten plugin and
google-cloud-shared-dependencies (#116)
---
.gitignore | 4 +-
google-cloud-document-ai/pom.xml | 211 +++++----
grpc-google-cloud-document-ai-v1beta1/pom.xml | 115 ++---
grpc-google-cloud-document-ai-v1beta2/pom.xml | 115 ++---
pom.xml | 433 ++++++++----------
.../pom.xml | 51 ++-
.../pom.xml | 51 ++-
7 files changed, 482 insertions(+), 498 deletions(-)
diff --git a/.gitignore b/.gitignore
index 84dac387..8f493fec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,4 +43,6 @@ api_key
# Python utilities
*.pyc
artman-genfiles
-venv
\ No newline at end of file
+venv
+
+.flattened-pom.xml
diff --git a/google-cloud-document-ai/pom.xml b/google-cloud-document-ai/pom.xml
index 2c7a34b6..b0e36d41 100644
--- a/google-cloud-document-ai/pom.xml
+++ b/google-cloud-document-ai/pom.xml
@@ -1,110 +1,119 @@
- 4.0.0
+ 4.0.0
+ com.google.cloud
+ google-cloud-document-ai
+ 0.1.2-SNAPSHOT
+ jar
+ Google Cloud Document AI
+ https://github.com/googleapis/java-documentai
+ Java idiomatic client for Google Cloud Document AI
+
com.google.cloud
- google-cloud-document-ai
+ google-cloud-document-ai-parent
0.1.2-SNAPSHOT
- jar
- Google Cloud Document AI
- https://github.com/googleapis/java-documentai
- Java idiomatic client for Google Cloud Document AI
-
- com.google.cloud
- google-cloud-document-ai-parent
- 0.1.2-SNAPSHOT
-
-
- google-cloud-document-ai
-
-
-
- io.grpc
- grpc-api
-
-
- io.grpc
- grpc-stub
-
-
- io.grpc
- grpc-protobuf
-
-
- com.google.api
- api-common
-
-
- com.google.protobuf
- protobuf-java
-
-
- com.google.api.grpc
- proto-google-common-protos
-
+
+
+ google-cloud-document-ai
+
+
+
+ io.grpc
+ grpc-api
+
+
+ io.grpc
+ grpc-stub
+
+
+ io.grpc
+ grpc-protobuf
+
+
+ com.google.api
+ api-common
+
+
+ com.google.protobuf
+ protobuf-java
+
+
+ com.google.api.grpc
+ proto-google-common-protos
+
-
- com.google.api.grpc
- proto-google-cloud-document-ai-v1beta1
-
-
- com.google.api.grpc
- proto-google-cloud-document-ai-v1beta2
-
-
- com.google.guava
- guava
-
-
- com.google.api
- gax
-
-
- com.google.api
- gax-grpc
-
-
- org.threeten
- threetenbp
-
+
+ com.google.api.grpc
+ proto-google-cloud-document-ai-v1beta1
+
+
+ com.google.api.grpc
+ proto-google-cloud-document-ai-v1beta2
+
+
+ com.google.guava
+ guava
+
+
+ com.google.api
+ gax
+
+
+ com.google.api
+ gax-grpc
+
+
+ org.threeten
+ threetenbp
+
-
-
- junit
- junit
- test
-
-
- com.google.api.grpc
- grpc-google-cloud-document-ai-v1beta1
- test
-
-
- com.google.api.grpc
- grpc-google-cloud-document-ai-v1beta2
- test
-
+
+
+ junit
+ junit
+ test
+
+
+ com.google.api.grpc
+ grpc-google-cloud-document-ai-v1beta1
+ test
+
+
+ com.google.api.grpc
+ grpc-google-cloud-document-ai-v1beta2
+ test
+
-
-
- com.google.api
- gax-grpc
- testlib
- test
-
-
+
+
+ com.google.api
+ gax-grpc
+ testlib
+ test
+
+
+
+
+
+ java9
+
+ [9,)
+
+
+
+ javax.annotation
+ javax.annotation-api
+
+
+
+
-
-
- java9
-
- [9,)
-
-
-
- javax.annotation
- javax.annotation-api
-
-
-
-
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/grpc-google-cloud-document-ai-v1beta1/pom.xml b/grpc-google-cloud-document-ai-v1beta1/pom.xml
index a258e51d..3d7b6372 100644
--- a/grpc-google-cloud-document-ai-v1beta1/pom.xml
+++ b/grpc-google-cloud-document-ai-v1beta1/pom.xml
@@ -1,59 +1,68 @@
- 4.0.0
- com.google.api.grpc
- grpc-google-cloud-document-ai-v1beta1
- 0.1.2-SNAPSHOT
- grpc-google-cloud-document-ai-v1beta1
- GRPC library for grpc-google-cloud-document-ai-v1beta1
-
- com.google.cloud
- google-cloud-document-ai-parent
- 0.1.2-SNAPSHOT
-
-
-
- io.grpc
- grpc-api
-
-
- io.grpc
- grpc-stub
-
-
- io.grpc
- grpc-protobuf
-
-
- com.google.protobuf
- protobuf-java
-
-
- com.google.api.grpc
- proto-google-common-protos
-
-
- com.google.api.grpc
- proto-google-cloud-document-ai-v1beta1
-
+ 4.0.0
+ com.google.api.grpc
+ grpc-google-cloud-document-ai-v1beta1
+ 0.1.2-SNAPSHOT
+ grpc-google-cloud-document-ai-v1beta1
+ GRPC library for grpc-google-cloud-document-ai-v1beta1
+
+ com.google.cloud
+ google-cloud-document-ai-parent
+ 0.1.2-SNAPSHOT
+
+
+
+ io.grpc
+ grpc-api
+
+
+ io.grpc
+ grpc-stub
+
+
+ io.grpc
+ grpc-protobuf
+
+
+ com.google.protobuf
+ protobuf-java
+
+
+ com.google.api.grpc
+ proto-google-common-protos
+
+
+ com.google.api.grpc
+ proto-google-cloud-document-ai-v1beta1
+
+
+ com.google.guava
+ guava
+
+
+
+
+
+ java9
+
+ [9,)
+
+
- com.google.guava
- guava
+ javax.annotation
+ javax.annotation-api
-
+
+
+
-
-
- java9
-
- [9,)
-
-
-
- javax.annotation
- javax.annotation-api
-
-
-
-
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/grpc-google-cloud-document-ai-v1beta2/pom.xml b/grpc-google-cloud-document-ai-v1beta2/pom.xml
index e23d7565..ce34d1be 100644
--- a/grpc-google-cloud-document-ai-v1beta2/pom.xml
+++ b/grpc-google-cloud-document-ai-v1beta2/pom.xml
@@ -1,59 +1,68 @@
- 4.0.0
- com.google.api.grpc
- grpc-google-cloud-document-ai-v1beta2
- 0.1.2-SNAPSHOT
- grpc-google-cloud-document-ai-v1beta2
- GRPC library for grpc-google-cloud-document-ai-v1beta2
-
- com.google.cloud
- google-cloud-document-ai-parent
- 0.1.2-SNAPSHOT
-
-
-
- io.grpc
- grpc-api
-
-
- io.grpc
- grpc-stub
-
-
- io.grpc
- grpc-protobuf
-
-
- com.google.protobuf
- protobuf-java
-
-
- com.google.api.grpc
- proto-google-common-protos
-
-
- com.google.api.grpc
- proto-google-cloud-document-ai-v1beta2
-
+ 4.0.0
+ com.google.api.grpc
+ grpc-google-cloud-document-ai-v1beta2
+ 0.1.2-SNAPSHOT
+ grpc-google-cloud-document-ai-v1beta2
+ GRPC library for grpc-google-cloud-document-ai-v1beta2
+
+ com.google.cloud
+ google-cloud-document-ai-parent
+ 0.1.2-SNAPSHOT
+
+
+
+ io.grpc
+ grpc-api
+
+
+ io.grpc
+ grpc-stub
+
+
+ io.grpc
+ grpc-protobuf
+
+
+ com.google.protobuf
+ protobuf-java
+
+
+ com.google.api.grpc
+ proto-google-common-protos
+
+
+ com.google.api.grpc
+ proto-google-cloud-document-ai-v1beta2
+
+
+ com.google.guava
+ guava
+
+
+
+
+
+ java9
+
+ [9,)
+
+
- com.google.guava
- guava
+ javax.annotation
+ javax.annotation-api
-
+
+
+
-
-
- java9
-
- [9,)
-
-
-
- javax.annotation
- javax.annotation-api
-
-
-
-
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index de62ea96..c3873785 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,264 +1,201 @@
- 4.0.0
- com.google.cloud
- google-cloud-document-ai-parent
- pom
- 0.1.2-SNAPSHOT
- Google Cloud Document AI Parent
- https://github.com/googleapis/java-documentai
-
+ 4.0.0
+ com.google.cloud
+ google-cloud-document-ai-parent
+ pom
+ 0.1.2-SNAPSHOT
+ Google Cloud Document AI Parent
+ https://github.com/googleapis/java-documentai
+
Java idiomatic client for Google Cloud Platform services.
-
- com.google.cloud
- google-cloud-shared-config
- 0.8.1
-
-
-
-
- chingor
- Jeff Ching
- chingor@google.com
- Google
-
- Developer
-
-
-
-
- Google LLC
-
-
- scm:git:git@github.com:googleapis/java-documentai.git
- scm:git:git@github.com:googleapis/java-documentai.git
- https://github.com/googleapis/java-documentai
- HEAD
-
-
- https://github.com/googleapis/java-documentai/issues
- GitHub Issues
-
-
-
- sonatype-nexus-snapshots
- https://oss.sonatype.org/content/repositories/snapshots
-
-
- sonatype-nexus-staging
- https://oss.sonatype.org/service/local/staging/deploy/maven2/
-
-
-
-
- Apache-2.0
- https://www.apache.org/licenses/LICENSE-2.0.txt
-
-
+
+ com.google.cloud
+ google-cloud-shared-config
+ 0.8.1
+
-
- UTF-8
- UTF-8
- github
- google-cloud-document-ai-parent
- 1.93.2
- 1.9.2
- 1.18.0
- 1.56.0
- 1.30.0
- 3.12.2
- 4.13
- 29.0-android
- 1.4.4
- 1.3.2
- 1.18
-
+
+
+ chingor
+ Jeff Ching
+ chingor@google.com
+ Google
+
+ Developer
+
+
+
+
+ Google LLC
+
+
+ scm:git:git@github.com:googleapis/java-documentai.git
+ scm:git:git@github.com:googleapis/java-documentai.git
+ https://github.com/googleapis/java-documentai
+ HEAD
+
+
+ https://github.com/googleapis/java-documentai/issues
+ GitHub Issues
+
+
+
+ sonatype-nexus-snapshots
+ https://oss.sonatype.org/content/repositories/snapshots
+
+
+ sonatype-nexus-staging
+ https://oss.sonatype.org/service/local/staging/deploy/maven2/
+
+
+
+
+ Apache-2.0
+ https://www.apache.org/licenses/LICENSE-2.0.txt
+
+
-
-
-
- com.google.api.grpc
- grpc-google-cloud-document-ai-v1beta1
- 0.1.2-SNAPSHOT
-
-
- com.google.api.grpc
- grpc-google-cloud-document-ai-v1beta2
- 0.1.2-SNAPSHOT
-
-
- com.google.api.grpc
- proto-google-cloud-document-ai-v1beta1
- 0.1.2-SNAPSHOT
-
-
- com.google.api.grpc
- proto-google-cloud-document-ai-v1beta2
- 0.1.2-SNAPSHOT
-
+
+ UTF-8
+ UTF-8
+ github
+ google-cloud-document-ai-parent
+
+
+
+
+ com.google.api.grpc
+ grpc-google-cloud-document-ai-v1beta1
+ 0.1.2-SNAPSHOT
+
+
+ com.google.api.grpc
+ grpc-google-cloud-document-ai-v1beta2
+ 0.1.2-SNAPSHOT
+
+
+ com.google.api.grpc
+ proto-google-cloud-document-ai-v1beta1
+ 0.1.2-SNAPSHOT
+
+
+ com.google.api.grpc
+ proto-google-cloud-document-ai-v1beta2
+ 0.1.2-SNAPSHOT
+
-
- io.grpc
- grpc-bom
- ${grpc.version}
- pom
- import
-
-
- com.google.api
- gax-bom
- ${gax.version}
- pom
- import
-
-
- com.google.guava
- guava-bom
- ${guava.version}
- pom
- import
-
-
- com.google.protobuf
- protobuf-java
- ${protobuf.version}
-
-
- com.google.api
- api-common
- ${google.api-common.version}
-
-
- com.google.api.grpc
- proto-google-common-protos
- ${google.common-protos.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.cloud
+ google-cloud-shared-dependencies
+ 0.8.1
+ pom
+ import
+
-
- junit
- junit
- ${junit.version}
- test
-
-
- com.google.api
- gax-grpc
- ${gax.version}
- testlib
- test
-
-
-
+
+ junit
+ junit
+ 4.13
+ test
+
+
+
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
- org.objenesis:objenesis
-
-
-
-
-
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+ org.objenesis:objenesis
+
+
+
+
+
-
- proto-google-cloud-document-ai-v1beta1
- proto-google-cloud-document-ai-v1beta2
- grpc-google-cloud-document-ai-v1beta1
- grpc-google-cloud-document-ai-v1beta2
- google-cloud-document-ai
- google-cloud-document-ai-bom
-
+
+ proto-google-cloud-document-ai-v1beta1
+ proto-google-cloud-document-ai-v1beta2
+ grpc-google-cloud-document-ai-v1beta1
+ grpc-google-cloud-document-ai-v1beta2
+ google-cloud-document-ai
+ google-cloud-document-ai-bom
+
-
-
-
- org.apache.maven.plugins
- maven-project-info-reports-plugin
- 3.1.0
-
-
-
- index
- dependency-info
- team
- ci-management
- issue-management
- licenses
- scm
- dependency-management
- distribution-management
- summary
- modules
-
-
-
-
- true
- ${site.installationModule}
- jar
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- 3.2.0
-
-
- html
-
- aggregate
- javadoc
-
-
-
-
- none
- protected
- true
- ${project.build.directory}/javadoc
-
-
- Test helpers packages
- com.google.cloud.testing
-
-
- SPI packages
- com.google.cloud.spi*
-
-
+
+
+
+ org.apache.maven.plugins
+ maven-project-info-reports-plugin
+ 3.1.0
+
+
+
+ index
+ dependency-info
+ team
+ ci-management
+ issue-management
+ licenses
+ scm
+ dependency-management
+ distribution-management
+ summary
+ modules
+
+
+
+
+ true
+ ${site.installationModule}
+ jar
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ 3.2.0
+
+
+ html
+
+ aggregate
+ javadoc
+
+
+
+
+ none
+ protected
+ true
+ ${project.build.directory}/javadoc
+
+
+ Test helpers packages
+ com.google.cloud.testing
+
+
+ SPI packages
+ com.google.cloud.spi*
+
+
-
- https://grpc.io/grpc-java/javadoc/
- https://developers.google.com/protocol-buffers/docs/reference/java/
- https://googleapis.dev/java/google-auth-library/latest/
- https://googleapis.dev/java/gax/latest/
- https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/
-
-
-
-
-
+
+ https://grpc.io/grpc-java/javadoc/
+ https://developers.google.com/protocol-buffers/docs/reference/java/
+ https://googleapis.dev/java/google-auth-library/latest/
+ https://googleapis.dev/java/gax/latest/
+ https://googleapis.github.io/api-common-java/
+
+
+
+
+
\ No newline at end of file
diff --git a/proto-google-cloud-document-ai-v1beta1/pom.xml b/proto-google-cloud-document-ai-v1beta1/pom.xml
index 6237d996..ec0aadd4 100644
--- a/proto-google-cloud-document-ai-v1beta1/pom.xml
+++ b/proto-google-cloud-document-ai-v1beta1/pom.xml
@@ -1,24 +1,33 @@
- 4.0.0
- com.google.api.grpc
- proto-google-cloud-document-ai-v1beta1
- 0.1.2-SNAPSHOT
- proto-google-cloud-document-ai-v1beta1
- PROTO library for proto-google-cloud-document-ai-v1beta1
-
- com.google.cloud
- google-cloud-document-ai-parent
- 0.1.2-SNAPSHOT
-
-
-
- com.google.protobuf
- protobuf-java
-
-
- com.google.api.grpc
- proto-google-common-protos
-
-
+ 4.0.0
+ com.google.api.grpc
+ proto-google-cloud-document-ai-v1beta1
+ 0.1.2-SNAPSHOT
+ proto-google-cloud-document-ai-v1beta1
+ PROTO library for proto-google-cloud-document-ai-v1beta1
+
+ com.google.cloud
+ google-cloud-document-ai-parent
+ 0.1.2-SNAPSHOT
+
+
+
+ com.google.protobuf
+ protobuf-java
+
+
+ com.google.api.grpc
+ proto-google-common-protos
+
+
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/proto-google-cloud-document-ai-v1beta2/pom.xml b/proto-google-cloud-document-ai-v1beta2/pom.xml
index ec5faab2..354f041e 100644
--- a/proto-google-cloud-document-ai-v1beta2/pom.xml
+++ b/proto-google-cloud-document-ai-v1beta2/pom.xml
@@ -1,24 +1,33 @@
- 4.0.0
- com.google.api.grpc
- proto-google-cloud-document-ai-v1beta2
- 0.1.2-SNAPSHOT
- proto-google-cloud-document-ai-v1beta2
- PROTO library for proto-google-cloud-document-ai-v1beta2
-
- com.google.cloud
- google-cloud-document-ai-parent
- 0.1.2-SNAPSHOT
-
-
-
- com.google.protobuf
- protobuf-java
-
-
- com.google.api.grpc
- proto-google-common-protos
-
-
+ 4.0.0
+ com.google.api.grpc
+ proto-google-cloud-document-ai-v1beta2
+ 0.1.2-SNAPSHOT
+ proto-google-cloud-document-ai-v1beta2
+ PROTO library for proto-google-cloud-document-ai-v1beta2
+
+ com.google.cloud
+ google-cloud-document-ai-parent
+ 0.1.2-SNAPSHOT
+
+
+
+ com.google.protobuf
+ protobuf-java
+
+
+ com.google.api.grpc
+ proto-google-common-protos
+
+
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file