diff --git a/feature/feature.properties b/feature/feature.properties
index f9e69a3..8537f60 100644
--- a/feature/feature.properties
+++ b/feature/feature.properties
@@ -2,7 +2,7 @@ name=Haxe Studio
 description=Eclipse based IDE for the Haxe programming language
 
 copyright=\
-Copyright 2021-2022 by the Haxe4E authors.\n\
+Copyright 2021-2023 by the Haxe4E authors.\n\
 \n\
 All rights reserved. This program and the accompanying materials \
 are made available under the terms of the Eclipse Public License v2.0 \
diff --git a/feature/feature.xml b/feature/feature.xml
index 8bcc5f4..df51fa8 100644
--- a/feature/feature.xml
+++ b/feature/feature.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright 2021-2022 by the Haxe4E authors.
+   SPDX-FileCopyrightText: © Haxe4E authors
+   SPDX-FileContributor: Sebastian Thomschke
    SPDX-License-Identifier: EPL-2.0
-
-   @author Sebastian Thomschke
+   SPDX-ArtifactOfProjectHomePage: https://github.com/haxe4e/haxe4e-studio
 -->
 <feature
       id="org.haxe4e.studio.feature"
diff --git a/feature/pom.xml b/feature/pom.xml
index 9bb0c90..9763995 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!--
-   Copyright 2021-2022 by the Haxe4E authors.
+   SPDX-FileCopyrightText: © Haxe4E authors
+   SPDX-FileContributor: Sebastian Thomschke
    SPDX-License-Identifier: EPL-2.0
-
-   @author Sebastian Thomschke
+   SPDX-ArtifactOfProjectHomePage: https://github.com/haxe4e/haxe4e-studio
 -->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/plugin/about.ini b/plugin/about.ini
index cc6a740..bc3702b 100644
--- a/plugin/about.ini
+++ b/plugin/about.ini
@@ -5,7 +5,7 @@ Haxe Studio\n\
 \n\
 Eclipse based IDE for the Haxe programming language.\n\
 \n\
-Copyright 2021-2022 by the Haxe4E authors.\n\
+Copyright 2021-2023 by the Haxe4E authors.\n\
 \n\
 All rights reserved. This program and the accompanying materials \
 are made available under the terms of the Eclipse Public License v2.0 \
diff --git a/plugin/plugin.xml b/plugin/plugin.xml
index 47d5c06..e2e038b 100644
--- a/plugin/plugin.xml
+++ b/plugin/plugin.xml
@@ -12,7 +12,7 @@
          <property name="appName" value="Haxe Studio"/>
          <property
                name="aboutText"
-               value="Haxe Studio - Eclipse based Haxe IDE&#x0A;https://github.com/haxe4e/haxe-studio&#x0A;&#x0A;Copyright 2021-2022 by the Haxe4E authors. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.&#x0A;&#x0A;This product includes software developed by other open source projects including the Eclipse Foundation, Inc., https://www.eclipse.org/ and Apache Software Foundation, https://www.apache.org/.">
+               value="Haxe Studio - Eclipse based Haxe IDE&#x0A;https://github.com/haxe4e/haxe-studio&#x0A;&#x0A;Copyright 2021-2023 by the Haxe4E authors. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.&#x0A;&#x0A;This product includes software developed by other open source projects including the Eclipse Foundation, Inc., https://www.eclipse.org/ and Apache Software Foundation, https://www.apache.org/.">
          </property>
          <property
                name="windowImages"
diff --git a/plugin/pom.xml b/plugin/pom.xml
index e627b88..cdf1ee9 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!--
-   Copyright 2021-2022 by the Haxe4E authors.
+   SPDX-FileCopyrightText: © Haxe4E authors
+   SPDX-FileContributor: Sebastian Thomschke
    SPDX-License-Identifier: EPL-2.0
-
-   @author Sebastian Thomschke
+   SPDX-ArtifactOfProjectHomePage: https://github.com/haxe4e/haxe4e-studio
 -->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/plugin/src/main/java/org/haxe4e/studio/HaxeStudioApplication.java b/plugin/src/main/java/org/haxe4e/studio/HaxeStudioApplication.java
