diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index d7abbc602..35478afe3 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
- digest: sha256:3387f93d4577788512112ff69ddab746ae9192ddd9f13cfd175ef310d62d7d30
+ digest: sha256:8dd8395defb6a5069b0b10c435058bf13980606ba1967e2b3925ed50fc3cb22f
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 1104d1e36..8deb35478 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -70,13 +70,13 @@ integration)
RETURN_CODE=$?
;;
graalvm)
- # Run Unit and Integration Tests with Native Image
- mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
+ # Run Unit and Integration Tests with Native Image. Skip tests that use mocking libs
+ mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test "-Dtest=!LoggingAppenderTest"
RETURN_CODE=$?
;;
graalvm17)
# Run Unit and Integration Tests with Native Image
- mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
+ mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test "-Dtest=!LoggingAppenderTest"
RETURN_CODE=$?
;;
samples)
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index e20330c3c..f52533545 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.0"
+ value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.2"
}
env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 0fd6ba2fa..44b100487 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.0"
+ value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.2"
}
env_vars: {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb9892bae..d9d816ea4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,21 @@
# Changelog
+## [0.130.12-alpha](https://github.com/googleapis/java-logging-logback/compare/v0.129.11...v0.130.12-alpha) (2023-05-15)
+
+
+### Bug Fixes
+
+* Fix release tag ([2ec09ff](https://github.com/googleapis/java-logging-logback/commit/2ec09fff140570e0fa36f8994172a22590cfc65f))
+* **java:** Add native image configurations for logging-logback ([#1075](https://github.com/googleapis/java-logging-logback/issues/1075)) ([22bf85d](https://github.com/googleapis/java-logging-logback/commit/22bf85df9d2e94c7d0ce4d51061c2e07334b8b8e))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-logging to v3.15.0 ([#1073](https://github.com/googleapis/java-logging-logback/issues/1073)) ([ff1ed3d](https://github.com/googleapis/java-logging-logback/commit/ff1ed3dfcdf38b4523d993a0a36268add21d1449))
+* Update dependency com.google.cloud:google-cloud-logging to v3.15.1 ([#1079](https://github.com/googleapis/java-logging-logback/issues/1079)) ([3a4ffe3](https://github.com/googleapis/java-logging-logback/commit/3a4ffe345161f9f2586b389452992ca4399c59eb))
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.9.0 ([#1074](https://github.com/googleapis/java-logging-logback/issues/1074)) ([503679f](https://github.com/googleapis/java-logging-logback/commit/503679fc71f2f5b26b4bc854b7571bda8bc73b88))
+
## [0.129.11](https://github.com/googleapis/java-logging-logback/compare/v0.129.10...v0.129.11) (2023-04-27)
diff --git a/README.md b/README.md
index 42bf257b5..0fdf5263e 100644
--- a/README.md
+++ b/README.md
@@ -23,20 +23,20 @@ If you are using Maven, add this to your pom.xml file:
com.google.cloud
google-cloud-logging-logback
- 0.130.10-alpha
+ 0.130.11-alpha
```
If you are using Gradle without BOM, add this to your dependencies:
```Groovy
-implementation 'com.google.cloud:google-cloud-logging-logback:0.130.10-alpha'
+implementation 'com.google.cloud:google-cloud-logging-logback:0.130.11-alpha'
```
If you are using SBT, add this to your dependencies:
```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.130.10-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.130.11-alpha"
```
@@ -299,7 +299,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-logging-logback/java11.html
[stability-image]: https://img.shields.io/badge/stability-preview-yellow
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-logging-logback.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging-logback/0.130.10-alpha
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging-logback/0.130.11-alpha
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/owlbot.py b/owlbot.py
index 58368fdda..52797fb5e 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -25,6 +25,7 @@
'CONTRIBUTING.md',
'.github/auto-label.yaml',
".github/release-please.yml",
+ ".kokoro/build.sh"
])
# --------------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ef2899539..32797f8f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
4.0.0
google-cloud-logging-logback
- 0.130.11-alpha
+ 0.130.12-alpha
jar
Google Cloud Logging Logback Appender
https://github.com/googleapis/java-logging-logback
@@ -17,7 +17,7 @@
1.2.11
5.1.0
1.1.3
- 3.14.9
+ 3.15.1
1.7.36
1.10.1
@@ -65,7 +65,7 @@
com.google.cloud
google-cloud-shared-dependencies
- 3.8.0
+ 3.9.0
pom
import
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 19f450d74..fa0149079 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
com.google.cloud
google-cloud-logging-logback
- 0.130.10-alpha
+ 0.130.11-alpha
@@ -53,7 +53,7 @@
org.codehaus.mojo
build-helper-maven-plugin
- 3.3.0
+ 3.4.0
add-snippets-source
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 627cd9df0..7606833b2 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-logging-logback
- 0.130.11-alpha
+ 0.130.12-alpha
@@ -52,7 +52,7 @@
org.codehaus.mojo
build-helper-maven-plugin
- 3.3.0
+ 3.4.0
add-snippets-source
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index f60be6c37..10603a4b2 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
com.google.cloud
libraries-bom
- 26.13.0
+ 26.14.0
pom
import
diff --git a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java
index 697f92d40..ba9afebde 100644
--- a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java
+++ b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java
@@ -122,7 +122,7 @@ public class LoggingAppender extends UnsynchronizedAppenderBase {
// See
// https://github.com/googleapis/release-please/blob/main/docs/customizing.md#updating-arbitrary-files
// {x-version-update-start:google-cloud-logging-logback:current}
- public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.130.11-alpha";
+ public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.130.12-alpha";
// {x-version-update-end}
private static boolean instrumentationAdded = false;
private static final Object instrumentationLock = new Object();
diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-logging-logback/reflect-config.json b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-logging-logback/reflect-config.json
new file mode 100644
index 000000000..68b566d6e
--- /dev/null
+++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-logging-logback/reflect-config.json
@@ -0,0 +1,52 @@
+[
+ {
+ "name":"ch.qos.logback.classic.Level",
+ "methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
+ },
+ {
+ "name":"ch.qos.logback.classic.filter.ThresholdFilter",
+ "queryAllPublicMethods":true,
+ "methods":[
+ {"name":"","parameterTypes":[] },
+ {"name":"setLevel","parameterTypes":["java.lang.String"] }
+ ]
+ },
+ {
+ "name":"ch.qos.logback.core.UnsynchronizedAppenderBase",
+ "methods":[{"name":"addFilter","parameterTypes":["ch.qos.logback.core.filter.Filter"] }]
+ },
+ {
+ "name":"com.google.cloud.logging.logback.LogbackBatchingSettings",
+ "queryAllPublicMethods":true,
+ "methods":[
+ {"name":"","parameterTypes":[] },
+ {"name":"setDelayThreshold","parameterTypes":["java.lang.Long"] },
+ {"name":"setElementCountThreshold","parameterTypes":["java.lang.Long"] },
+ {"name":"setLimitExceededBehavior","parameterTypes":["com.google.api.gax.batching.FlowController$LimitExceededBehavior"] },
+ {"name":"setMaxOutstandingElementCount","parameterTypes":["java.lang.Long"] },
+ {"name":"setMaxOutstandingRequestBytes","parameterTypes":["java.lang.Long"] },
+ {"name":"setRequestByteThreshold","parameterTypes":["java.lang.Long"] }
+ ]
+ },
+ {
+ "name":"com.google.cloud.logging.logback.LoggingAppender",
+ "queryAllPublicMethods":true,
+ "methods":[
+ {"name":"","parameterTypes":[] },
+ {"name":"setAutoPopulateMetadata","parameterTypes":["boolean"] },
+ {"name":"setCredentialsFile","parameterTypes":["java.lang.String"] },
+ {"name":"setFlushLevel","parameterTypes":["ch.qos.logback.classic.Level"] },
+ {"name":"setLog","parameterTypes":["java.lang.String"] },
+ {"name":"setLogDestinationProjectId","parameterTypes":["java.lang.String"] },
+ {"name":"setLogbackBatchingSettings","parameterTypes":["com.google.cloud.logging.logback.LogbackBatchingSettings"] },
+ {"name":"setPartialSuccess","parameterTypes":["boolean"] },
+ {"name":"setRedirectToStdout","parameterTypes":["boolean"] },
+ {"name":"setResourceType","parameterTypes":["java.lang.String"] },
+ {"name":"setWriteSynchronicity","parameterTypes":["com.google.cloud.logging.Synchronicity"] }
+ ]
+ },
+ {
+ "name":"java.lang.Long",
+ "methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
+ }
+]
diff --git a/versions.txt b/versions.txt
index 5caa71139..d7782c5a0 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version
-google-cloud-logging-logback:0.130.11-alpha:0.130.11-alpha
+google-cloud-logging-logback:0.130.12-alpha:0.130.12-alpha