From 2544ce02f0c869e665bd2c146f81e5cc48e51a5e Mon Sep 17 00:00:00 2001
From: "James R. Perkins" <jperkins@redhat.com>
Date: Tue, 3 Oct 2023 09:10:36 -0700
Subject: [PATCH] Update copyrights and update the new modules version

Signed-off-by: James R. Perkins <jperkins@redhat.com>
---
 .../logmanager/PropertyConfigurator.java      | 18 ++---------------
 logmanager/pom.xml                            | 20 +++----------------
 .../EmbeddedLogContextSelector.java           | 18 ++---------------
 .../core/logmanager/ObjectBuilder.java        | 18 ++---------------
 .../core/logmanager/ObjectUpdater.java        | 18 ++---------------
 .../core/logmanager/ValueResolver.java        | 18 ++---------------
 .../WildFlyConfiguratorFactory.java           | 18 ++---------------
 .../logmanager/WildFlyDelayedHandler.java     | 18 ++---------------
 .../WildFlyLogContextInitializer.java         | 18 ++---------------
 .../logmanager/WildFlyLogContextSelector.java | 18 ++---------------
 .../config/AbstractBasicConfiguration.java    | 18 ++---------------
 .../config/AbstractPropertyConfiguration.java | 18 ++---------------
 .../core/logmanager/config/ConfigAction.java  | 18 ++---------------
 .../DelegatingContextConfiguration.java       | 18 ++---------------
 .../config/ErrorManagerConfiguration.java     | 18 ++---------------
 .../config/ErrorManagerConfigurationImpl.java | 18 ++---------------
 .../config/FilterConfiguration.java           | 18 ++---------------
 .../config/FilterConfigurationImpl.java       | 18 ++---------------
 .../config/FormatterConfiguration.java        | 18 ++---------------
 .../config/FormatterConfigurationImpl.java    | 18 ++---------------
 .../config/HandlerConfiguration.java          | 18 ++---------------
 .../config/HandlerConfigurationImpl.java      | 18 ++---------------
 .../config/HandlerContainingConfigurable.java | 18 ++---------------
 .../config/LogContextConfiguration.java       | 18 ++---------------
 .../config/LoggerConfiguration.java           | 18 ++---------------
 .../config/LoggerConfigurationImpl.java       | 18 ++---------------
 .../logmanager/config/NamedConfigurable.java  | 18 ++---------------
 .../logmanager/config/ObjectConfigurable.java | 18 ++---------------
 .../logmanager/config/ObjectProducer.java     | 18 ++---------------
 .../logmanager/config/PojoConfiguration.java  | 18 ++---------------
 .../config/PojoConfigurationImpl.java         | 18 ++---------------
 .../config/PropertyConfigurable.java          | 18 ++---------------
 .../PropertyLogContextConfiguration.java      | 18 ++---------------
 .../logmanager/config/ValueExpression.java    | 18 ++---------------
 .../config/ValueExpressionImpl.java           | 18 ++---------------
 .../core/logmanager/config/WrappedAction.java | 18 ++---------------
 .../org.jboss.logmanager.ConfiguratorFactory  | 18 ++---------------
 ...org.jboss.logmanager.LogContextInitializer | 18 ++---------------
 38 files changed, 77 insertions(+), 609 deletions(-)

