diff --git a/README.md b/README.md index 1b8fd6f1..ef6e6fa2 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,16 @@ [![Build Status](https://travis-ci.com/SAP/cf-java-logging-support.svg?branch=master)](https://travis-ci.com/SAP/cf-java-logging-support) [![REUSE status](https://api.reuse.software/badge/github.com/SAP/cf-java-logging-support)](https://api.reuse.software/info/github.com/SAP/cf-java-logging-support) -**Note: The default branch has been renamed from master to main.** -Please execute on your local repository: +**Warning: The `main` branch was force-pushed on October 30th, 2025.** +If you cloned or checked out this repository before that date, you may encounter issues when pulling new changes. To +resolve this, reset your local `main` branch to match the remote: + +```shell +git fetch origin git checkout main git reset --hard origin/main ``` -git branch -m master main -git fetch origin -git branch -u origin/main main -git remote set-head origin -a -``` + +**Caution:** This will discard any local changes on your `main` branch. ## Summary @@ -62,16 +63,16 @@ All in all, you should do the following: 4. Adjust your logging configuration accordingly. Let's say you want to make use of the *servlet filter* feature, then you need to add the following dependency to your -POM with property `cf-logging-version` referring to the latest nexus version (currently `4.0.0-RC1`): +POM with property `cf-logging-version` referring to the latest nexus version (currently `4.0.0-RC2`): ```xml + - 4.0.0-RC1 + 4.0.0-RC2 ``` ``` xml - com.sap.hcp.cf.logging cf-java-logging-support-servlet @@ -106,7 +107,7 @@ corresponding dependencies in your POM file: ch.qos.logback logback-classic - 1.2.11 + 1.5.20 ``` @@ -121,12 +122,12 @@ corresponding dependencies in your POM file: org.apache.logging.log4j log4j-slf4j-impl - 2.20.0 + 2.25.2 org.apache.logging.log4j log4j-core - 2.20.0 + 2.25.2 ``` diff --git a/cf-java-logging-support-core/pom.xml b/cf-java-logging-support-core/pom.xml index 8e4ca74f..299ed7e0 100644 --- a/cf-java-logging-support-core/pom.xml +++ b/cf-java-logging-support-core/pom.xml @@ -32,7 +32,7 @@ com.sap.hcp.cf.logging cf-java-logging-support-parent - 4.0.0-RC1 + 4.0.0-RC2 ../pom.xml diff --git a/cf-java-logging-support-log4j2/pom.xml b/cf-java-logging-support-log4j2/pom.xml index 2fff41db..09267a95 100644 --- a/cf-java-logging-support-log4j2/pom.xml +++ b/cf-java-logging-support-log4j2/pom.xml @@ -11,7 +11,7 @@ ../pom.xml com.sap.hcp.cf.logging cf-java-logging-support-parent - 4.0.0-RC1 + 4.0.0-RC2 diff --git a/cf-java-logging-support-logback/pom.xml b/cf-java-logging-support-logback/pom.xml index 8ba72768..02c7ee71 100644 --- a/cf-java-logging-support-logback/pom.xml +++ b/cf-java-logging-support-logback/pom.xml @@ -10,7 +10,7 @@ ../pom.xml com.sap.hcp.cf.logging cf-java-logging-support-parent - 4.0.0-RC1 + 4.0.0-RC2 diff --git a/cf-java-logging-support-opentelemetry-agent-extension/pom.xml b/cf-java-logging-support-opentelemetry-agent-extension/pom.xml index d2447f53..6beca3b0 100644 --- a/cf-java-logging-support-opentelemetry-agent-extension/pom.xml +++ b/cf-java-logging-support-opentelemetry-agent-extension/pom.xml @@ -12,7 +12,7 @@ cf-java-logging-support-parent com.sap.hcp.cf.logging - 4.0.0-RC1 + 4.0.0-RC2 diff --git a/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/CloudLoggingConfigurationCustomizerProvider.java b/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/CloudLoggingConfigurationCustomizerProvider.java index 9f7262aa..d1ee1670 100644 --- a/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/CloudLoggingConfigurationCustomizerProvider.java +++ b/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/CloudLoggingConfigurationCustomizerProvider.java @@ -9,7 +9,7 @@ public class CloudLoggingConfigurationCustomizerProvider implements AutoConfigurationCustomizerProvider { private static final Logger LOG = Logger.getLogger(CloudLoggingConfigurationCustomizerProvider.class.getName()); - private static final String VERSION = "4.0.0-RC1"; + private static final String VERSION = "4.0.0-RC2"; @Override public void customize(AutoConfigurationCustomizer autoConfiguration) { diff --git a/cf-java-logging-support-servlet-dynlog-jwt/pom.xml b/cf-java-logging-support-servlet-dynlog-jwt/pom.xml index a487e909..6f32d2c0 100644 --- a/cf-java-logging-support-servlet-dynlog-jwt/pom.xml +++ b/cf-java-logging-support-servlet-dynlog-jwt/pom.xml @@ -11,7 +11,7 @@ com.sap.hcp.cf.logging cf-java-logging-support-parent - 4.0.0-RC1 + 4.0.0-RC2 ../pom.xml diff --git a/cf-java-logging-support-servlet/pom.xml b/cf-java-logging-support-servlet/pom.xml index ca6a58d5..5fc88bbf 100644 --- a/cf-java-logging-support-servlet/pom.xml +++ b/cf-java-logging-support-servlet/pom.xml @@ -9,7 +9,7 @@ com.sap.hcp.cf.logging cf-java-logging-support-parent - 4.0.0-RC1 + 4.0.0-RC2 ../pom.xml diff --git a/pom.xml b/pom.xml index 24fc8687..78c833af 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.sap.hcp.cf.logging cf-java-logging-support-parent - 4.0.0-RC1 + 4.0.0-RC2 pom Cloud Foundry Java logging support components diff --git a/sample-spring-boot/manifest-otel-javaagent.yml b/sample-spring-boot/manifest-otel-javaagent.yml index 968e7159..8edfcca9 100644 --- a/sample-spring-boot/manifest-otel-javaagent.yml +++ b/sample-spring-boot/manifest-otel-javaagent.yml @@ -5,7 +5,7 @@ applications: # - name: otel-sample-app instances: 1 - path: target/sample-app-spring-boot-4.0.0-RC1.jar + path: target/sample-app-spring-boot-4.0.0-RC2.jar buildpack: sap_java_buildpack memory: 256M random-route: true @@ -16,7 +16,7 @@ applications: LOG_REFERER: false JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']" JBP_CONFIG_SAP_MACHINE_JRE: '{ use_offline_repository: false, version: 17.+ }' - JBP_CONFIG_JAVA_OPTS: '[from_environment: false, java_opts: ''-javaagent:BOOT-INF/lib/opentelemetry-javaagent-1.31.0.jar -Dotel.javaagent.extensions=BOOT-INF/lib/cf-java-logging-support-opentelemetry-agent-extension-4.0.0-RC1.jar -Dotel.logs.exporter=cloud-logging -Dotel.metrics.exporter=cloud-logging,dynatrace -Dotel.traces.exporter=cloud-logging -Dotel.instrumentation.logback-appender.experimental.capture-mdc-attributes=* -Dotel.instrumentation.logback-appender.experimental.capture-key-value-pair-attributes=true -Dotel.instrumentation.logback-appender.experimental.capture-code-attributes=true -Dotel.instrumentation.logback-appender.experimental-log-attributes=true -Dotel.experimental.resource.disabled-keys=process.command_line,process.command_args,process.executable.path -Dotel.javaagent.extension.sap.cf.binding.dynatrace.metrics.token-name=ingest_token'']' + JBP_CONFIG_JAVA_OPTS: '[from_environment: false, java_opts: ''-javaagent:BOOT-INF/lib/opentelemetry-javaagent-2.21.0.jar -Dotel.javaagent.extensions=BOOT-INF/lib/cf-java-logging-support-opentelemetry-agent-extension-4.0.0-RC2.jar -Dotel.logs.exporter=cloud-logging -Dotel.metrics.exporter=cloud-logging,dynatrace -Dotel.traces.exporter=cloud-logging -Dotel.instrumentation.logback-appender.experimental.capture-mdc-attributes=* -Dotel.instrumentation.logback-appender.experimental.capture-key-value-pair-attributes=true -Dotel.instrumentation.logback-appender.experimental.capture-code-attributes=true -Dotel.instrumentation.logback-appender.experimental-log-attributes=true -Dotel.experimental.resource.disabled-keys=process.command_line,process.command_args,process.executable.path -Dotel.javaagent.extension.sap.cf.binding.dynatrace.metrics.token-name=ingest_token'']' services: - cloud-logging - dynatrace-service diff --git a/sample-spring-boot/manifest.yml b/sample-spring-boot/manifest.yml index 7fea6179..a1968fe1 100644 --- a/sample-spring-boot/manifest.yml +++ b/sample-spring-boot/manifest.yml @@ -5,7 +5,7 @@ applications: # - name: logging-sample-app instances: 1 - path: target/sample-app-spring-boot-4.0.0-RC1.jar + path: target/sample-app-spring-boot-4.0.0-RC2.jar buildpack: sap_java_buildpack env: # Set LOG_*: true to activate logging of respective field diff --git a/sample-spring-boot/pom.xml b/sample-spring-boot/pom.xml index 0cc6e906..fa6853ba 100644 --- a/sample-spring-boot/pom.xml +++ b/sample-spring-boot/pom.xml @@ -9,7 +9,7 @@ com.sap.hcp.cf.logging cf-java-logging-support-parent - 4.0.0-RC1 + 4.0.0-RC2 ../pom.xml