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

chore: regenerate common templates #274

Merged
merged 2 commits into from
Oct 20, 2020
Merged
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
6 changes: 4 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
# For syntax help see:
# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax

* @googleapis/api-logging @googleapis/yoshi-java
# The @googleapis/api-logging is the default owner for changes in this repo
* @googleapis/yoshi-java @googleapis/api-logging
**/*.java @googleapis/api-logging

# The java-samples-reviewers team is the default owner for samples changes
samples/**/*.java @googleapis/api-logging @googleapis/java-samples-reviewers
samples/**/*.java @googleapis/java-samples-reviewers
Empty file added .github/snippet-bot.yml
Empty file.
14 changes: 6 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ This project follows

To build, package, and run all unit tests run the command

```bash
```
mvn clean verify
```

### Running Integration tests

To include integration tests when building the project, you need access to
a GCP Project with a valid service account.
a GCP Project with a valid service account.

For instructions on how to generate a service account and corresponding
credentials JSON see: [Creating a Service Account][1].
Expand All @@ -57,15 +57,14 @@ Code Samples must be bundled in separate Maven modules, and guarded by a
Maven profile with the name `enable-samples`.

The samples must be separate from the primary project for a few reasons:

1. Primary projects have a minimum Java version of Java 7 whereas samples have
a minimum Java version of Java 8. Due to this we need the ability to
selectively exclude samples from a build run.
2. Many code samples depend on external GCP services and need
credentials to access the service.
3. Code samples are not released as Maven artifacts and must be excluded from
3. Code samples are not released as Maven artifacts and must be excluded from
release builds.

### Building

```bash
Expand Down Expand Up @@ -107,14 +106,13 @@ mvn -Penable-samples clean verify
Code in this repo is formatted with
[google-java-format](https://github.com/google/google-java-format).
To run formatting on your project, you can run:

```bash
```
mvn com.coveo:fmt-maven-plugin:format
```

### Profile Activation

To include code samples when building and testing the project, enable the
To include code samples when building and testing the project, enable the
`enable-samples` Maven profile.

#### Command line
Expand Down
5 changes: 3 additions & 2 deletions synth.metadata
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-errorreporting.git",
"sha": "c9cb50974d8c2fce2aeec3563a7f9800a32d5a25"
"sha": "1c7492e6d981d110ca6e31a2d2a9700d50c812ee"
}
},
{
Expand All @@ -19,7 +19,7 @@
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "7c5370937dd9ba9dcf9cd7d2af880a58b389b4f1"
"sha": "5a506ec8765cc04f7e29f888b8e9b257d9a7ae11"
}
}
],
Expand All @@ -42,6 +42,7 @@
".github/PULL_REQUEST_TEMPLATE.md",
".github/readme/synth.py",
".github/release-please.yml",
".github/snippet-bot.yml",
".github/trusted-contribution.yml",
".github/workflows/approve-readme.yaml",
".github/workflows/auto-release.yaml",
Expand Down