diff --git a/modules/repository-azure/licenses/log4j-slf4j-impl-NOTICE.txt b/modules/repository-azure/licenses/log4j-slf4j-impl-NOTICE.txt
index ea99ef1d4726..bbb5fb3f66e2 100644
--- a/modules/repository-azure/licenses/log4j-slf4j-impl-NOTICE.txt
+++ b/modules/repository-azure/licenses/log4j-slf4j-impl-NOTICE.txt
@@ -1,8 +1,20 @@
-
-Apache Log4j SLF4J Binding
-Copyright 1999-2017 The Apache Software Foundation
+Apache Log4j
+Copyright 1999-2023 Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
 
+Dumbster SMTP test server
+Copyright 2004 Jason Paul Kitchen
+
+TypeUtil.java
+Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
+
+TimeoutBlockingWaitStrategy.java and parts of Util.java
+Copyright 2011 LMAX Ltd.
diff --git a/modules/repository-gcs/licenses/log4j-NOTICE.txt b/modules/repository-gcs/licenses/log4j-NOTICE.txt
index 037573236004..bbb5fb3f66e2 100644
--- a/modules/repository-gcs/licenses/log4j-NOTICE.txt
+++ b/modules/repository-gcs/licenses/log4j-NOTICE.txt
@@ -1,5 +1,20 @@
-Apache log4j
-Copyright 2007 The Apache Software Foundation
+Apache Log4j
+Copyright 1999-2023 Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/).
+
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
+
+Dumbster SMTP test server
+Copyright 2004 Jason Paul Kitchen
+
+TypeUtil.java
+Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
+
+TimeoutBlockingWaitStrategy.java and parts of Util.java
+Copyright 2011 LMAX Ltd.
diff --git a/modules/repository-s3/licenses/log4j-NOTICE.txt b/modules/repository-s3/licenses/log4j-NOTICE.txt
index 037573236004..bbb5fb3f66e2 100644
--- a/modules/repository-s3/licenses/log4j-NOTICE.txt
+++ b/modules/repository-s3/licenses/log4j-NOTICE.txt
@@ -1,5 +1,20 @@
-Apache log4j
-Copyright 2007 The Apache Software Foundation
+Apache Log4j
+Copyright 1999-2023 Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/).
+
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
+
+Dumbster SMTP test server
+Copyright 2004 Jason Paul Kitchen
+
+TypeUtil.java
+Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
+
+TimeoutBlockingWaitStrategy.java and parts of Util.java
+Copyright 2011 LMAX Ltd.
diff --git a/modules/repository-url/licenses/log4j-NOTICE.txt b/modules/repository-url/licenses/log4j-NOTICE.txt
index 037573236004..bbb5fb3f66e2 100644
--- a/modules/repository-url/licenses/log4j-NOTICE.txt
+++ b/modules/repository-url/licenses/log4j-NOTICE.txt
@@ -1,5 +1,20 @@
-Apache log4j
-Copyright 2007 The Apache Software Foundation
+Apache Log4j
+Copyright 1999-2023 Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/).
+
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
+
+Dumbster SMTP test server
+Copyright 2004 Jason Paul Kitchen
+
+TypeUtil.java
+Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
+
+TimeoutBlockingWaitStrategy.java and parts of Util.java
+Copyright 2011 LMAX Ltd.
diff --git a/plugins/discovery-azure-classic/licenses/log4j-NOTICE.txt b/plugins/discovery-azure-classic/licenses/log4j-NOTICE.txt
index 037573236004..bbb5fb3f66e2 100644
--- a/plugins/discovery-azure-classic/licenses/log4j-NOTICE.txt
+++ b/plugins/discovery-azure-classic/licenses/log4j-NOTICE.txt
@@ -1,5 +1,20 @@
-Apache log4j
-Copyright 2007 The Apache Software Foundation
+Apache Log4j
+Copyright 1999-2023 Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/).
+
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
+
+Dumbster SMTP test server
+Copyright 2004 Jason Paul Kitchen
+
+TypeUtil.java
+Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
+
+TimeoutBlockingWaitStrategy.java and parts of Util.java
+Copyright 2011 LMAX Ltd.
diff --git a/plugins/discovery-ec2/licenses/log4j-NOTICE.txt b/plugins/discovery-ec2/licenses/log4j-NOTICE.txt
index 037573236004..bbb5fb3f66e2 100644
--- a/plugins/discovery-ec2/licenses/log4j-NOTICE.txt
+++ b/plugins/discovery-ec2/licenses/log4j-NOTICE.txt
@@ -1,5 +1,20 @@
-Apache log4j
-Copyright 2007 The Apache Software Foundation
+Apache Log4j
+Copyright 1999-2023 Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/).
+
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
+
+Dumbster SMTP test server
+Copyright 2004 Jason Paul Kitchen
+
+TypeUtil.java
+Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
+
+TimeoutBlockingWaitStrategy.java and parts of Util.java
+Copyright 2011 LMAX Ltd.
diff --git a/plugins/discovery-gce/licenses/log4j-NOTICE.txt b/plugins/discovery-gce/licenses/log4j-NOTICE.txt
index 037573236004..bbb5fb3f66e2 100644
--- a/plugins/discovery-gce/licenses/log4j-NOTICE.txt
+++ b/plugins/discovery-gce/licenses/log4j-NOTICE.txt
@@ -1,5 +1,20 @@
-Apache log4j
-Copyright 2007 The Apache Software Foundation
+Apache Log4j
+Copyright 1999-2023 Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/).
+
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
+
+Dumbster SMTP test server
+Copyright 2004 Jason Paul Kitchen
+
+TypeUtil.java
+Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
+
+TimeoutBlockingWaitStrategy.java and parts of Util.java
+Copyright 2011 LMAX Ltd.
diff --git a/plugins/repository-hdfs/licenses/log4j-NOTICE.txt b/plugins/repository-hdfs/licenses/log4j-NOTICE.txt
index 037573236004..bbb5fb3f66e2 100644
--- a/plugins/repository-hdfs/licenses/log4j-NOTICE.txt
+++ b/plugins/repository-hdfs/licenses/log4j-NOTICE.txt
@@ -1,5 +1,20 @@
-Apache log4j
-Copyright 2007 The Apache Software Foundation
+Apache Log4j
+Copyright 1999-2023 Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/).
+
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
+
+Dumbster SMTP test server
+Copyright 2004 Jason Paul Kitchen
+
+TypeUtil.java
+Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
+
+TimeoutBlockingWaitStrategy.java and parts of Util.java
+Copyright 2011 LMAX Ltd.
diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-NOTICE.txt b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-NOTICE.txt
index 037573236004..bbb5fb3f66e2 100644
--- a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-NOTICE.txt
+++ b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-NOTICE.txt
@@ -1,5 +1,20 @@
-Apache log4j
-Copyright 2007 The Apache Software Foundation
+Apache Log4j
+Copyright 1999-2023 Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/).
+
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
+
+Dumbster SMTP test server
+Copyright 2004 Jason Paul Kitchen
+
+TypeUtil.java
+Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
+
+TimeoutBlockingWaitStrategy.java and parts of Util.java
+Copyright 2011 LMAX Ltd.
diff --git a/server/licenses/log4j-api-NOTICE.txt b/server/licenses/log4j-api-NOTICE.txt
index 037573236004..bbb5fb3f66e2 100644
--- a/server/licenses/log4j-api-NOTICE.txt
+++ b/server/licenses/log4j-api-NOTICE.txt
@@ -1,5 +1,20 @@
-Apache log4j
-Copyright 2007 The Apache Software Foundation
+Apache Log4j
+Copyright 1999-2023 Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/).
+
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
+
+Dumbster SMTP test server
+Copyright 2004 Jason Paul Kitchen
+
+TypeUtil.java
+Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
+
+TimeoutBlockingWaitStrategy.java and parts of Util.java
+Copyright 2011 LMAX Ltd.
diff --git a/server/licenses/log4j-core-NOTICE.txt b/server/licenses/log4j-core-NOTICE.txt
index 037573236004..bbb5fb3f66e2 100644
--- a/server/licenses/log4j-core-NOTICE.txt
+++ b/server/licenses/log4j-core-NOTICE.txt
@@ -1,5 +1,20 @@
-Apache log4j
-Copyright 2007 The Apache Software Foundation
+Apache Log4j
+Copyright 1999-2023 Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/).
+
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
+
+Dumbster SMTP test server
+Copyright 2004 Jason Paul Kitchen
+
+TypeUtil.java
+Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
+
+TimeoutBlockingWaitStrategy.java and parts of Util.java
+Copyright 2011 LMAX Ltd.
diff --git a/x-pack/plugin/core/licenses/log4j-NOTICE.txt b/x-pack/plugin/core/licenses/log4j-NOTICE.txt
index 037573236004..bbb5fb3f66e2 100644
--- a/x-pack/plugin/core/licenses/log4j-NOTICE.txt
+++ b/x-pack/plugin/core/licenses/log4j-NOTICE.txt
@@ -1,5 +1,20 @@
-Apache log4j
-Copyright 2007 The Apache Software Foundation
+Apache Log4j
+Copyright 1999-2023 Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/).
+
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
+
+Dumbster SMTP test server
+Copyright 2004 Jason Paul Kitchen
+
+TypeUtil.java
+Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
+
+TimeoutBlockingWaitStrategy.java and parts of Util.java
+Copyright 2011 LMAX Ltd.
diff --git a/x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-LICENSE.txt b/x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-LICENSE.txt
index d64569567334..6279e5206de1 100644
--- a/x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-LICENSE.txt
+++ b/x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-LICENSE.txt
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 1999-2005 The Apache Software Foundation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-NOTICE.txt b/x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-NOTICE.txt
index ea99ef1d4726..bbb5fb3f66e2 100644
--- a/x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-NOTICE.txt
+++ b/x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-NOTICE.txt
@@ -1,8 +1,20 @@
-
-Apache Log4j SLF4J Binding
-Copyright 1999-2017 The Apache Software Foundation
+Apache Log4j
+Copyright 1999-2023 Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
 
