diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7630913..4d50c81 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,30 +1,3 @@
+#### :warning:This project is now part of the EE4J initiative. This repository has been archived as all activities are now happening in the [corresponding Eclipse repository](https://github.com/eclipse-ee4j/orb-gmbal-pfl). See [here](https://www.eclipse.org/ee4j/status.php) for the overall EE4J transition status.
+ 
 ---
-
----
-
-# Source Code Submissions 
-We welcome your contributions and look forward to collaborating with you. We can only accept source code repository 
-submissions from users who have signed and returned the Oracle 
-Contributor Agreement. You will find details and the agreement to sign at this OTN web page: 
-[Oracle Contributor Agreement](http://www.oracle.com/technetwork/community/oca-486395.html). 
-
-# Other Contributions
-For all project Submissions other than source code repository contributions, the following also applies: Oracle does 
-not claim ownership of Your Submissions. However, in order to fulfill 
-the purposes of this project, You must give Oracle and all Users 
-the right to post, access, discuss, use, publish, disseminate, and refine 
-Your Submissions. 
-
-In legalese: *You hereby grant to Oracle and all 
-Users a royalty-free, perpetual, irrevocable, worldwide, non-exclusive, 
-and fully sub-licensable right and license, under Your intellectual 
-property rights, to reproduce, modify, adapt, publish, translate, create 
-derivative works from, distribute, perform, display, and use Your 
-Submissions (in whole or part) and to incorporate or implement them in 
-other works in any form, media, or technology now known or later 
-developed, all subject to the obligation to retain any copyright notices 
-included in Your Submissions. All Users, Oracle, and their 
-sublicensees are responsible for any modifications they make to the 
-Submissions of others.*
-
-Copyright © 2017 Oracle and/or its affiliates. All rights reserved.
diff --git a/README.md b/README.md
index b02c872..3bcfab4 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+#### :warning:This project is now part of the EE4J initiative. This repository has been archived as all activities are now happening in the [corresponding Eclipse repository](https://github.com/eclipse-ee4j/orb-gmbal-pfl). See [here](https://www.eclipse.org/ee4j/status.php) for the overall EE4J transition status.
+ 
+---
 # Java EE Primitive Function Library
 
 This is the [gmbal-pfl project](https://javaee.github.io/gmbal-pfl/).
diff --git a/debian/changelog b/debian/changelog
index fd71d23..b16ea66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gmbal-pfl (4.0.1-b003+git20180907.1.2739671-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Fri, 15 Apr 2022 03:04:46 -0000
+
 gmbal-pfl (4.0.1-b003-2) unstable; urgency=medium
 
   * Fixed the build failure with Java 11 (Closes: #909257)
diff --git a/debian/patches/01-jar-packaging.patch b/debian/patches/01-jar-packaging.patch
index 6ae037c..a97b7bc 100644
--- a/debian/patches/01-jar-packaging.patch
+++ b/debian/patches/01-jar-packaging.patch
@@ -1,8 +1,10 @@
 Description: Change the packaging from 'bundle' to 'jar' to avoid dependency resolution issues
 Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: not-needed
---- a/pfl-asm/pom.xml
-+++ b/pfl-asm/pom.xml
+Index: gmbal-pfl/pfl-asm/pom.xml
+===================================================================
+--- gmbal-pfl.orig/pfl-asm/pom.xml
++++ gmbal-pfl/pfl-asm/pom.xml
 @@ -50,7 +50,6 @@
      </parent>
      <modelVersion>4.0.0</modelVersion>
@@ -11,8 +13,10 @@ Forwarded: not-needed
      <name>PFL ASM</name>
      <build>
          <plugins>
---- a/pfl-basic-tools/pom.xml
-+++ b/pfl-basic-tools/pom.xml
+Index: gmbal-pfl/pfl-basic-tools/pom.xml
+===================================================================
+--- gmbal-pfl.orig/pfl-basic-tools/pom.xml
++++ gmbal-pfl/pfl-basic-tools/pom.xml
 @@ -50,7 +50,6 @@
      </parent>
      <modelVersion>4.0.0</modelVersion>
@@ -21,8 +25,10 @@ Forwarded: not-needed
      <name>PFL Basic Tools</name>
      <dependencies>
          <dependency>
---- a/pfl-test/pom.xml
-+++ b/pfl-test/pom.xml
+Index: gmbal-pfl/pfl-test/pom.xml
+===================================================================
+--- gmbal-pfl.orig/pfl-test/pom.xml
++++ gmbal-pfl/pfl-test/pom.xml
 @@ -49,7 +49,6 @@
      </parent>
      <modelVersion>4.0.0</modelVersion>
@@ -31,8 +37,10 @@ Forwarded: not-needed
      <name>PFL Test</name>
      <dependencies>
          <dependency>
---- a/pfl-tf-tools/pom.xml
-+++ b/pfl-tf-tools/pom.xml
+Index: gmbal-pfl/pfl-tf-tools/pom.xml
+===================================================================
+--- gmbal-pfl.orig/pfl-tf-tools/pom.xml
++++ gmbal-pfl/pfl-tf-tools/pom.xml
 @@ -49,7 +49,6 @@
      </parent>
      <modelVersion>4.0.0</modelVersion>
@@ -41,8 +49,10 @@ Forwarded: not-needed
      <name>PFL TF TOOLS</name>
      <dependencies>
  
---- a/pfl-tf/pom.xml
-+++ b/pfl-tf/pom.xml
+Index: gmbal-pfl/pfl-tf/pom.xml
+===================================================================
+--- gmbal-pfl.orig/pfl-tf/pom.xml
++++ gmbal-pfl/pfl-tf/pom.xml
 @@ -49,7 +49,6 @@
      </parent>
      <modelVersion>4.0.0</modelVersion>
diff --git a/debian/patches/02-java11-compatibility.patch b/debian/patches/02-java11-compatibility.patch
index 0e745f3..761ee3d 100644
--- a/debian/patches/02-java11-compatibility.patch
+++ b/debian/patches/02-java11-compatibility.patch
@@ -1,9 +1,11 @@
 Description: Fixes the compatibility with Java 11
 Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
---- a/pfl-basic/src/main/java/org/glassfish/pfl/basic/reflection/BridgeBase.java
-+++ b/pfl-basic/src/main/java/org/glassfish/pfl/basic/reflection/BridgeBase.java
-@@ -264,7 +264,12 @@
+Index: gmbal-pfl/pfl-basic/src/main/java/org/glassfish/pfl/basic/reflection/BridgeBase.java
+===================================================================
+--- gmbal-pfl.orig/pfl-basic/src/main/java/org/glassfish/pfl/basic/reflection/BridgeBase.java
++++ gmbal-pfl/pfl-basic/src/main/java/org/glassfish/pfl/basic/reflection/BridgeBase.java
+@@ -264,7 +264,12 @@ public abstract class BridgeBase {
       * @param protectionDomain the domain in which the class should be defined
       */
      public final Class<?> defineClass(String className, byte[] classBytes, ClassLoader classLoader, ProtectionDomain protectionDomain) {
diff --git a/pfl-asm/pom.xml b/pfl-asm/pom.xml
index e8a3804..fef73fb 100644
--- a/pfl-asm/pom.xml
+++ b/pfl-asm/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>org.glassfish.pfl</groupId>
         <artifactId>pfl</artifactId>
-        <version>4.0.1-b003</version>
+        <version>4.0.1-b004-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pfl-asm</artifactId>
diff --git a/pfl-basic-tools/pom.xml b/pfl-basic-tools/pom.xml
index 9150506..a1bd0ea 100644
--- a/pfl-basic-tools/pom.xml
+++ b/pfl-basic-tools/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>org.glassfish.pfl</groupId>
         <artifactId>pfl</artifactId>
-        <version>4.0.1-b003</version>
+        <version>4.0.1-b004-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pfl-basic-tools</artifactId>
diff --git a/pfl-basic/pom.xml b/pfl-basic/pom.xml
index bacc966..aa71ee4 100644
--- a/pfl-basic/pom.xml
+++ b/pfl-basic/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.pfl</groupId>
         <artifactId>pfl</artifactId>
-        <version>4.0.1-b003</version>
+        <version>4.0.1-b004-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pfl-basic</artifactId>
diff --git a/pfl-dynamic/pom.xml b/pfl-dynamic/pom.xml
index b0eb86c..c1853c5 100644
--- a/pfl-dynamic/pom.xml
+++ b/pfl-dynamic/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.pfl</groupId>
         <artifactId>pfl</artifactId>
-        <version>4.0.1-b003</version>
+        <version>4.0.1-b004-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pfl-dynamic</artifactId>
diff --git a/pfl-test/pom.xml b/pfl-test/pom.xml
index 4bb2601..7eddcff 100644
--- a/pfl-test/pom.xml
+++ b/pfl-test/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.pfl</groupId>
         <artifactId>pfl</artifactId>
-        <version>4.0.1-b003</version>
+        <version>4.0.1-b004-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pfl-test</artifactId>
diff --git a/pfl-tf-tools/pom.xml b/pfl-tf-tools/pom.xml
index efc7d2d..6789d01 100644
--- a/pfl-tf-tools/pom.xml
+++ b/pfl-tf-tools/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.pfl</groupId>
         <artifactId>pfl</artifactId>
-        <version>4.0.1-b003</version>
+        <version>4.0.1-b004-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pfl-tf-tools</artifactId>
diff --git a/pfl-tf/pom.xml b/pfl-tf/pom.xml
index 2ddffce..74ced4a 100644
--- a/pfl-tf/pom.xml
+++ b/pfl-tf/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.pfl</groupId>
         <artifactId>pfl</artifactId>
-        <version>4.0.1-b003</version>
+        <version>4.0.1-b004-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pfl-tf</artifactId>
diff --git a/pom.xml b/pom.xml
index e2cbf5d..fe20557 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
 
     <groupId>org.glassfish.pfl</groupId>
     <artifactId>pfl</artifactId>
-    <version>4.0.1-b003</version>
+    <version>4.0.1-b004-SNAPSHOT</version>
     <packaging>pom</packaging>
     
     <name>Primitive Function Library (PFL)</name>
@@ -84,7 +84,7 @@
         <connection>scm:git:https://github.com/javaee/gmbal-pfl.git</connection>
         <developerConnection>scm:git:git@github.com:javaee/gmbal-pfl.git</developerConnection>
         <url>https://github.com/javaee/gmbal-pfl</url>
-        <tag>4.0.1-b003</tag>
+        <tag>HEAD</tag>
     </scm>
     
     <issueManagement>