index f9b65a7..35549ad 100644
--- a/plugin/src/main/java/org/haxe4e/studio/HaxeStudioApplication.java
+++ b/plugin/src/main/java/org/haxe4e/studio/HaxeStudioApplication.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2021-2022 by the Haxe4E authors.
+ * SPDX-FileCopyrightText: © The Haxe4E authors
+ * SPDX-FileContributor: Sebastian Thomschke
  * SPDX-License-Identifier: EPL-2.0
+ * SPDX-ArtifactOfProjectHomePage: https://github.com/haxe4e/haxe4e-studio
  */
 package org.haxe4e.studio;
 
-import static net.sf.jstuff.core.validation.NullAnalysisHelper.*;
+import static net.sf.jstuff.core.validation.NullAnalysisHelper.asNonNull;
 
 import java.net.URL;
 
diff --git a/plugin/src/main/java/org/haxe4e/studio/HaxeStudioPlugin.java b/plugin/src/main/java/org/haxe4e/studio/HaxeStudioPlugin.java
index 511553b..2bb60a0 100644
--- a/plugin/src/main/java/org/haxe4e/studio/HaxeStudioPlugin.java
+++ b/plugin/src/main/java/org/haxe4e/studio/HaxeStudioPlugin.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2021-2022 by the Haxe4E authors.
+ * SPDX-FileCopyrightText: © The Haxe4E authors
+ * SPDX-FileContributor: Sebastian Thomschke
  * SPDX-License-Identifier: EPL-2.0
+ * SPDX-ArtifactOfProjectHomePage: https://github.com/haxe4e/haxe4e-studio
  */
 package org.haxe4e.studio;
 
-import static net.sf.jstuff.core.validation.NullAnalysisHelper.*;
+import static net.sf.jstuff.core.validation.NullAnalysisHelper.asNonNullUnsafe;
 
 import org.eclipse.jdt.annotation.Nullable;
 import org.osgi.framework.BundleContext;
diff --git a/plugin/src/main/java/org/haxe4e/studio/HaxeStudioWorkbenchAdvisor.java b/plugin/src/main/java/org/haxe4e/studio/HaxeStudioWorkbenchAdvisor.java
index 74ba67b..fd775a6 100644
--- a/plugin/src/main/java/org/haxe4e/studio/HaxeStudioWorkbenchAdvisor.java
+++ b/plugin/src/main/java/org/haxe4e/studio/HaxeStudioWorkbenchAdvisor.java
@@ -1,6 +1,8 @@
 /*
- * Copyright 2021-2022 by the Haxe4E authors.
+ * SPDX-FileCopyrightText: © The Haxe4E authors
+ * SPDX-FileContributor: Sebastian Thomschke
  * SPDX-License-Identifier: EPL-2.0
+ * SPDX-ArtifactOfProjectHomePage: https://github.com/haxe4e/haxe4e-studio
  */
 package org.haxe4e.studio;
 
diff --git a/plugin/src/main/java/org/haxe4e/studio/launch/RunExternalProgramShortcut.java b/plugin/src/main/java/org/haxe4e/studio/launch/RunExternalProgramShortcut.java
index bde191c..6440ebb 100644
--- a/plugin/src/main/java/org/haxe4e/studio/launch/RunExternalProgramShortcut.java
+++ b/plugin/src/main/java/org/haxe4e/studio/launch/RunExternalProgramShortcut.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2021-2022 by the Haxe4E authors.
+ * SPDX-FileCopyrightText: © The Haxe4E authors
+ * SPDX-FileContributor: Sebastian Thomschke
  * SPDX-License-Identifier: EPL-2.0
+ * SPDX-ArtifactOfProjectHomePage: https://github.com/haxe4e/haxe4e-studio
  */
 package org.haxe4e.studio.launch;
 
-import static net.sf.jstuff.core.validation.NullAnalysisHelper.*;
+import static net.sf.jstuff.core.validation.NullAnalysisHelper.asNonNull;
 
 import org.eclipse.core.externaltools.internal.IExternalToolConstants;
 import org.eclipse.core.resources.IFile;
