Skip to content
This repository was archived by the owner on Sep 19, 2023. It is now read-only.

chore: split the shared dependencies BOM into two (internally) #419

Merged
merged 4 commits into from
Aug 25, 2021
Merged

chore: split the shared dependencies BOM into two (internally) #419

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f49e78
chore: split the shared dependencies BOM into two
suztomo Aug 2, 2021
ee191c7
Merge branch 'master' into split_into_two
suztomo Aug 24, 2021
2ce7c2a
Merge remote-tracking branch 'origin/master' into split_into_two
suztomo Aug 25, 2021
3bd28c5
Merge remote-tracking branch 'origin/master' into split_into_two
suztomo Aug 25, 2021
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
15 changes: 15 additions & 0 deletions first-party-dependencies/java.header
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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\.$
^ \*/$
10 changes: 10 additions & 0 deletions first-party-dependencies/license-checks.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<module name="Checker">
<module name="RegexpHeader">
<property name="fileExtensions" value="java"/>
<property name="headerFile" value="${checkstyle.header.file}"/>
</module>
</module>
192 changes: 192 additions & 0 deletions first-party-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,192 @@
<?xml version="1.0" encoding="UTF-8"?>
Copy link

@lesv lesv Aug 24, 2021

Choose a reason for hiding this comment

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

License & Copyright?

Copy link
Member Author

@suztomo suztomo Aug 25, 2021

Choose a reason for hiding this comment

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

I don't find Yoshi Java repositories declare license and copyright in pom.xml files. I see <organization> and <license> elements, which I think should deliver License & Copyright.

<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>first-party-dependencies</artifactId>
<packaging>pom</packaging>
<version>1.4.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
<name>Google Cloud First-party Shared Dependencies</name>
<url>https://github.com/googleapis/java-shared-dependencies</url>
<description>
Shared first-party dependencies for Google Cloud Java libraries.
</description>

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>0.13.1</version>
</parent>

<organization>
<name>Google LLC</name>
</organization>

<scm>
<connection>scm:git:[email protected]:googleapis/java-shared-dependencies.git</connection>
<developerConnection>scm:git:[email protected]:googleapis/java-shared-dependencies.git</developerConnection>
<url>https://github.com/googleapis/java-shared-dependencies</url>
<tag>HEAD</tag>
</scm>

<issueManagement>
<url>https://github.com/googleapis/java-shared-dependencies/issues</url>
<system>GitHub Issues</system>
</issueManagement>

<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<url>https://google.oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<url>https://google.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<licenses>
<license>
<name>Apache-2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<site.installationModule>${project.artifactId}</site.installationModule>

<grpc.version>1.39.0</grpc.version>
<gax.version>1.67.0</gax.version>
<grpc-gcp.version>1.1.0</grpc-gcp.version>
<guava.version>30.1.1-android</guava.version>
<protobuf.version>3.17.3</protobuf.version>
<google.api-common.version>1.10.6</google.api-common.version>
<google.common-protos.version>2.3.2</google.common-protos.version>
<google.core.version>1.95.4</google.core.version>
<google.auth.version>1.0.0</google.auth.version>
<google.http-client.version>1.39.2</google.http-client.version>
<google.oauth-client.version>1.31.5</google.oauth-client.version>
<google.api-client.version>1.32.1</google.api-client.version>
<iam.version>1.0.14</iam.version>
Copy link
Member Author

@suztomo suztomo Aug 24, 2021

Choose a reason for hiding this comment

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

I need to update them to the latest versions.

</properties>
Copy link
Member Author

@suztomo suztomo Aug 25, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Values from master (b28723a)

    <grpc.version>1.40.0</grpc.version>
    <gax.version>2.3.0</gax.version>
    <grpc-gcp.version>1.1.0</grpc-gcp.version>
    <guava.version>30.1.1-jre</guava.version>
    <protobuf.version>3.17.3</protobuf.version>
    <google.api-common.version>2.0.1</google.api-common.version>
    <google.common-protos.version>2.3.2</google.common-protos.version>
    <google.core.version>2.1.1</google.core.version>
    <google.auth.version>1.1.0</google.auth.version>
    <google.http-client.version>1.39.2</google.http-client.version>
    <google.oauth-client.version>1.32.1</google.oauth-client.version>
    <google.api-client.version>1.32.1</google.api-client.version>
    <gson.version>2.8.8</gson.version>
    <threeten.version>1.5.1</threeten.version>
    <javax.annotations.version>1.3.2</javax.annotations.version>
    <animal-sniffer.version>1.20</animal-sniffer.version>
    <iam.version>1.1.0</iam.version>
    <opencensus.version>0.28.0</opencensus.version>
    <findbugs.version>3.0.2</findbugs.version>
    <errorprone.version>2.9.0</errorprone.version>
    <jackson.version>2.12.4</jackson.version>
    <codec.version>1.15</codec.version>
    <httpcomponents.httpcore.version>4.4.14</httpcomponents.httpcore.version>
    <httpcomponents.httpclient.version>4.5.13</httpcomponents.httpclient.version>


<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>${grpc.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-bom</artifactId>
<version>${gax.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>grpc-gcp</artifactId>
<version>${grpc-gcp.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-bom</artifactId>
<version>${guava.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
<version>${protobuf.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
<version>${google.api-common.version}</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
<version>${google.common-protos.version}</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-common-protos</artifactId>
<version>${google.common-protos.version}</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core-bom</artifactId>
<version>${google.core.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-bom</artifactId>
<version>${google.auth.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-bom</artifactId>
<version>${google.http-client.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client-bom</artifactId>
<version>${google.oauth-client.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client-bom</artifactId>
<version>${google.api-client.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-iam-v1</artifactId>
<version>${iam.version}</version>
</dependency>

<!-- Following test deps are kept to keep them consistent with versions above -->
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-iam-v1</artifactId>
<version>${iam.version}</version>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-grpc</artifactId>
<version>${gax.version}</version>
<classifier>testlib</classifier>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
<version>${google.core.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
<version>${google.core.version}</version>
<classifier>tests</classifier>
</dependency>
</dependencies>
</dependencyManagement>
</project>
Loading