diff --git a/modello-core/src/site/site.xml b/modello-core/src/site/site.xml
index f5f579108..940399641 100644
--- a/modello-core/src/site/site.xml
+++ b/modello-core/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/modello-maven-plugin/pom.xml b/modello-maven-plugin/pom.xml
index a42f504f5..d8ae3c9ed 100644
--- a/modello-maven-plugin/pom.xml
+++ b/modello-maven-plugin/pom.xml
@@ -15,18 +15,14 @@
   <description>Modello Maven Plugin enables the use of Modello in Maven builds.</description>
 
   <prerequisites>
-    <maven>${maven.version}</maven>
+    <maven>${mavenVersion}</maven>
   </prerequisites>
 
-  <properties>
-    <mavenPluginTools>3.11.0</mavenPluginTools>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>${maven.version}</version>
+      <version>${mavenVersion}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -36,13 +32,13 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
-      <version>${maven.version}</version>
+      <version>${mavenVersion}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>${maven.version}</version>
+      <version>${mavenVersion}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -52,7 +48,6 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>${mavenPluginTools}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -126,46 +121,11 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-plugin-plugin</artifactId>
-          <version>${mavenPluginTools}</version>
-          <configuration>
-            <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-plugin-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>mojo-descriptor</id>
-            <goals>
-              <goal>descriptor</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>generated-helpmojo</id>
-            <goals>
-              <goal>helpmojo</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
   <reporting>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-plugin-plugin</artifactId>
+        <artifactId>maven-plugin-report-plugin</artifactId>
       </plugin>
     </plugins>
   </reporting>
diff --git a/modello-maven-plugin/src/it/features/src/site/site.xml b/modello-maven-plugin/src/it/features/src/site/site.xml
index 45e5eb2e6..bbe98bd59 100644
--- a/modello-maven-plugin/src/it/features/src/site/site.xml
+++ b/modello-maven-plugin/src/it/features/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/modello-maven-plugin/src/site/site.xml b/modello-maven-plugin/src/site/site.xml
index 5ce42b209..ec884ef4c 100644
--- a/modello-maven-plugin/src/site/site.xml
+++ b/modello-maven-plugin/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/modello-plugins/modello-plugin-converters/src/site/site.xml b/modello-plugins/modello-plugin-converters/src/site/site.xml
index f5f579108..940399641 100644
--- a/modello-plugins/modello-plugin-converters/src/site/site.xml
+++ b/modello-plugins/modello-plugin-converters/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/modello-plugins/modello-plugin-dom4j/src/site/site.xml b/modello-plugins/modello-plugin-dom4j/src/site/site.xml
index f5f579108..940399641 100644
--- a/modello-plugins/modello-plugin-dom4j/src/site/site.xml
+++ b/modello-plugins/modello-plugin-dom4j/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/modello-plugins/modello-plugin-jackson/src/site/site.xml b/modello-plugins/modello-plugin-jackson/src/site/site.xml
index f5f579108..940399641 100644
--- a/modello-plugins/modello-plugin-jackson/src/site/site.xml
+++ b/modello-plugins/modello-plugin-jackson/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/modello-plugins/modello-plugin-java/pom.xml b/modello-plugins/modello-plugin-java/pom.xml
index 1e7ec512e..28cf7abda 100644
--- a/modello-plugins/modello-plugin-java/pom.xml
+++ b/modello-plugins/modello-plugin-java/pom.xml
@@ -33,43 +33,6 @@
       <version>2.3.1</version>
       <scope>test</scope>
     </dependency>
-
-    <!--  Castor's component containing org.exolab.javasource -->
-    <!--dependency>
-      <groupId>org.codehaus.castor</groupId>
-      <artifactId>castor-codegen</artifactId>
-      <version>1.3rc1</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>castor-core</artifactId>
-          <groupId>org.codehaus.castor</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>castor-jdo</artifactId>
-          <groupId>org.codehaus.castor</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>castor-xml</artifactId>
-          <groupId>org.codehaus.castor</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>castor-xml-schema</artifactId>
-          <groupId>org.codehaus.castor</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>velocity</artifactId>
-          <groupId>velocity</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>log4j</artifactId>
-          <groupId>log4j</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>commons-logging</artifactId>
-          <groupId>commons-logging</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency -->
   </dependencies>
 
   <build>