diff --git a/logging/src/main/java/org/jboss/as/logging/logmanager/PropertyConfigurator.java b/logging/src/main/java/org/jboss/as/logging/logmanager/PropertyConfigurator.java
index f94c6a8a05c..6f61c1e76c3 100644
--- a/logging/src/main/java/org/jboss/as/logging/logmanager/PropertyConfigurator.java
+++ b/logging/src/main/java/org/jboss/as/logging/logmanager/PropertyConfigurator.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.jboss.as.logging.logmanager;
diff --git a/logmanager/pom.xml b/logmanager/pom.xml
index 7f2ef1c9600..d87739830e3 100644
--- a/logmanager/pom.xml
+++ b/logmanager/pom.xml
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ JBoss, Home of Professional Open Source.
-  ~
-  ~ Copyright 2023 Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -25,7 +11,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>22.0.0.Beta1-SNAPSHOT</version>
+        <version>22.0.0.Final-SNAPSHOT</version>
     </parent>
 
     <artifactId>wildfly-logmanager</artifactId>
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/EmbeddedLogContextSelector.java b/logmanager/src/main/java/org/wildfly/core/logmanager/EmbeddedLogContextSelector.java
index 21d2312c730..f64092dc1d5 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/EmbeddedLogContextSelector.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/EmbeddedLogContextSelector.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/ObjectBuilder.java b/logmanager/src/main/java/org/wildfly/core/logmanager/ObjectBuilder.java
index fe430f5dec5..856acf0d34c 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/ObjectBuilder.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/ObjectBuilder.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/ObjectUpdater.java b/logmanager/src/main/java/org/wildfly/core/logmanager/ObjectUpdater.java
index 5f06248b0ed..8117afd7dac 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/ObjectUpdater.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/ObjectUpdater.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/ValueResolver.java b/logmanager/src/main/java/org/wildfly/core/logmanager/ValueResolver.java
index 09f1023ac27..c210a2d40e2 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/ValueResolver.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/ValueResolver.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/WildFlyConfiguratorFactory.java b/logmanager/src/main/java/org/wildfly/core/logmanager/WildFlyConfiguratorFactory.java
index f66f936b898..36fdabef8ad 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/WildFlyConfiguratorFactory.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/WildFlyConfiguratorFactory.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/WildFlyDelayedHandler.java b/logmanager/src/main/java/org/wildfly/core/logmanager/WildFlyDelayedHandler.java
index a30d07b4cd5..b466db8243f 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/WildFlyDelayedHandler.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/WildFlyDelayedHandler.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/WildFlyLogContextInitializer.java b/logmanager/src/main/java/org/wildfly/core/logmanager/WildFlyLogContextInitializer.java
index 743f3c328e7..371c7414bfb 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/WildFlyLogContextInitializer.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/WildFlyLogContextInitializer.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/WildFlyLogContextSelector.java b/logmanager/src/main/java/org/wildfly/core/logmanager/WildFlyLogContextSelector.java
index 349ca9f2d5c..b39d0a37981 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/WildFlyLogContextSelector.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/WildFlyLogContextSelector.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/AbstractBasicConfiguration.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/AbstractBasicConfiguration.java
index 2cf3030e507..1ee604f841e 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/AbstractBasicConfiguration.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/AbstractBasicConfiguration.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/AbstractPropertyConfiguration.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/AbstractPropertyConfiguration.java
index d150503aa3d..07ec3041809 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/AbstractPropertyConfiguration.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/AbstractPropertyConfiguration.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/ConfigAction.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/ConfigAction.java
index b4eb147a46a..46c421209c6 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/ConfigAction.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/ConfigAction.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/DelegatingContextConfiguration.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/DelegatingContextConfiguration.java
index 4efa74edbcf..9678b26ab35 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/DelegatingContextConfiguration.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/DelegatingContextConfiguration.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/ErrorManagerConfiguration.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/ErrorManagerConfiguration.java
index 8063fd84050..25347ff876d 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/ErrorManagerConfiguration.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/ErrorManagerConfiguration.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/ErrorManagerConfigurationImpl.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/ErrorManagerConfigurationImpl.java
index 89d7c2b9d27..f46867135a8 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/ErrorManagerConfigurationImpl.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/ErrorManagerConfigurationImpl.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/FilterConfiguration.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/FilterConfiguration.java
index 8cd37175c49..c4a91a9fe2a 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/FilterConfiguration.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/FilterConfiguration.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/FilterConfigurationImpl.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/FilterConfigurationImpl.java
index 41679ce8026..2e711841dc6 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/FilterConfigurationImpl.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/FilterConfigurationImpl.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/FormatterConfiguration.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/FormatterConfiguration.java
index ea59a7e36ce..edac9efad4c 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/FormatterConfiguration.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/FormatterConfiguration.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/FormatterConfigurationImpl.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/FormatterConfigurationImpl.java
index aadda694b2d..1620bb053eb 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/FormatterConfigurationImpl.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/FormatterConfigurationImpl.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/HandlerConfiguration.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/HandlerConfiguration.java
index 7580b821237..87ae138cbff 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/HandlerConfiguration.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/HandlerConfiguration.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/HandlerConfigurationImpl.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/HandlerConfigurationImpl.java
index 6bcf426d3ef..c4621cb09f9 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/HandlerConfigurationImpl.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/HandlerConfigurationImpl.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/HandlerContainingConfigurable.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/HandlerContainingConfigurable.java
index f355a7cfbb0..6aebfa0d333 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/HandlerContainingConfigurable.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/HandlerContainingConfigurable.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/LogContextConfiguration.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/LogContextConfiguration.java
index badd477f7fe..ce47273b22b 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/LogContextConfiguration.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/LogContextConfiguration.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/LoggerConfiguration.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/LoggerConfiguration.java
index fdea0004a89..54fa2529f19 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/LoggerConfiguration.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/LoggerConfiguration.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/LoggerConfigurationImpl.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/LoggerConfigurationImpl.java
index ea974781911..74bd2d35453 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/LoggerConfigurationImpl.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/LoggerConfigurationImpl.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/NamedConfigurable.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/NamedConfigurable.java
index ed25961afd7..03c01dc06ec 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/NamedConfigurable.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/NamedConfigurable.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/ObjectConfigurable.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/ObjectConfigurable.java
index 4303310f130..c8b5b238c24 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/ObjectConfigurable.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/ObjectConfigurable.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/ObjectProducer.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/ObjectProducer.java
index 59155efbcf7..40cddc857bd 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/ObjectProducer.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/ObjectProducer.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/PojoConfiguration.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/PojoConfiguration.java
index d562b900177..a65a536c1a6 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/PojoConfiguration.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/PojoConfiguration.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/PojoConfigurationImpl.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/PojoConfigurationImpl.java
index ce4d2022ab6..5c1c64f7865 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/PojoConfigurationImpl.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/PojoConfigurationImpl.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/PropertyConfigurable.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/PropertyConfigurable.java
index 61b56bee6e1..24ab6a6b421 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/PropertyConfigurable.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/PropertyConfigurable.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/PropertyLogContextConfiguration.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/PropertyLogContextConfiguration.java
index 2cc1d2b044e..73e4bd980db 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/PropertyLogContextConfiguration.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/PropertyLogContextConfiguration.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/ValueExpression.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/ValueExpression.java
index 771014628dd..882543f5591 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/ValueExpression.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/ValueExpression.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/ValueExpressionImpl.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/ValueExpressionImpl.java
index 44309972d08..83623c74dc9 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/ValueExpressionImpl.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/ValueExpressionImpl.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/java/org/wildfly/core/logmanager/config/WrappedAction.java b/logmanager/src/main/java/org/wildfly/core/logmanager/config/WrappedAction.java
index 457fdd6dfab..30daf036a3a 100644
--- a/logmanager/src/main/java/org/wildfly/core/logmanager/config/WrappedAction.java
+++ b/logmanager/src/main/java/org/wildfly/core/logmanager/config/WrappedAction.java
@@ -1,20 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source.
- *
- * Copyright 2023 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.core.logmanager.config;
diff --git a/logmanager/src/main/resources/META-INF/services/org.jboss.logmanager.ConfiguratorFactory b/logmanager/src/main/resources/META-INF/services/org.jboss.logmanager.ConfiguratorFactory
index 9ffcb81c751..97350bca510 100644
--- a/logmanager/src/main/resources/META-INF/services/org.jboss.logmanager.ConfiguratorFactory
+++ b/logmanager/src/main/resources/META-INF/services/org.jboss.logmanager.ConfiguratorFactory
@@ -1,20 +1,6 @@
 #
-# JBoss, Home of Professional Open Source.
-#
-# Copyright 2023 Red Hat, Inc., and individual contributors
-# as indicated by the @author tags.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Copyright The WildFly Authors
+# SPDX-License-Identifier: Apache-2.0
 #
 
 org.wildfly.core.logmanager.WildFlyConfiguratorFactory
\ No newline at end of file
diff --git a/logmanager/src/main/resources/META-INF/services/org.jboss.logmanager.LogContextInitializer b/logmanager/src/main/resources/META-INF/services/org.jboss.logmanager.LogContextInitializer
index fca5b04fc4b..2eba0bf2c9a 100644
--- a/logmanager/src/main/resources/META-INF/services/org.jboss.logmanager.LogContextInitializer
+++ b/logmanager/src/main/resources/META-INF/services/org.jboss.logmanager.LogContextInitializer
@@ -1,20 +1,6 @@
 #
-# JBoss, Home of Professional Open Source.
-#
-# Copyright 2023 Red Hat, Inc., and individual contributors
-# as indicated by the @author tags.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Copyright The WildFly Authors
+# SPDX-License-Identifier: Apache-2.0
 #
 
 org.wildfly.core.logmanager.WildFlyLogContextInitializer
\ No newline at end of file