Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Add java-vision diff between monorepo and split-repo #8472

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
90 changes: 4 additions & 86 deletions java-vision/README.md

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions java-vision/google-cloud-vision-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,57 +54,57 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-vision</artifactId>
<version>3.1.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-vision:current} -->
<version>3.1.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-vision:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-vision-v1p3beta1</artifactId>
<version>0.90.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-vision-v1p3beta1:current} -->
<version>0.90.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-vision-v1p3beta1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-vision-v1p1beta1</artifactId>
<version>0.90.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-vision-v1p1beta1:current} -->
<version>0.90.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-vision-v1p1beta1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-vision-v1p4beta1</artifactId>
<version>0.90.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-vision-v1p4beta1:current} -->
<version>0.90.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-vision-v1p4beta1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-vision-v1p2beta1</artifactId>
<version>3.1.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-vision-v1p2beta1:current} -->
<version>3.1.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-vision-v1p2beta1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-vision-v1</artifactId>
<version>3.1.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-vision-v1:current} -->
<version>3.1.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-vision-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-vision-v1p4beta1</artifactId>
<version>0.90.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-vision-v1p4beta1:current} -->
<version>0.90.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-vision-v1p4beta1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-vision-v1</artifactId>
<version>3.1.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-vision-v1:current} -->
<version>3.1.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-vision-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-vision-v1p1beta1</artifactId>
<version>0.90.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-vision-v1p1beta1:current} -->
<version>0.90.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-vision-v1p1beta1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-vision-v1p3beta1</artifactId>
<version>0.90.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-vision-v1p3beta1:current} -->
<version>0.90.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-vision-v1p3beta1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-vision-v1p2beta1</artifactId>
<version>3.1.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-vision-v1p2beta1:current} -->
<version>3.1.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-vision-v1p2beta1:current} -->
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ public float getScore() {
* <code>float confidence = 5 [deprecated = true];</code>
*
* @deprecated google.cloud.vision.v1p4beta1.EntityAnnotation.confidence is deprecated. See
* google/cloud/vision/v1p4beta1/image_annotator.proto;l=477
* google/cloud/vision/v1p4beta1/image_annotator.proto;l=478
* @return The confidence.
*/
@java.lang.Override
Expand Down Expand Up @@ -1562,7 +1562,7 @@ public Builder clearScore() {
* <code>float confidence = 5 [deprecated = true];</code>
*
* @deprecated google.cloud.vision.v1p4beta1.EntityAnnotation.confidence is deprecated. See
* google/cloud/vision/v1p4beta1/image_annotator.proto;l=477
* google/cloud/vision/v1p4beta1/image_annotator.proto;l=478
* @return The confidence.
*/
@java.lang.Override
Expand All @@ -1584,7 +1584,7 @@ public float getConfidence() {
* <code>float confidence = 5 [deprecated = true];</code>
*
* @deprecated google.cloud.vision.v1p4beta1.EntityAnnotation.confidence is deprecated. See
* google/cloud/vision/v1p4beta1/image_annotator.proto;l=477
* google/cloud/vision/v1p4beta1/image_annotator.proto;l=478
* @param value The confidence to set.
* @return This builder for chaining.
*/
Expand All @@ -1609,7 +1609,7 @@ public Builder setConfidence(float value) {
* <code>float confidence = 5 [deprecated = true];</code>
*
* @deprecated google.cloud.vision.v1p4beta1.EntityAnnotation.confidence is deprecated. See
* google/cloud/vision/v1p4beta1/image_annotator.proto;l=477
* google/cloud/vision/v1p4beta1/image_annotator.proto;l=478
* @return This builder for chaining.
*/
@java.lang.Deprecated
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public interface EntityAnnotationOrBuilder
* <code>float confidence = 5 [deprecated = true];</code>
*
* @deprecated google.cloud.vision.v1p4beta1.EntityAnnotation.confidence is deprecated. See
* google/cloud/vision/v1p4beta1/image_annotator.proto;l=477
* google/cloud/vision/v1p4beta1/image_annotator.proto;l=478
* @return The confidence.
*/
@java.lang.Deprecated
Expand Down
74 changes: 74 additions & 0 deletions java-vision/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"extends": [
":separateMajorReleases",
":combinePatchMinorReleases",
":ignoreUnstable",
":prImmediately",
":updateNotScheduled",
":automergeDisabled",
":ignoreModulesAndTests",
":maintainLockFilesDisabled",
":autodetectPinVersions"
],
"packageRules": [
{
"packagePatterns": [
"^com.google.guava:"
],
"versionScheme": "docker"
},
{
"packagePatterns": [
"*"
],
"semanticCommitType": "deps",
"semanticCommitScope": null
},
{
"packagePatterns": [
"^org.apache.maven",
"^org.jacoco:",
"^org.codehaus.mojo:",
"^org.sonatype.plugins:",
"^com.coveo:",
"^com.google.cloud:google-cloud-shared-config"
],
"semanticCommitType": "build",
"semanticCommitScope": "deps"
},
{
"packagePatterns": [
"^com.google.cloud:google-cloud-vision",
"^com.google.cloud:libraries-bom",
"^com.google.cloud.samples:shared-configuration"
],
"semanticCommitType": "chore",
"semanticCommitScope": "deps"
},
{
"packagePatterns": [
"^junit:junit",
"^com.google.truth:truth",
"^org.mockito:mockito-core",
"^org.objenesis:objenesis",
"^com.google.cloud:google-cloud-conformance-tests"
],
"semanticCommitType": "test",
"semanticCommitScope": "deps"
},
{
"packagePatterns": [
"^com.google.cloud:google-cloud-"
],
"ignoreUnstable": false
},
{
"packagePatterns": [
"^com.fasterxml.jackson.core"
],
"groupName": "jackson dependencies"
}
],
"semanticCommits": true,
"dependencyDashboard": true
}
84 changes: 84 additions & 0 deletions java-vision/samples/install-without-bom/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<?xml version='1.0' encoding='UTF-8'?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>-install-without-bom</artifactId>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here as well

<packaging>jar</packaging>
<name>Google Cloud Vision Install Without Bom</name>
<url>https://github.com/googleapis/java-vision</url>

<!--
The parent pom defines common style checks and testing strategies for our samples.
Removing or replacing it should not affect the execution of the samples in anyway.
-->
<parent>
<groupId>com.google.cloud.samples</groupId>
<artifactId>shared-configuration</artifactId>
<version>1.2.0</version>
</parent>

<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>


<dependencies>
<!-- [START _install_without_bom] -->
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-vision</artifactId>
<version>3.1.1</version>
</dependency>
<!-- [END _install_without_bom] -->

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>1.1.3</version>
<scope>test</scope>
</dependency>
</dependencies>

<!-- compile and run all snippet tests -->
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>add-snippets-source</id>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>../snippets/src/main/java</source>
</sources>
</configuration>
</execution>
<execution>
<id>add-snippets-tests</id>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>../snippets/src/test/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
56 changes: 56 additions & 0 deletions java-vision/samples/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version='1.0' encoding='UTF-8'?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud--samples</artifactId>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<version>0.0.1-SNAPSHOT</version><!-- This artifact should not be released -->
<packaging>pom</packaging>
<name>Google Cloud Vision Samples Parent</name>
<url>https://github.com/googleapis/java-vision</url>
<description>
Java idiomatic client for Google Cloud Platform services.
</description>

<!--
The parent pom defines common style checks and testing strategies for our samples.
Removing or replacing it should not affect the execution of the samples in any way.
-->
<parent>
<groupId>com.google.cloud.samples</groupId>
<artifactId>shared-configuration</artifactId>
<version>1.2.0</version>
</parent>

<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<modules>
<module>install-without-bom</module>
<module>snapshot</module>
<module>snippets</module>
</modules>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<configuration>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
</configuration>
</plugin>
</plugins>
</build>
</project>
Loading