diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 55158ab7..97f9ab1d 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -91,7 +91,6 @@ samples)
pushd ${SAMPLES_DIR}
mvn -B \
- -Penable-samples \
-ntp \
-DtrimStackTrace=false \
-Dclirr.skip=true \
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f95a97f..f4a367f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+### [2.2.5](https://www.github.com/googleapis/java-containeranalysis/compare/v2.2.4...v2.2.5) (2021-12-03)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.1 ([#769](https://www.github.com/googleapis/java-containeranalysis/issues/769)) ([4e8ef60](https://www.github.com/googleapis/java-containeranalysis/commit/4e8ef60afa02d1310e2e6f008d5ef76f95edd10b))
+
### [2.2.4](https://www.github.com/googleapis/java-containeranalysis/compare/v2.2.3...v2.2.4) (2021-11-17)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f2dbdee0..b65dd279 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -53,12 +53,12 @@ mvn -Penable-integration-tests clean verify
## Code Samples
-Code Samples must be bundled in separate Maven modules, and guarded by a
-Maven profile with the name `enable-samples`.
+All code samples must be in compliance with the [java sample formatting guide][3].
+Code Samples must be bundled in separate Maven modules.
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
+1. Primary projects have a minimum Java version of Java 8 whereas samples can have
+ Java version of Java 11. 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.
@@ -68,39 +68,16 @@ The samples must be separate from the primary project for a few reasons:
### Building
```bash
-mvn -Penable-samples clean verify
+mvn clean verify
```
Some samples require access to GCP services and require a service account:
```bash
export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json
-mvn -Penable-samples clean verify
+mvn clean verify
```
-### Profile Config
-
-1. To add samples in a profile to your Maven project, add the following to your
-`pom.xml`
-
- ```xml
-
- [...]
-
-
- enable-samples
-
- sample
-
-
-
- [...]
-
- ```
-
-2. [Activate](#profile-activation) the profile.
-3. Define your samples in a normal Maven project in the `samples/` directory.
-
### Code Formatting
Code in this repo is formatted with
@@ -110,30 +87,6 @@ To run formatting on your project, you can run:
mvn com.coveo:fmt-maven-plugin:format
```
-### Profile Activation
-
-To include code samples when building and testing the project, enable the
-`enable-samples` Maven profile.
-
-#### Command line
-
-To activate the Maven profile on the command line add `-Penable-samples` to your
-Maven command.
-
-#### Maven `settings.xml`
-
-To activate the Maven profile in your `~/.m2/settings.xml` add an entry of
-`enable-samples` following the instructions in [Active Profiles][2].
-
-This method has the benefit of applying to all projects you build (and is
-respected by IntelliJ IDEA) and is recommended if you are going to be
-contributing samples to several projects.
-
-#### IntelliJ IDEA
-
-To activate the Maven Profile inside IntelliJ IDEA, follow the instructions in
-[Activate Maven profiles][3] to activate `enable-samples`.
-
[1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account
[2]: https://maven.apache.org/settings.html#Active_Profiles
-[3]: https://www.jetbrains.com/help/idea/work-with-maven-profiles.html#activate_maven_profiles
+[3]: https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md
\ No newline at end of file
diff --git a/google-cloud-containeranalysis-bom/pom.xml b/google-cloud-containeranalysis-bom/pom.xml
index 60737556..6ba5c21e 100644
--- a/google-cloud-containeranalysis-bom/pom.xml
+++ b/google-cloud-containeranalysis-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-containeranalysis-bom
- 2.2.4
+ 2.2.5
pom
com.google.cloud
@@ -53,27 +53,27 @@
com.google.api.grpc
proto-google-cloud-containeranalysis-v1
- 2.2.4
+ 2.2.5
com.google.api.grpc
grpc-google-cloud-containeranalysis-v1beta1
- 0.92.4
+ 0.92.5
com.google.cloud
google-cloud-containeranalysis
- 2.2.4
+ 2.2.5
com.google.api.grpc
grpc-google-cloud-containeranalysis-v1
- 2.2.4
+ 2.2.5
com.google.api.grpc
proto-google-cloud-containeranalysis-v1beta1
- 0.92.4
+ 0.92.5
diff --git a/google-cloud-containeranalysis/pom.xml b/google-cloud-containeranalysis/pom.xml
index 43ac5365..232d309e 100644
--- a/google-cloud-containeranalysis/pom.xml
+++ b/google-cloud-containeranalysis/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-containeranalysis
- 2.2.4
+ 2.2.5
jar
Google Cloud Container Analysis
https://github.com/googleapis/java-containeranalysis
@@ -11,7 +11,7 @@
com.google.cloud
google-cloud-containeranalysis-parent
- 2.2.4
+ 2.2.5
google-cloud-containeranalysis
diff --git a/grpc-google-cloud-containeranalysis-v1/pom.xml b/grpc-google-cloud-containeranalysis-v1/pom.xml
index a2b07266..ddcaac57 100644
--- a/grpc-google-cloud-containeranalysis-v1/pom.xml
+++ b/grpc-google-cloud-containeranalysis-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-containeranalysis-v1
- 2.2.4
+ 2.2.5
grpc-google-cloud-containeranalysis-v1
GRPC library for grpc-google-cloud-containeranalysis-v1
com.google.cloud
google-cloud-containeranalysis-parent
- 2.2.4
+ 2.2.5
diff --git a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml
index a86ff7b3..76a6d44b 100644
--- a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml
+++ b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-containeranalysis-v1beta1
- 0.92.4
+ 0.92.5
grpc-google-cloud-containeranalysis-v1beta1
GRPC library for grpc-google-cloud-containeranalysis-v1beta1
com.google.cloud
google-cloud-containeranalysis-parent
- 2.2.4
+ 2.2.5
diff --git a/pom.xml b/pom.xml
index 6abe4020..10584705 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-containeranalysis-parent
pom
- 2.2.4
+ 2.2.5
Google Cloud Container Analysis Parent
https://github.com/googleapis/java-containeranalysis
@@ -61,33 +61,33 @@
com.google.api.grpc
proto-google-cloud-containeranalysis-v1
- 2.2.4
+ 2.2.5
com.google.api.grpc
proto-google-cloud-containeranalysis-v1beta1
- 0.92.4
+ 0.92.5
com.google.api.grpc
grpc-google-cloud-containeranalysis-v1beta1
- 0.92.4
+ 0.92.5
com.google.api.grpc
grpc-google-cloud-containeranalysis-v1
- 2.2.4
+ 2.2.5
com.google.cloud
google-cloud-containeranalysis
- 2.2.4
+ 2.2.5
com.google.cloud
google-cloud-shared-dependencies
- 2.5.0
+ 2.5.1
pom
import
diff --git a/proto-google-cloud-containeranalysis-v1/pom.xml b/proto-google-cloud-containeranalysis-v1/pom.xml
index f8c68de6..92447ad2 100644
--- a/proto-google-cloud-containeranalysis-v1/pom.xml
+++ b/proto-google-cloud-containeranalysis-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-containeranalysis-v1
- 2.2.4
+ 2.2.5
proto-google-cloud-containeranalysis-v1
PROTO library for proto-google-cloud-containeranalysis-v1
com.google.cloud
google-cloud-containeranalysis-parent
- 2.2.4
+ 2.2.5
diff --git a/proto-google-cloud-containeranalysis-v1beta1/pom.xml b/proto-google-cloud-containeranalysis-v1beta1/pom.xml
index 11d8a138..d3cd78a3 100644
--- a/proto-google-cloud-containeranalysis-v1beta1/pom.xml
+++ b/proto-google-cloud-containeranalysis-v1beta1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-containeranalysis-v1beta1
- 0.92.4
+ 0.92.5
proto-google-cloud-containeranalysis-v1beta1
PROTO library for proto-google-cloud-containeranalysis-v1beta1
com.google.cloud
google-cloud-containeranalysis-parent
- 2.2.4
+ 2.2.5
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index c4cf0f80..82ec6e5a 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
com.google.cloud
google-cloud-containeranalysis
- 2.2.2
+ 2.2.4
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index b06ab623..1721a706 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-containeranalysis
- 2.2.2
+ 2.2.4
diff --git a/synth.metadata b/synth.metadata
index 0fefbf7a..b0a16197 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-containeranalysis.git",
- "sha": "6879348f400b676ca6683a3abf2a7ebfce52dc7d"
+ "sha": "420df4766edf0cfb50e9b1aadf47a616e880c211"
}
},
{
@@ -19,7 +19,7 @@
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
- "sha": "42a3786737c17ece39924d7025f3be481812da53"
+ "sha": "7a7c48f96e90d1cdc3ab0cc8293279fdcb10fd36"
}
}
],
diff --git a/versions.txt b/versions.txt
index 8b35caf7..d6934dd7 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
# Format:
# module:released-version:current-version
-proto-google-cloud-containeranalysis-v1:2.2.4:2.2.4
-proto-google-cloud-containeranalysis-v1beta1:0.92.4:0.92.4
-grpc-google-cloud-containeranalysis-v1beta1:0.92.4:0.92.4
-grpc-google-cloud-containeranalysis-v1:2.2.4:2.2.4
-google-cloud-containeranalysis:2.2.4:2.2.4
+proto-google-cloud-containeranalysis-v1:2.2.5:2.2.5
+proto-google-cloud-containeranalysis-v1beta1:0.92.5:0.92.5
+grpc-google-cloud-containeranalysis-v1beta1:0.92.5:0.92.5
+grpc-google-cloud-containeranalysis-v1:2.2.5:2.2.5
+google-cloud-containeranalysis:2.2.5:2.2.5