Skip to content
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ All in all, you should do the following:
And
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 `3.8.5`):
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 `3.8.6`):

```xml
<properties>
<cf-logging-version>3.8.5</cf-logging-version>
<cf-logging-version>3.8.6</cf-logging-version>
</properties>
```

Expand Down
2 changes: 1 addition & 1 deletion cf-java-logging-support-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-logging-support-parent</artifactId>
<version>3.8.5</version>
<version>3.8.6</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
Expand Down
2 changes: 1 addition & 1 deletion cf-java-logging-support-jersey/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<relativePath>../pom.xml</relativePath>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-logging-support-parent</artifactId>
<version>3.8.5</version>
<version>3.8.6</version>
</parent>

<name>cf-java-logging-support-jersey</name>
Expand Down
2 changes: 1 addition & 1 deletion cf-java-logging-support-log4j2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<relativePath>../pom.xml</relativePath>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-logging-support-parent</artifactId>
<version>3.8.5</version>
<version>3.8.6</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion cf-java-logging-support-logback/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<relativePath>../pom.xml</relativePath>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-logging-support-parent</artifactId>
<version>3.8.5</version>
<version>3.8.6</version>
</parent>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>cf-java-logging-support-parent</artifactId>
<groupId>com.sap.hcp.cf.logging</groupId>
<version>3.8.4</version>
<version>3.8.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cf-java-logging-support-opentelemetry-agent-extension</artifactId>
Expand Down Expand Up @@ -56,19 +56,19 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-common</artifactId>
<version>1.31.0</version>
<version>1.52.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
<version>1.31.0</version>
<version>1.52.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-otlp</artifactId>
<version>1.31.0</version>
<version>1.52.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -77,6 +77,22 @@
<version>2.18.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.9.3</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>okio</artifactId>
<groupId>com.squareup.okio</groupId>
</exclusion>
<exclusion>
<artifactId>kotlin-stdlib</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>uk.org.webcompere</groupId>
<artifactId>system-stubs-junit4</artifactId>
Expand Down Expand Up @@ -169,6 +185,6 @@
<properties>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<opentelemetry.sdk.version>1.31.0</opentelemetry.sdk.version>
<opentelemetry.sdk.version>1.52.0</opentelemetry.sdk.version>
</properties>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<artifactId>cf-java-logging-support-parent</artifactId>
<groupId>com.sap.hcp.cf.logging</groupId>
<version>3.8.5</version>
<version>3.8.6</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion cf-java-logging-support-servlet-jakarta/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-logging-support-parent</artifactId>
<version>3.8.5</version>
<version>3.8.6</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion cf-java-logging-support-servlet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-logging-support-parent</artifactId>
<version>3.8.5</version>
<version>3.8.6</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-monitoring-custom-metrics-clients</artifactId>
<version>3.8.5</version>
<version>3.8.6</version>
</parent>

<artifactId>cf-custom-metrics-clients-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-monitoring-custom-metrics-clients</artifactId>
<version>3.8.5</version>
<version>3.8.6</version>
</parent>

<artifactId>cf-custom-metrics-clients-java</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-monitoring-custom-metrics-clients</artifactId>
<version>3.8.5</version>
<version>3.8.6</version>
</parent>

<artifactId>cf-custom-metrics-clients-spring-boot</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cf-java-monitoring-custom-metrics-clients/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-logging-support-parent</artifactId>
<version>3.8.5</version>
<version>3.8.6</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
16 changes: 13 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-logging-support-parent</artifactId>
<version>3.8.5</version>
<version>3.8.6</version>
<packaging>pom</packaging>

<name>Cloud Foundry Java logging support components</name>
Expand Down Expand Up @@ -147,6 +147,7 @@
<java-jwt.version>4.4.0</java-jwt.version>
<jackson-databind.version>2.18.2</jackson-databind.version>
<httpclient.version>4.5.14</httpclient.version>
<sonatype.plugin.version>0.8.0</sonatype.plugin.version>
</properties>

<modules>
Expand Down Expand Up @@ -265,7 +266,7 @@
</build>
<profiles>
<profile>
<id>ossrh</id>
<id>central</id>
<build>
<plugins>
<plugin>
Expand All @@ -275,7 +276,7 @@
<executions>
<execution>
<id>attach-sources</id>
<phase>validate</phase>
<phase>package</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
Expand Down Expand Up @@ -310,6 +311,15 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>${sonatype.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
</configuration>
</plugin>
</plugins>
</build>
</profile>
Expand Down
2 changes: 1 addition & 1 deletion sample-spring-boot/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ applications:
#
- name: logging-sample-app
instances: 1
path: target/sample-app-spring-boot-3.8.5.jar
path: target/sample-app-spring-boot-3.8.6.jar
env:
# Set LOG_*: true to activate logging of respective field
LOG_SENSITIVE_CONNECTION_DATA: false
Expand Down
2 changes: 1 addition & 1 deletion sample-spring-boot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-logging-support-parent</artifactId>
<version>3.8.5</version>
<version>3.8.6</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion sample/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ applications:
instances: 1
buildpack: sap_java_buildpack
memory: 256M
path: target/logging-sample-app-3.8.5.war
path: target/logging-sample-app-3.8.6.war
env:
RANDOM_SLEEP: true
# Set LOG_*: true to activate logging of respective field
Expand Down
5 changes: 3 additions & 2 deletions sample/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<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">
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>
<artifactId>logging-sample-app</artifactId>
<packaging>war</packaging>
<name>sample-app</name>
<parent>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-logging-support-parent</artifactId>
<version>3.8.5</version>
<version>3.8.6</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down