diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 7569905f80..2ba0895b11 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -14,56 +14,11 @@
 
   <name>Hibernate Tools Maven Plugin</name>
   <description>Maven plugin to provide hibernate-tools reverse engineering and code/schema generation abilities.</description>
-  <url>https://hibernate.github.io/hibernate-tools/</url>
-
-  <issueManagement>
-    <system>JIRA</system>
-    <url>http://hibernate.onjira.com/browse/HBX</url>
-  </issueManagement>
-
-  <scm>
-    <connection>scm:git:git://github.com/hibernate/hibernate-tools.git</connection>
-    <developerConnection>scm:git:git@github.com:hibernate/hibernate-tools.git</developerConnection>
-    <url>http://github.com/hibernate/hibernate-tools</url>
-  </scm>
-
-  <organization>
-    <name>Hibernate</name>
-    <url>http://www.hibernate.org</url>
-  </organization>
-
-  <licenses>
-    <license>
-      <name>GNU Lesser General Public License</name>
-      <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
-    </license>
-  </licenses>
-
-  <developers>
-    <developer>
-      <id>stadler</id>
-      <name>Jacques Stadler</name>
-      <email>jacques.stadler+github@gmail.com</email>
-    </developer>
-  </developers>
-
-  <prerequisites>
-    <maven>3.0</maven>
-  </prerequisites>
 
   <properties>
     <!-- This is a publicly distributed module that should be published: -->
     <deploy.skip>false</deploy.skip>
     <maven.install.skip>false</maven.install.skip>
-
-    <maven-plugin-annotations.version>3.5</maven-plugin-annotations.version>
-    <maven-plugin-api.version>3.5.2</maven-plugin-api.version>
-    <maven-core.version>3.9.9</maven-core.version>
-
-    <!-- Plugin versions -->
-    <maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
-    <maven-site-plugin.version>3.7</maven-site-plugin.version>
-    <site-maven-plugin.version>0.12</site-maven-plugin.version>
   </properties>
 
   <dependencies>
@@ -76,19 +31,14 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>${maven-plugin-api.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>${maven-core.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>${maven-plugin-annotations.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -129,7 +79,7 @@
       <plugin>
         <groupId>com.github.github</groupId>
         <artifactId>site-maven-plugin</artifactId>
-        <version>${site-maven-plugin.version}</version>
+        <version>${github-site-maven-plugin.version}</version>
         <executions>
           <execution>
             <goals>
diff --git a/pom.xml b/pom.xml
index c47a9feb56..cd96deabea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,57 @@
  
     <name>Hibernate Tools Parent Project</name>
 
+	<url>http://hibernate.org/tools/</url>
+
+	<issueManagement>
+		<system>JIRA</system>
+		<url>http://hibernate.atlassian.net/projects/HBX</url>
+	</issueManagement>
+
+	<scm>
+	  <connection>scm:git:git://github.com/hibernate/hibernate-tools.git</connection>
+	  <developerConnection>scm:git:git@github.com:hibernate/hibernate-tools.git</developerConnection>
+	  <url>http://github.com/hibernate/hibernate-tools</url>
+	</scm>
+
+	<organization>
+		<name>Hibernate</name>
+		<url>http://www.hibernate.org</url>
+	</organization>
+
+	<licenses>
+		<license>
+			<name>GNU Lesser General Public License</name>
+			<url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+		</license>
+	</licenses>
+
+	<developers>
+		<developer>
+			<id>maxandersen</id>
+			<name>Max Andersen</name>
+			<email>max@hibernate.org</email>
+			<url>http://in.relation.to/Bloggers/Max</url>
+		</developer>
+		<developer>
+			<id>koentsje</id>
+			<name>Koen Aers</name>
+			<email>koen@hibernate.org</email>
+			<url>http://koentsje.blogspot.be</url>
+		</developer>
+        <developer>
+            <id>stadler</id>
+            <name>Jacques Stadler</name>
+            <email>jacques.stadler+github@gmail.com</email>
+        </developer>
+        <developer>
+            <id>marko.bekhta</id>
+            <name>Marko Bekhta</name>
+            <email>marko@hibernate.org</email>
+            <url>http://in.relation.to/marko-bekhta/</url>
+        </developer>
+    </developers>
+
     <modules>
         <module>main</module>
         <module>maven-plugin</module>
@@ -41,15 +92,19 @@
     </modules>
 
     <properties>
-        <ant.version>1.10.14</ant.version>
-        <commons-collections.version>4.4</commons-collections.version>
-        <freemarker.version>2.3.32</freemarker.version>
+
+        <maven.version>3.9.11</maven.version>
+
+        <ant.version>1.10.15</ant.version>
+        <commons-collections.version>4.5.0</commons-collections.version>
+        <freemarker.version>2.3.34</freemarker.version>
         <!-- 1.7 is the last google-java-format version that is compiled against Java 1.8 -->
         <google-java-format.version>1.7</google-java-format.version>
+        <!-- 2.2.224 is the last h2 driver supported on Java 1.8 -->
         <h2.version>2.2.224</h2.version>
         <hibernate-commons-annotations.version>5.1.2.Final</hibernate-commons-annotations.version>
         <hibernate-core.version>5.6.15.Final</hibernate-core.version>
-        <hsqldb.version>2.5.2</hsqldb.version>
+        <hsqldb.version>2.6.1</hsqldb.version>
         <javaee-api.version>8.0.1</javaee-api.version>
 	    <javax.persistence-api.version>2.2</javax.persistence-api.version>
         <junit-jupiter.version>5.11.1</junit-jupiter.version>
@@ -58,8 +113,14 @@
         <sqlserver.version>9.2.1.jre8</sqlserver.version>
 
         <!-- Plugins not managed by the JBoss parent POM: -->
+        <maven-plugin-api.version>3.9.11</maven-plugin-api.version>
+        <maven-plugin-annotations.version>3.15.1</maven-plugin-annotations.version>
         <maven-wrapper-plugin.version>3.3.3</maven-wrapper-plugin.version>
-        <flatten-maven-plugin.version>1.7.0</flatten-maven-plugin.version>
+        <flatten-maven-plugin.version>1.7.2</flatten-maven-plugin.version>
+        <maven-invoker-plugin.version>3.9.1</maven-invoker-plugin.version>
+        <github-site-maven-plugin.version>0.12</github-site-maven-plugin.version>
+        <maven-project-info-reports-plugin.version>3.9.0</maven-project-info-reports-plugin.version>
+        <maven-site-plugin.version>3.21.0</maven-site-plugin.version>
 
         <!--
             We don't want to publish or sign any modules by default.
@@ -80,10 +141,10 @@
         <central.snapshots.repo.name>Maven Central Snapshots Repository</central.snapshots.repo.name>
         <central.snapshots.repo.url>https://central.sonatype.com/repository/maven-snapshots/</central.snapshots.repo.url>
 
-
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.min.version>3.9.11</maven.min.version>
+        <maven.min.version>${maven.version}</maven.min.version>
+        <maven-core.version>${maven.version}</maven-core.version>
 
     </properties>
     
@@ -100,6 +161,21 @@
                 <version>${h2.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-core</artifactId>
+                <version>${maven-core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-plugin-api</artifactId>
+                <version>${maven-plugin-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugin-tools</groupId>
+                <artifactId>maven-plugin-annotations</artifactId>
+                <version>${maven-plugin-annotations.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.microsoft.sqlserver</groupId>
                 <artifactId>mssql-jdbc</artifactId>