diff --git a/modello-plugins/modello-plugin-java/src/site/site.xml b/modello-plugins/modello-plugin-java/src/site/site.xml
index f5f579108..940399641 100644
--- a/modello-plugins/modello-plugin-java/src/site/site.xml
+++ b/modello-plugins/modello-plugin-java/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/modello-plugins/modello-plugin-jdom/src/site/site.xml b/modello-plugins/modello-plugin-jdom/src/site/site.xml
index f5f579108..940399641 100644
--- a/modello-plugins/modello-plugin-jdom/src/site/site.xml
+++ b/modello-plugins/modello-plugin-jdom/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/modello-plugins/modello-plugin-jsonschema/src/site/site.xml b/modello-plugins/modello-plugin-jsonschema/src/site/site.xml
index f5f579108..940399641 100644
--- a/modello-plugins/modello-plugin-jsonschema/src/site/site.xml
+++ b/modello-plugins/modello-plugin-jsonschema/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/modello-plugins/modello-plugin-sax/src/site/site.xml b/modello-plugins/modello-plugin-sax/src/site/site.xml
index f5f579108..940399641 100644
--- a/modello-plugins/modello-plugin-sax/src/site/site.xml
+++ b/modello-plugins/modello-plugin-sax/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/modello-plugins/modello-plugin-snakeyaml/src/site/site.xml b/modello-plugins/modello-plugin-snakeyaml/src/site/site.xml
index f5f579108..940399641 100644
--- a/modello-plugins/modello-plugin-snakeyaml/src/site/site.xml
+++ b/modello-plugins/modello-plugin-snakeyaml/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/modello-plugins/modello-plugin-stax/src/site/site.xml b/modello-plugins/modello-plugin-stax/src/site/site.xml
index f5f579108..940399641 100644
--- a/modello-plugins/modello-plugin-stax/src/site/site.xml
+++ b/modello-plugins/modello-plugin-stax/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/modello-plugins/modello-plugin-velocity/src/site/site.xml b/modello-plugins/modello-plugin-velocity/src/site/site.xml
index f5f579108..940399641 100644
--- a/modello-plugins/modello-plugin-velocity/src/site/site.xml
+++ b/modello-plugins/modello-plugin-velocity/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/modello-plugins/modello-plugin-xdoc/src/site/site.xml b/modello-plugins/modello-plugin-xdoc/src/site/site.xml
index 71906e2a9..95a5b8a44 100644
--- a/modello-plugins/modello-plugin-xdoc/src/site/site.xml
+++ b/modello-plugins/modello-plugin-xdoc/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/modello-plugins/modello-plugin-xml/src/site/site.xml b/modello-plugins/modello-plugin-xml/src/site/site.xml
index f5f579108..940399641 100644
--- a/modello-plugins/modello-plugin-xml/src/site/site.xml
+++ b/modello-plugins/modello-plugin-xml/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/modello-plugins/modello-plugin-xpp3/src/site/site.xml b/modello-plugins/modello-plugin-xpp3/src/site/site.xml
index f5f579108..940399641 100644
--- a/modello-plugins/modello-plugin-xpp3/src/site/site.xml
+++ b/modello-plugins/modello-plugin-xpp3/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/modello-plugins/modello-plugin-xsd/src/site/site.xml b/modello-plugins/modello-plugin-xsd/src/site/site.xml
index f5f579108..940399641 100644
--- a/modello-plugins/modello-plugin-xsd/src/site/site.xml
+++ b/modello-plugins/modello-plugin-xsd/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/modello-plugins/pom.xml b/modello-plugins/pom.xml
index 18814dfaf..56166320b 100644
--- a/modello-plugins/pom.xml
+++ b/modello-plugins/pom.xml
@@ -51,7 +51,6 @@
       <plugins>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.6.1</version>
           <executions>
             <execution>
               <id>copy-test-libs</id>