+Dumbster SMTP test server
+Copyright 2004 Jason Paul Kitchen
+
+TypeUtil.java
+Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
+
+TimeoutBlockingWaitStrategy.java and parts of Util.java
+Copyright 2011 LMAX Ltd.
diff --git a/x-pack/plugin/security/licenses/log4j-slf4j-impl-LICENSE.txt b/x-pack/plugin/security/licenses/log4j-slf4j-impl-LICENSE.txt
index d64569567334..6279e5206de1 100644
--- a/x-pack/plugin/security/licenses/log4j-slf4j-impl-LICENSE.txt
+++ b/x-pack/plugin/security/licenses/log4j-slf4j-impl-LICENSE.txt
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 1999-2005 The Apache Software Foundation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/x-pack/plugin/security/licenses/log4j-slf4j-impl-NOTICE.txt b/x-pack/plugin/security/licenses/log4j-slf4j-impl-NOTICE.txt
index ea99ef1d4726..bbb5fb3f66e2 100644
--- a/x-pack/plugin/security/licenses/log4j-slf4j-impl-NOTICE.txt
+++ b/x-pack/plugin/security/licenses/log4j-slf4j-impl-NOTICE.txt
@@ -1,8 +1,20 @@
-
-Apache Log4j SLF4J Binding
-Copyright 1999-2017 The Apache Software Foundation
+Apache Log4j
+Copyright 1999-2023 Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
 
+Dumbster SMTP test server
+Copyright 2004 Jason Paul Kitchen
+
+TypeUtil.java
+Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
+
+TimeoutBlockingWaitStrategy.java and parts of Util.java
+Copyright 2011 LMAX Ltd.
diff --git a/x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-LICENSE.txt b/x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-LICENSE.txt
index d64569567334..6279e5206de1 100644
--- a/x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-LICENSE.txt
+++ b/x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-LICENSE.txt
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 1999-2005 The Apache Software Foundation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-NOTICE.txt b/x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-NOTICE.txt
index ea99ef1d4726..bbb5fb3f66e2 100644
--- a/x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-NOTICE.txt
+++ b/x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-NOTICE.txt
@@ -1,8 +1,20 @@
-
-Apache Log4j SLF4J Binding
-Copyright 1999-2017 The Apache Software Foundation
+Apache Log4j
+Copyright 1999-2023 Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
 
+Dumbster SMTP test server
+Copyright 2004 Jason Paul Kitchen
+
+TypeUtil.java
+Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
+
+TimeoutBlockingWaitStrategy.java and parts of Util.java
+Copyright 2011 LMAX Ltd.