diff --git a/plugin/src/main/java/org/haxe4e/studio/launch/package-info.java b/plugin/src/main/java/org/haxe4e/studio/launch/package-info.java
index eb53789..2b9cd81 100644
--- a/plugin/src/main/java/org/haxe4e/studio/launch/package-info.java
+++ b/plugin/src/main/java/org/haxe4e/studio/launch/package-info.java
@@ -1,6 +1,8 @@
 /*
- * Copyright 2021-2022 by the Haxe4E authors.
+ * SPDX-FileCopyrightText: © The Haxe4E authors
+ * SPDX-FileContributor: Sebastian Thomschke
  * SPDX-License-Identifier: EPL-2.0
+ * SPDX-ArtifactOfProjectHomePage: https://github.com/haxe4e/haxe4e-studio
  *
  * @author Sebastian Thomschke
  */
diff --git a/plugin/src/main/java/org/haxe4e/studio/package-info.java b/plugin/src/main/java/org/haxe4e/studio/package-info.java
index 33b2874..e440468 100644
--- a/plugin/src/main/java/org/haxe4e/studio/package-info.java
+++ b/plugin/src/main/java/org/haxe4e/studio/package-info.java
@@ -1,6 +1,8 @@
 /*
- * Copyright 2021-2022 by the Haxe4E authors.
+ * SPDX-FileCopyrightText: © The Haxe4E authors
+ * SPDX-FileContributor: Sebastian Thomschke
  * SPDX-License-Identifier: EPL-2.0
+ * SPDX-ArtifactOfProjectHomePage: https://github.com/haxe4e/haxe4e-studio
  *
  * @author Sebastian Thomschke
  */
diff --git a/pom.xml b/pom.xml
index a44d571..5943a98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!--
-   Copyright 2021-2022 by the Haxe4E authors.
+   SPDX-FileCopyrightText: © Haxe4E authors
+   SPDX-FileContributor: Sebastian Thomschke
    SPDX-License-Identifier: EPL-2.0
-
-   @author Sebastian Thomschke
+   SPDX-ArtifactOfProjectHomePage: https://github.com/haxe4e/haxe4e-studio
 -->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/product/build-paf.sh b/product/build-paf.sh
index 9fb7a03..0498647 100644
--- a/product/build-paf.sh
+++ b/product/build-paf.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-# Copyright 2021-2022 by the Haxe4E authors
+# SPDX-FileCopyrightText: © Haxe4E authors
+# SPDX-FileContributor: Sebastian Thomschke
 # SPDX-License-Identifier: EPL-2.0
-#
-# Author: Sebastian Thomschke
+# SPDX-ArtifactOfProjectHomePage: https://github.com/haxe4e/haxe4e-studio
 #
 
 set -eu
diff --git a/product/fix_exec_flag_in_archives.py b/product/fix_exec_flag_in_archives.py
index 8ecffa0..ee3614e 100644
--- a/product/fix_exec_flag_in_archives.py
+++ b/product/fix_exec_flag_in_archives.py
@@ -1,7 +1,7 @@
-# Copyright 2022 by the Haxe4E authors.
+# SPDX-FileCopyrightText: © Haxe4E authors
+# SPDX-FileContributor: Sebastian Thomschke
 # SPDX-License-Identifier: EPL-2.0
-#
-# Author: Sebastian Thomschke
+# SPDX-ArtifactOfProjectHomePage: https://github.com/haxe4e/haxe4e-studio
 #
 # Sets the missing executable flag in tar.gz files produced for Linux/MacOS when building on Windows
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=442607
diff --git a/product/pom.xml b/product/pom.xml
index 96234f6..73f65fd 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!--
-   Copyright 2021-2022 by the Haxe4E authors.
+   SPDX-FileCopyrightText: © Haxe4E authors
+   SPDX-FileContributor: Sebastian Thomschke
    SPDX-License-Identifier: EPL-2.0
-
-   @author Sebastian Thomschke
+   SPDX-ArtifactOfProjectHomePage: https://github.com/haxe4e/haxe4e-studio
 -->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">