diff --git a/modello-plugins/src/site/site.xml b/modello-plugins/src/site/site.xml
index b8a3e0a7d..29c572ec4 100644
--- a/modello-plugins/src/site/site.xml
+++ b/modello-plugins/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/modello-test/src/site/site.xml b/modello-test/src/site/site.xml
index f5f579108..940399641 100644
--- a/modello-test/src/site/site.xml
+++ b/modello-test/src/site/site.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
   </bannerLeft>
diff --git a/pom.xml b/pom.xml
index 2d6ab3b0b..9ea797344 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,17 +18,17 @@
     Modello generates code from a simple model format: based on a plugin architecture, various types of code and
     descriptors can be generated from the single model, including Java POJOs, XML/JSON/YAML marshallers/unmarshallers,
     XSD, JSON Schema and documentation.</description>
-  <url>http://codehaus-plexus.github.io/modello/</url>
+  <url>https://codehaus-plexus.github.io/modello/</url>
   <inceptionYear>2001</inceptionYear>
   <organization>
     <name>Codehaus Plexus</name>
-    <url>http://codehaus-plexus.github.io/</url>
+    <url>https://codehaus-plexus.github.io/</url>
   </organization>
 
   <licenses>
     <license>
       <name>The MIT License</name>
-      <url>http://opensource.org/licenses/mit-license.php</url>
+      <url>https://spdx.org/licenses/MIT.txt</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
@@ -183,25 +183,22 @@
   </modules>
 
   <scm>
-    <connection>scm:git:https://github.com/codehaus-plexus/modello.git</connection>
-    <developerConnection>scm:git:https://github.com/codehaus-plexus/modello.git</developerConnection>
-    <tag>modello-2.1.2</tag>
-    <url>http://github.com/codehaus-plexus/modello/tree/${project.scm.tag}/</url>
+    <connection>${scm.url}</connection>
+    <developerConnection>${scm.url}</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://github.com/codehaus-plexus/modello/tree/${project.scm.tag}/</url>
   </scm>
+
   <issueManagement>
     <system>github</system>
     <url>http://github.com/codehaus-plexus/modello/issues</url>
   </issueManagement>
+
   <ciManagement>
-    <notifiers>
-      <notifier>
-        <type>mail</type>
-        <configuration>
-          <address>dev@modello.codehaus.org</address>
-        </configuration>
-      </notifier>
-    </notifiers>
+    <system>github</system>
+    <url>https://github.com/codehaus-plexus/modello/actions</url>
   </ciManagement>
+
   <distributionManagement>
     <repository>
       <id>ossrh-staging</id>
@@ -214,16 +211,17 @@
       <url>https://oss.sonatype.org/content/repositories/snapshots</url>
     </snapshotRepository>
     <site>
-      <id>github</id>
-      <url>scm:git:git@github.com:codehaus-plexus/modello.git</url>
+      <id>github:gh-pages</id>
+      <url>${scm.url}</url>
     </site>
   </distributionManagement>
 
   <properties>
+    <scm.url>scm:git:git@github.com:codehaus-plexus/modello.git</scm.url>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <jackson.version>2.16.1</jackson.version>
     <jdom.version>2.0.2</jdom.version>
-    <maven.version>3.5.4</maven.version>
+    <mavenVersion>3.5.4</mavenVersion>
     <!--
       ! This controls the minimum java version
       ! and also the version which is used
@@ -379,7 +377,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>3.4.1</version>
           <executions>
             <execution>
               <id>enforce-java</id>
@@ -391,9 +388,6 @@
                   <requireJavaVersion>
                     <version>${javaVersion}</version>
                   </requireJavaVersion>
-                  <requireMavenVersion>
-                    <version>${maven.version}</version>
-                  </requireMavenVersion>
                 </rules>
               </configuration>
             </execution>
@@ -402,7 +396,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.3.0</version>
           <configuration>
             <archive>
               <manifest>
