Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump version.log4j from 2.12.4 to 2.23.1 #3557

Merged
merged 3 commits into from Mar 12, 2024

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Mar 11, 2024

Bumps version.log4j from 2.12.4 to 2.23.1.
Updates org.apache.logging.log4j:log4j-core from 2.12.4 to 2.23.1

Updates org.apache.logging.log4j:log4j-slf4j-impl from 2.12.4 to 2.23.1

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps `version.log4j` from 2.12.4 to 2.23.1.

Updates `org.apache.logging.log4j:log4j-core` from 2.12.4 to 2.23.1

Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.12.4 to 2.23.1

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.logging.log4j:log4j-slf4j-impl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added dependencies Pull requests that update a dependency file java Pull requests that update Java code labels Mar 11, 2024
@dependabot dependabot bot requested a review from a team March 11, 2024 17:12
@SylvainJuge SylvainJuge enabled auto-merge (squash) March 12, 2024 09:10
@SylvainJuge SylvainJuge merged commit d8ae52b into main Mar 12, 2024
12 checks passed
@SylvainJuge SylvainJuge deleted the dependabot/maven/version.log4j-2.23.1 branch March 12, 2024 09:54
jackshirazi added a commit that referenced this pull request Apr 3, 2024
* [maven-release-plugin] prepare for next development iteration

* Update cloudfoundry for 1.48.1 release

* ci: use .java-version and prepare to use VM with installed tools in BK (#3554)

* ci(bk): use specialised VMs (#3555)

* Added a note on centralized agent config support for AWS Lambda (#3498)

* Bump com.networknt:json-schema-validator from 1.1.0 to 1.3.3 (#3547)

* Bump com.networknt:json-schema-validator from 1.1.0 to 1.3.3

Bumps [com.networknt:json-schema-validator](https://github.com/networknt/json-schema-validator) from 1.1.0 to 1.3.3.
- [Release notes](https://github.com/networknt/json-schema-validator/releases)
- [Changelog](https://github.com/networknt/json-schema-validator/blob/master/CHANGELOG.md)
- [Commits](networknt/json-schema-validator@1.1.0...1.3.3)

---
updated-dependencies:
- dependency-name: com.networknt:json-schema-validator
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix compilation

* Fix schema version

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jonas Kunz <jonas.kunz@elastic.co>

* Fix inheritance for API annotations (#3551)

* powershell no-logo (#3556)

* security: add permissions block to workflows (#3531)

* Bump io.micrometer:micrometer-core from 1.12.2 to 1.12.4 (#3559)

Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.12.2 to 1.12.4.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](micrometer-metrics/micrometer@v1.12.2...v1.12.4)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump version.log4j from 2.12.4 to 2.23.1 (#3557)

* Bump version.log4j from 2.12.4 to 2.23.1

Bumps `version.log4j` from 2.12.4 to 2.23.1.

Updates `org.apache.logging.log4j:log4j-core` from 2.12.4 to 2.23.1

Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.12.4 to 2.23.1

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.logging.log4j:log4j-slf4j-impl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* restore previous log4j version

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>

* Add API for instrumenting FAAS and adjust the AWS plugin (#3516)



---------

Co-authored-by: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>

* Introduce API for metrics collection that does not depend on agent-core (#3522)

* Remove logging API.

* Clean up core dependencies from POMs that do not need it.

* Add API for handling lambda instrumentation and apply to the AWS plugin.

* Move metrics API to tracer.

* Factor out JSON DSL for metrics.

* Fix import issue.

* Fix imports.

* Fix imports.

* fix formatting

---------

Co-authored-by: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>

* differentiate Lambda url from api gateway (#3417)


---------

Co-authored-by: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>

* added support to Elastic Load Balancer triggers (#3411)



---------

Co-authored-by: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>

* feat: new release process with PRs (#3567)

* feat: new release process with PRs

Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>

* chore: redirect to stderr for both message

Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>

* chore: apply suggest

Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>

* ci(chore): use env var instead of prefix v

Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>

* ci: use maven wrapper instead of direct maven

Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>

* feat: validate snapshot for snapshot workflow

Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>

* docs: add new release process

Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>

---------

Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>

* Bump version.aws.sdk from 2.25.0 to 2.25.21 in /apm-agent-plugins (#3574)

Bumps `version.aws.sdk` from 2.25.0 to 2.25.21.

Updates `software.amazon.awssdk:s3` from 2.25.0 to 2.25.21

Updates `software.amazon.awssdk:sqs` from 2.25.0 to 2.25.21

Updates `software.amazon.awssdk:dynamodb` from 2.25.0 to 2.25.21

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: software.amazon.awssdk:sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: software.amazon.awssdk:dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump org.awaitility:awaitility from 4.2.0 to 4.2.1 (#3573)

Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.0 to 4.2.1.
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](awaitility/awaitility@awaitility-4.2.0...awaitility-4.2.1)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add exclusion list option for calling DatabaseMetaData.getUserName (#3568)

* use a dummy user for testing

* exclusion list option for calling getUserName

* changelog and test break fixed

* pre release: elastic-apm-agent v1.49.0 (#3576)

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>

* ci(fix): use input value instead of env value for post release trigger (#3577)

Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>

* ci(fix): correct buildkite pipeline trigger (#3578)

Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>
Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
Co-authored-by: Som <111349830+someshwaranM@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jonas Kunz <jonas.kunz@elastic.co>
Co-authored-by: SylvainJuge <763082+SylvainJuge@users.noreply.github.com>
Co-authored-by: Jan Calanog <jan.calanog@elastic.co>
Co-authored-by: Rafael Winterhalter <rafael.wth@gmail.com>
Co-authored-by: Nugusbayev Kanagat <48118512+videnkz@users.noreply.github.com>
Co-authored-by: Adrien Mannocci <adrien.mannocci@elastic.co>
Co-authored-by: jackshirazi <jack.shirazi@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
agent-java dependencies Pull requests that update a dependency file java Pull requests that update Java code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants