Skip to content

Commit 21024fa

Browse files
committed
Update CHANGELOG and README, try fix acceptance tests
1 parent 34b3c28 commit 21024fa

4 files changed

Lines changed: 42 additions & 7 deletions

File tree

.github/workflows/test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
env:
4848
SPLUNK_START_ARGS: --accept-license
4949
SPLUNK_GENERAL_TERMS: --accept-sgt-current-at-splunk-com
50+
SPLUNK_HEC_TOKEN: 11111111-1111-1111-1111-1111111111113
5051
SPLUNK_PASSWORD: changed!
5152
ports:
5253
- 8089

CHANGELOG.md

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,67 @@
11
# Splunk Logging for Java Changelog
22

3+
## Version 1.11.9
4+
5+
### Security Updates
6+
7+
* Bump Log4j2 to 2.25.4
8+
* Bump Logback to 1.2.13 (latest Java 8 compatible release)
9+
* Bump okhttp3 to 4.12.0
10+
* Bump okio to 3.12.0
11+
* Bump gson to 2.13.1
12+
13+
### Minor Changes
14+
15+
* Bump commons-lang3 to 3.20.0
16+
* Update GitHub Actions to use pinned SHA versions (checkout@v6, setup-java@v5, cache@v5)
17+
18+
### Bug Fixes
19+
20+
* Fix `SplunkCimLogEventUnitTest` tests which were not being executed (GitHub issue [#289](https://github.com/splunk/splunk-library-javalogging/issues/289))
21+
322
## Version 1.11.8
423

524
### Minor Changes
25+
626
* Force okio version and upgrade okhttp3 to latest stable release to address CVE-2023-3635
727

828
## Version 1.11.7
929

1030
### Bug Fixes
31+
1132
* ClassCastException for Log4j Appender was fixed. (Github Issue [#259](https://github.com/splunk/splunk-library-javalogging/issues/259))
1233

1334
## Version 1.11.6
1435

1536
### Enhancements
37+
1638
* Sending Java Throwable object instead of exception message in event.
1739
* Formatter support added in formatting event message in Java Util Logging.
1840
* Any message formatter can be added from properties file.
1941
* By default, SimpleFormatter is used to format event message.
2042
* Layout (deprecated) in socket appender configuration (TcpAppender) is replaced with Encoder.
2143

2244
### Minor Changes
45+
2346
* Starting a new Dispatcher always for OkHttpClient builder. (PR [#193](https://github.com/splunk/splunk-library-javalogging/pull/193))
2447
* README file modified with dependency management guidance. (PR [#217](https://github.com/splunk/splunk-library-javalogging/pull/217))
2548
* JsonHttpContentType in HttpEventCollectorSender is fixed based on [RFC7231](https://httpwg.org/specs/rfc7231.html#media.type) specs. (PR [#256](https://github.com/splunk/splunk-library-javalogging/pull/256))
26-
* Event message strings starting with commenting characters (#, // & /**/) are allowed.
49+
* Event message strings starting with commenting characters (#, // & /**/) are allowed.
2750

2851
## Version 1.11.5
2952

3053
### Critical Security Update
54+
3155
* Bump Log4J version to latest 2.17.2 @see [CVE-2021-44832 Log4j<2.17.1](https://nvd.nist.gov/vuln/detail/CVE-2021-44832)
3256
* Bump Logback version to latest 1.2.11 @see [CVE-2021-42550 Logback<1.2.8](https://nvd.nist.gov/vuln/detail/CVE-2021-42550)
3357

3458
### Enhancements
59+
3560
* Added StandardErrorCallback class. Register ErrorCallback implementations via logback or log4j xml config. (PR [#215](https://github.com/splunk/splunk-library-javalogging/pull/215))
3661
* ErrorCallback class used to handle error other than Server errors.
3762

3863
### Minor Changes
64+
3965
* Bump org.slf4j:slf4j-api version to latest [1.7.36](https://github.com/qos-ch/slf4j/releases/tag/v_1.7.36)
4066
* Bump com.squareup.okhttp3:okhttp to latest [4.9.3](https://square.github.io/okhttp/changelogs/changelog_4x/#version-493)
4167
* Bump com.google.code.gson:gson to latest [2.9.0](https://github.com/google/gson/releases/tag/gson-parent-2.9.0)
@@ -46,26 +72,31 @@
4672
## Version 1.11.4
4773

4874
### Critical Security Update
75+
4976
* Update Logback to version 1.2.9 per CVE-2021-42550.
5077

5178
## Version 1.11.3
5279

5380
### Critical Security Update
81+
5482
* Upgrade Log4J again v2.17.0 related to CVE-2021-45046 & CVE-2021-44228
5583

5684
## Version 1.11.2
5785

5886
### Critical Security Update
87+
5988
* Upgrading log4J to 2.16 per CVE-2021-45046.
6089

6190
## Version 1.11.1
6291

6392
### Critical Security Update
93+
6494
* Upgrading log4J to 2.15 per CVE-2021-44228. [PR](https://github.com/splunk/splunk-library-javalogging/pull/222)
6595

6696
## Version 1.11.0
6797

6898
### Minor Changes
99+
69100
* Added a parameter to set await termination timeout. [PR](https://github.com/splunk/splunk-library-javalogging/pull/179)
70101

71102
## Version 1.10.0
@@ -84,7 +115,6 @@
84115
* Upgrade version of junit to 4.13.2.
85116
* Upgrade version of commons to 3.12.
86117

87-
88118
## Version 1.9.0
89119

90120
* Resolve an issue with TcpAppender losing events when busy (@avdv)
@@ -123,7 +153,7 @@
123153

124154
## Version 1.6.2
125155

126-
* Add support to allow users to define their own event body serializer for HTTP event adapter: Simply create a class implementing `com.splunk.logging.EventBodySerializer`,
156+
* Add support to allow users to define their own event body serializer for HTTP event adapter: Simply create a class implementing `com.splunk.logging.EventBodySerializer`,
127157
and add the full class name as a property (`eventBodySerializer`) to the adapter.
128158
Default will be a JSON event body containing message, severity, and other properties. [#86](https://github.com/splunk/splunk-library-javalogging/pull/86).
129159

@@ -132,13 +162,15 @@ Default will be a JSON event body containing message, severity, and other proper
132162
* TcpAppender performance improvement, prevents 100% CPU usage [#85](https://github.com/splunk/splunk-library-javalogging/pull/85).
133163

134164
## Version 1.6.0
165+
135166
* Changed messagedMimeType metadata property to messageFormat
136167
* Fixes unit tests, and performance issues
137168
* Fixes issues with log4j
138169
* Fixes Cookie Expiry date issue [#74](https://github.com/splunk/splunk-library-javalogging/pull/74)
139170
* Added Raw Endpoint support to HEC [#75](https://github.com/splunk/splunk-library-javalogging/pull/75)
140171

141172
## Version 1.5.3
173+
142174
* Add support for Logback access [#54](https://github.com/splunk/splunk-library-javalogging/issues/54)
143175
* Make more parameters optional for Log4j appender [#47](https://github.com/splunk/splunk-library-javalogging/issues/47)
144176

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Splunk Logging for Java
22

3-
#### Version 1.11.8
3+
## Version 1.11.9
44

55
Splunk logging for Java enables you to log events to HTTP Event Collector or to a TCP input on a Splunk Enterprise instance within your Java applications. You can use three major Java logging frameworks: [Logback](http://logback.qos.ch), [Log4j 2](http://logging.apache.org/log4j/2.x/), and [java.util.logging](https://docs.oracle.com/javase/7/docs/api/java/util/logging/package-summary.html). Splunk logging for Java is also enabled for [Simple Logging Facade for Java (SLF4J)](http://www.slf4j.org).
66

@@ -33,9 +33,10 @@ You'll need Java version 8 or higher, from [OpenJDK](https://openjdk.java.net) o
3333
#### Logging frameworks
3434

3535
If you're using the Log4j 2, Simple Logging Facade for Java (SLF4J), or Logback logging frameworks in conjunction with Splunk logging for Java there are additional compatibility requirements. For more about logging framework requirements, see [Enable logging to HEC](https://dev.splunk.com/enterprise/docs/devtools/java/logging-java/howtouseloggingjava/enableloghttpjava/) and [Enable logging to TCP inputs](https://dev.splunk.com/enterprise/docs/devtools/java/logging-java/howtouseloggingjava/enablelogtcpjava). These frameworks require:
36-
* Log4j version 2.17.2
36+
37+
* Log4j version 2.25.4
3738
* SLF4J version 1.7.36
38-
* Logback version 1.2.11
39+
* Logback version 1.2.13
3940

4041
## Documentation and resources
4142

@@ -53,7 +54,7 @@ If you're using the Log4j 2, Simple Logging Facade for Java (SLF4J), or Logback
5354

5455
## Dependency Management
5556

56-
The `splunk-library-javalogging` artifact can be accessed via Splunk's managed Maven repoitory.
57+
The `splunk-library-javalogging` artifact can be accessed via Splunk's managed Maven repository.
5758

5859
### Apache Maven
5960

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ services:
77
environment:
88
- SPLUNK_START_ARGS=--accept-license
99
- SPLUNK_GENERAL_TERMS=--accept-sgt-current-at-splunk-com
10+
- SPLUNK_HEC_TOKEN=11111111-1111-1111-1111-1111111111113
1011
- SPLUNK_PASSWORD=changed!
1112
ports:
1213
- 8000:8000

0 commit comments

Comments
 (0)