diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d7389c475..66a45bb5d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,13 +32,18 @@ jobs:
       - name: Verify tag state
         id: version
         run: |
+          version=${GITHUB_REF#refs/tags/}
+          if [[ "$version" == *-* ]]; then
+            echo "Tag '$version' is not a release version (contains '-'), skipping"
+            exit 1
+          fi
           git fetch --tags
           echo "All recent tags:"
           git tag -l --sort=version:refname | head -5
           echo "Current commit: $(git rev-parse HEAD)"
           echo "Git describe: $(git describe --tags --always)"
-          echo "Tag: ${GITHUB_REF#refs/tags/}"
-          echo "version=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+          echo "Tag: $version"
+          echo "version=$version" >> $GITHUB_OUTPUT
 
       - name: Setup Java
         uses: actions/setup-java@v5
@@ -63,7 +68,7 @@ jobs:
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
           MVX_USE_SYSTEM_JAVA: true
         run: |
-          ./mvx mvn -- -B deploy -Dnjord.autoPublish -Pbundle,javadoc,format-check,sign -s .github/release-settings.xml
+          ./mvx mvn -B deploy -Dnjord.autoPublish -Pbundle,javadoc,format-check,sign -s .github/release-settings.xml
 
       - name: Post release
         env:
@@ -103,7 +108,7 @@ jobs:
             exit 1
           fi          
           
-          name=$(./mvx mvn -- -q -DforceStdout --raw-streams help:evaluate -N -Dexpression=project.name)
+          name=$(./mvx mvn -B -q -DforceStdout --raw-streams help:evaluate -N -Dexpression=project.name)
           version=${{ steps.version.outputs.version }}
           echo "Creating release \"$name $version\" from tag"
           gh release create $version --verify-tag --notes-from-tag --title "$name $version"
diff --git a/.gitignore b/.gitignore
index 7a74f903e..516498b70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ build.rc
 
 .mvn/wrapper/maven-wrapper.jar
 .dependency-reduced-pom.xml
+.flattened-pom.xml
diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 000000000..7dc73fb29
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1 @@
+-Dnisse.source.jgit.dynamicVersion=true
diff --git a/.mvn/nisse-translation.properties b/.mvn/nisse-translation.properties
new file mode 100644
index 000000000..3a59440b7
--- /dev/null
+++ b/.mvn/nisse-translation.properties
@@ -0,0 +1,2 @@
+jgit.dynamicVersion=revision,+fallback
+jgit.dateIso8601=nisse.jgit.dateIso8601
diff --git a/.mvx/config.json5 b/.mvx/config.json5
index 85c508501..548963bdf 100644
--- a/.mvx/config.json5
+++ b/.mvx/config.json5
@@ -10,7 +10,7 @@
       distribution: "temurin",
     },
     maven: {
-      version: "4.0.0-rc-5",
+      version: "3.9.14",
     },
     node: {
       version: "20",
diff --git a/README.md b/README.md
index 549b39282..5e84368f0 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@ JLine is a Java library for handling console input. It's similar to [GNU Readlin
 ## Requirements
 
 - **Java 11 or higher**: JLine 4.x requires Java 11 as the minimum runtime version
-- **Maven 4.0 or higher**: JLine 4.x requires Maven 4.0+ for building from source
-- **Note**: JLine 3.x supports Java 8+ and Maven 3.x+, but JLine 4.x requires Java 11+ and Maven 4.0+
+- **Maven 3.9 or higher**: JLine 4.x requires Maven 3.9+ for building from source
+- **Note**: JLine 3.x supports Java 8+ and Maven 3.x+, but JLine 4.x requires Java 11+ and Maven 3.9+
 
 ## Features
 
diff --git a/builtins/pom.xml b/builtins/pom.xml
index 112d89e32..229062524 100644
--- a/builtins/pom.xml
+++ b/builtins/pom.xml
@@ -9,9 +9,15 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
 
     <artifactId>jline-builtins</artifactId>
     <name>JLine Builtins</name>
@@ -22,9 +28,11 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-reader</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-style</artifactId>
         </dependency>
         <dependency>
diff --git a/console-ui/pom.xml b/console-ui/pom.xml
index ec7b94921..8f68dd6b3 100644
--- a/console-ui/pom.xml
+++ b/console-ui/pom.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
 
     <artifactId>jline-console-ui</artifactId>
     <name>JLine Console UI (Deprecated)</name>
@@ -13,6 +19,7 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-builtins</artifactId>
         </dependency>
         <dependency>
diff --git a/console/pom.xml b/console/pom.xml
index b9e74268b..4a35c3f1c 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -9,9 +9,15 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
 
     <artifactId>jline-console</artifactId>
     <name>JLine Console</name>
@@ -30,6 +36,7 @@
             <artifactId>jline-builtins</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-style</artifactId>
         </dependency>
         <dependency>
diff --git a/demo/pom.xml b/demo/pom.xml
index 702e4a780..61fa2f4a2 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -9,9 +9,15 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
 
     <artifactId>jline-demo</artifactId>
     <name>JLine Demo</name>
@@ -22,6 +28,7 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-terminal-ffm</artifactId>
         </dependency>
         <dependency>
@@ -29,6 +36,7 @@
             <artifactId>jline-terminal-jni</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-reader</artifactId>
         </dependency>
         <dependency>
@@ -36,9 +44,11 @@
             <artifactId>jline-builtins</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-console</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-shell</artifactId>
         </dependency>
         <dependency>
@@ -58,9 +68,11 @@
             <artifactId>jline-remote-telnet</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-style</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-groovy</artifactId>
         </dependency>
 
@@ -135,6 +147,7 @@
         </dependency>
 
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-picocli</artifactId>
         </dependency>
 
diff --git a/graal/pom.xml b/graal/pom.xml
index 666784f0c..cf16c10a9 100644
--- a/graal/pom.xml
+++ b/graal/pom.xml
@@ -9,9 +9,15 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
 
     <artifactId>jline-graal</artifactId>
     <name>JLine Native Demo</name>
@@ -22,6 +28,7 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-shell</artifactId>
         </dependency>
 
diff --git a/groovy/pom.xml b/groovy/pom.xml
index 16ef3f594..93e121b9d 100644
--- a/groovy/pom.xml
+++ b/groovy/pom.xml
@@ -9,9 +9,15 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
     <artifactId>jline-groovy</artifactId>
     <name>JLine Groovy</name>
 
@@ -21,6 +27,7 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-console</artifactId>
         </dependency>
         <dependency>
diff --git a/jansi-core/pom.xml b/jansi-core/pom.xml
index fb3d0d2df..be000e91b 100644
--- a/jansi-core/pom.xml
+++ b/jansi-core/pom.xml
@@ -9,9 +9,15 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
 
     <artifactId>jansi-core</artifactId>
     <name>Jansi Core</name>
diff --git a/jansi/pom.xml b/jansi/pom.xml
index bb2af7c7d..861dc5eb8 100644
--- a/jansi/pom.xml
+++ b/jansi/pom.xml
@@ -9,9 +9,15 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
 
     <artifactId>jansi</artifactId>
     <name>Jansi Bundle</name>
@@ -27,6 +33,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-terminal</artifactId>
             <scope>test</scope>
         </dependency>
@@ -36,6 +43,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jansi-core</artifactId>
             <scope>test</scope>
         </dependency>
diff --git a/jline/pom.xml b/jline/pom.xml
index 80737fee7..f1bdf5d71 100644
--- a/jline/pom.xml
+++ b/jline/pom.xml
@@ -9,9 +9,15 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
 
     <artifactId>jline</artifactId>
     <name>JLine Bundle</name>
@@ -52,6 +58,7 @@
             <optional>true</optional>
         </dependency>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-terminal</artifactId>
             <scope>test</scope>
         </dependency>
@@ -62,10 +69,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-terminal-ffm</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-reader</artifactId>
             <scope>test</scope>
         </dependency>
@@ -75,10 +84,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-shell</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-console</artifactId>
             <scope>test</scope>
         </dependency>
@@ -93,6 +104,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-style</artifactId>
             <scope>test</scope>
         </dependency>
@@ -102,6 +114,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jansi-core</artifactId>
             <scope>test</scope>
         </dependency>
diff --git a/native/pom.xml b/native/pom.xml
index bcf0570b1..1c78f9849 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -9,9 +9,15 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
     <artifactId>jline-native</artifactId>
 
     <packaging>jar</packaging>
diff --git a/picocli/pom.xml b/picocli/pom.xml
index 524d81dc0..33eb1bd11 100644
--- a/picocli/pom.xml
+++ b/picocli/pom.xml
@@ -9,9 +9,15 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
     <artifactId>jline-picocli</artifactId>
     <name>JLine Picocli</name>
 
@@ -21,9 +27,11 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-console</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-shell</artifactId>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 380b3899f..c80187e63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,11 +9,13 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.jline</groupId>
     <artifactId>jline-parent</artifactId>
-    <version>${nisse.jgit.dynamicVersion}</version>
+    <version>${revision}</version>
     <packaging>pom</packaging>
     <name>JLine</name>
     <description>JLine</description>
@@ -48,10 +50,31 @@
         </mailingList>
     </mailingLists>
 
+    <modules>
+        <module>native</module>
+        <module>terminal</module>
+        <module>terminal-ffm</module>
+        <module>terminal-jni</module>
+        <module>reader</module>
+        <module>shell</module>
+        <module>builtins</module>
+        <module>console-ui</module>
+        <module>prompt</module>
+        <module>console</module>
+        <module>picocli</module>
+        <module>groovy</module>
+        <module>remote-ssh</module>
+        <module>remote-telnet</module>
+        <module>style</module>
+        <module>demo</module>
+        <module>graal</module>
+        <module>jansi-core</module>
+    </modules>
+
     <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
         <connection>scm:git:https://github.com/jline/jline3.git</connection>
         <developerConnection>scm:git:https://github.com/jline/jline3.git</developerConnection>
-        <tag>${nisse.jgit.dynamicVersion}</tag>
+        <tag>HEAD</tag>
         <url>https://github.com/jline/jline3</url>
     </scm>
 
@@ -79,7 +102,7 @@
 
         <java.build.version>22</java.build.version>
         <java.release.version>11</java.release.version>
-        <maven.version>4.0.0-rc-3</maven.version>
+        <maven.version>3.9.0</maven.version>
 
         <native.image.skip>true</native.image.skip>
         <automatic.module.name />
@@ -107,6 +130,87 @@
     <dependencyManagement>
         <dependencies>
 
+            <dependency>
+                <groupId>org.jline</groupId>
+                <artifactId>jline-native</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jline</groupId>
+                <artifactId>jline-terminal</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jline</groupId>
+                <artifactId>jline-terminal-ffm</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jline</groupId>
+                <artifactId>jline-terminal-jni</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jline</groupId>
+                <artifactId>jline-reader</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jline</groupId>
+                <artifactId>jline-shell</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jline</groupId>
+                <artifactId>jline-builtins</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jline</groupId>
+                <artifactId>jline-console-ui</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jline</groupId>
+                <artifactId>jline-prompt</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jline</groupId>
+                <artifactId>jline-console</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jline</groupId>
+                <artifactId>jline-picocli</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jline</groupId>
+                <artifactId>jline-groovy</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jline</groupId>
+                <artifactId>jline-remote-ssh</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jline</groupId>
+                <artifactId>jline-remote-telnet</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jline</groupId>
+                <artifactId>jline-style</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jline</groupId>
+                <artifactId>jansi-core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.fusesource.jansi</groupId>
                 <artifactId>jansi</artifactId>
@@ -547,6 +651,32 @@
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
             </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.6.0</version>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                        <phase>process-resources</phase>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                        <phase>clean</phase>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -558,6 +688,10 @@
                     <name>!nobundle</name>
                 </property>
             </activation>
+            <modules>
+                <module>jline</module>
+                <module>jansi</module>
+            </modules>
             <build>
                 <plugins>
                     <plugin>
@@ -574,10 +708,6 @@
                     </plugin>
                 </plugins>
             </build>
-            <subprojects>
-                <subproject>jline</subproject>
-                <subproject>jansi</subproject>
-            </subprojects>
         </profile>
 
         <profile>
@@ -657,25 +787,4 @@
         </profile>
     </profiles>
 
-    <subprojects>
-        <subproject>native</subproject>
-        <subproject>terminal</subproject>
-        <subproject>terminal-ffm</subproject>
-        <subproject>terminal-jni</subproject>
-        <subproject>reader</subproject>
-        <subproject>shell</subproject>
-        <subproject>builtins</subproject>
-        <subproject>console-ui</subproject>
-        <subproject>prompt</subproject>
-        <subproject>console</subproject>
-        <subproject>picocli</subproject>
-        <subproject>groovy</subproject>
-        <subproject>remote-ssh</subproject>
-        <subproject>remote-telnet</subproject>
-        <subproject>style</subproject>
-        <subproject>demo</subproject>
-        <subproject>graal</subproject>
-        <subproject>jansi-core</subproject>
-    </subprojects>
-
 </project>
diff --git a/prompt/pom.xml b/prompt/pom.xml
index 22cf94b14..8b6349858 100644
--- a/prompt/pom.xml
+++ b/prompt/pom.xml
@@ -9,9 +9,15 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 http://maven.apache.org/maven-v4_1_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_1_0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
 
     <artifactId>jline-prompt</artifactId>
     <name>JLine Prompt</name>
diff --git a/reader/pom.xml b/reader/pom.xml
index edce9ca3b..09b1c68b4 100644
--- a/reader/pom.xml
+++ b/reader/pom.xml
@@ -9,9 +9,15 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
 
     <artifactId>jline-reader</artifactId>
     <name>JLine Reader</name>
diff --git a/remote-ssh/pom.xml b/remote-ssh/pom.xml
index 2983f2061..022dfe124 100644
--- a/remote-ssh/pom.xml
+++ b/remote-ssh/pom.xml
@@ -9,9 +9,15 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
 
     <artifactId>jline-remote-ssh</artifactId>
     <name>JLine Remote SSH</name>
diff --git a/remote-telnet/pom.xml b/remote-telnet/pom.xml
index cd4a4a7b7..67d18e870 100644
--- a/remote-telnet/pom.xml
+++ b/remote-telnet/pom.xml
@@ -9,15 +9,22 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
 
     <artifactId>jline-remote-telnet</artifactId>
     <name>JLine Remote Telnet</name>
 
     <dependencies>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-builtins</artifactId>
         </dependency>
 
diff --git a/shell/pom.xml b/shell/pom.xml
index a4329d07a..e545c3982 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -9,9 +9,15 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
 
     <artifactId>jline-shell</artifactId>
     <name>JLine Shell</name>
diff --git a/style/pom.xml b/style/pom.xml
index be0f5d7c6..86ce975d3 100644
--- a/style/pom.xml
+++ b/style/pom.xml
@@ -9,9 +9,15 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
 
     <artifactId>jline-style</artifactId>
     <name>JLine Style</name>
diff --git a/terminal-ffm/pom.xml b/terminal-ffm/pom.xml
index 103746a07..22291efe9 100644
--- a/terminal-ffm/pom.xml
+++ b/terminal-ffm/pom.xml
@@ -9,9 +9,15 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
 
     <artifactId>jline-terminal-ffm</artifactId>
     <name>JLine FFM Terminal</name>
diff --git a/terminal-jni/pom.xml b/terminal-jni/pom.xml
index 0603f8685..7ece2a963 100644
--- a/terminal-jni/pom.xml
+++ b/terminal-jni/pom.xml
@@ -9,9 +9,15 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
 
     <artifactId>jline-terminal-jni</artifactId>
     <name>JLine JNI Terminal</name>
@@ -22,10 +28,12 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-native</artifactId>
         </dependency>
 
         <dependency>
+            <groupId>org.jline</groupId>
             <artifactId>jline-terminal</artifactId>
         </dependency>
 
diff --git a/terminal/pom.xml b/terminal/pom.xml
index e8efae7e3..f11186b75 100644
--- a/terminal/pom.xml
+++ b/terminal/pom.xml
@@ -9,9 +9,15 @@
     https://opensource.org/licenses/BSD-3-Clause
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent />
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
 
     <artifactId>jline-terminal</artifactId>
     <name>JLine Terminal</name>