@@ -415,18 +408,22 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.6.3</version>
           <configuration>
             <detectJavaApiLink>false</detectJavaApiLink>
           </configuration>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <version>3.0.1</version>
           <configuration>
             <autoVersionSubmodules>true</autoVersionSubmodules>
-            <goals>deploy</goals>
-            <releaseProfiles>modello-release</releaseProfiles>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <configuration>
+            <topSiteURL>${scm.url}</topSiteURL>
           </configuration>
         </plugin>
         <plugin>
@@ -442,17 +439,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
       </plugin>
-      <plugin>
-        <artifactId>maven-site-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-descriptor</id>
-            <goals>
-              <goal>attach-descriptor</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.eclipse.sisu</groupId>
         <artifactId>sisu-maven-plugin</artifactId>
@@ -460,85 +446,7 @@
     </plugins>
   </build>
 
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
-
   <profiles>
-    <profile>
-      <id>modello-release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <dependencies>
-              <dependency>
-                <groupId>org.apache.apache.resources</groupId>
-                <artifactId>apache-source-release-assembly-descriptor</artifactId>
-                <version>1.5</version>
-              </dependency>
-            </dependencies>
-            <executions>
-              <execution>
-                <id>source-release-assembly</id>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <phase>package</phase>
-                <configuration>
-                  <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                  <descriptorRefs>
-                    <descriptorRef>source-release</descriptorRef>
-                  </descriptorRefs>
-                  <tarLongFileFormat>gnu</tarLongFileFormat>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar-no-fork</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <id>reporting</id>
       <build>
@@ -580,55 +488,6 @@
           </plugin>
         </plugins>
       </build>
-      <reporting>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-project-info-reports-plugin</artifactId>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-report-plugin</artifactId>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-pmd-plugin</artifactId>
-            <version>3.21.2</version>
-            <configuration>
-              <targetJdk>${java.version}</targetJdk>
-              <rulesets>
-                <ruleset>rulesets/maven.xml</ruleset>
-              </rulesets>
-              <excludeRoots>
-                <excludeRoot>${project.build.directory}/generated-sources/modello</excludeRoot>
-                <excludeRoot>${project.build.directory}/generated-sources/plugin</excludeRoot>
-              </excludeRoots>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jxr-plugin</artifactId>
-            <version>3.3.2</version>
-          </plugin>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>taglist-maven-plugin</artifactId>
-            <version>3.0.0</version>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <reportSets>
-              <reportSet>
-                <reports>
-                  <report>javadoc</report>
-                  <report>test-javadoc</report>
-                </reports>
-              </reportSet>
-            </reportSets>
-          </plugin>
-        </plugins>
-      </reporting>
     </profile>
 
     <profile>
diff --git a/src/site/site.xml b/src/site/site.xml
index 8644958b3..d5de9cfd3 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,41 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
   <bannerLeft>
     <name>Modello</name>
-    <href>http://codehaus-plexus.github.io/modello/</href>
+    <href>https://codehaus-plexus.github.io/modello/</href>
   </bannerLeft>
 
-  <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-fluido-skin</artifactId>
-    <version>1.10.0</version>
-  </skin>
-
-  <edit>${project.scm.url}</edit>
-
-  <custom>
-    <fluidoSkin>
-      <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
-      <googlePlusOne />
-      <googleSearch>
-        <sitesearch>http://codehaus-plexus.github.io/modello/</sitesearch>
-      </googleSearch>
-    </fluidoSkin>
-  </custom>
-
-  <publishDate format="yyyy-MM-dd" position="right" />
-  <version position="right" />
-
   <body>
     <links>
-      <item name="Codehaus Plexus" href="http://codehaus-plexus.github.io/"/>
       <item name="Apache Maven" href="https://maven.apache.org/"/>
     </links>
 
     <!-- Breadcrumbs that every project will inherit -->
     <breadcrumbs>
-      <item name="Modello" href="http://codehaus-plexus.github.io/modello/index.html" />
+      <item name="Modello" href="https://codehaus-plexus.github.io/modello/index.html" />
     </breadcrumbs>
 
     <menu name="Overview" inherit="bottom">