diff --git a/pom.xml b/pom.xml
index 34fbbfa..44610c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -403,6 +403,10 @@
                 <!-- Suppress timestamp meta tag -->
                 <docdate/>
                 <docdatetime/>
+
+                <!-- project specific -->
+                <project-version>${project.version}</project-version>
+                <project-groupId>${project.groupId}</project-groupId>
               </attributes>
               <requires>
                 <require>asciidoctor-diagram</require>
diff --git a/src/site/asciidoc/examples/differentTestAndCompile.adoc b/src/site/asciidoc/examples/differentTestAndCompile.adoc
index bd556e8..609a39f 100644
--- a/src/site/asciidoc/examples/differentTestAndCompile.adoc
+++ b/src/site/asciidoc/examples/differentTestAndCompile.adoc
@@ -5,7 +5,7 @@
 
 To have different weaving configurations for the main and test classes, you can configure the plugin as shown below.
 
-[source,xml]
+[source,xml,subs="attributes,verbatim"]
 ----
 <project>
   <!-- ... -->
@@ -14,7 +14,7 @@ To have different weaving configurations for the main and test classes, you can
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
-      <version>${aspectjVersion}</version>
+      <version>{aspectjVersion}</version>
     </dependency>
     <!-- ... -->
   </dependencies>
@@ -22,9 +22,9 @@ To have different weaving configurations for the main and test classes, you can
   <build>
     <plugins>
       <plugin>
-        <groupId>${project.groupId}</groupId>
+        <groupId>{project-groupId}</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
-        <version>${project.version}</version>
+        <version>{project-version}</version>
         <executions>
           <execution>
             <id>compile</id>
diff --git a/src/site/asciidoc/examples/includeExclude.adoc b/src/site/asciidoc/examples/includeExclude.adoc
index 0c36e88..258cc25 100644
--- a/src/site/asciidoc/examples/includeExclude.adoc
+++ b/src/site/asciidoc/examples/includeExclude.adoc
@@ -13,7 +13,7 @@ implementation, an advanced implementation covering most needs regarding source
 If you do not wish to use any source directory at all, e.g. in a plugin execution only doing binary weaving, you can
 just add an empty `sources` tag, i.e. `<sources/>` (Maven 3 style) or `<sources><source/></sources>` (Maven 2 style).
 
-[source,xml]
+[source,xml,subs="attributes,verbatim"]
 ----
 <project>
   <!-- ... -->
@@ -22,7 +22,7 @@ just add an empty `sources` tag, i.e. `<sources/>` (Maven 3 style) or `<sources>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
-      <version>${aspectjVersion}</version>
+      <version>{aspectjVersion}</version>
     </dependency>
     <!-- ... -->
   </dependencies>
@@ -30,9 +30,9 @@ just add an empty `sources` tag, i.e. `<sources/>` (Maven 3 style) or `<sources>
   <build>
     <plugins>
       <plugin>
-        <groupId>${project.groupId}</groupId>
+        <groupId>{project-groupId}</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
-        <version>${project.version}</version>
+        <version>{project-version}</version>
         <configuration>
           <sources>
             <source>
@@ -67,7 +67,7 @@ just add an empty `sources` tag, i.e. `<sources/>` (Maven 3 style) or `<sources>
 AspectJ Maven Plugin will by default add all `.java` and `.aj` files in the project source directories. Below, you find
 an example of how to add include/exclude filtering on top of that.
 
-[source,xml]
+[source,xml,subs="attributes,verbatim"]
 ----
 <project>
   <!-- ... -->
@@ -76,7 +76,7 @@ an example of how to add include/exclude filtering on top of that.
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
-      <version>${aspectjVersion}</version>
+      <version>{aspectjVersion}</version>
     </dependency>
     <!-- ... -->
   </dependencies>
@@ -84,9 +84,9 @@ an example of how to add include/exclude filtering on top of that.
   <build>
     <plugins>
       <plugin>
-        <groupId>${project.groupId}</groupId>
+        <groupId>{project-groupId}</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
-        <version>${project.version}</version>
+        <version>{project-version}</version>
         <configuration>
           <includes>
             <include>**/TransationAspect.java</include>
diff --git a/src/site/asciidoc/examples/libraryJars.adoc b/src/site/asciidoc/examples/libraryJars.adoc
index d270381..2243de6 100644
--- a/src/site/asciidoc/examples/libraryJars.adoc
+++ b/src/site/asciidoc/examples/libraryJars.adoc
@@ -8,7 +8,7 @@ weaving in the plugin configuration as shown below.
 
 **Note:** The artifacts you reference must exist as regular dependencies in your project.
 
-[source,xml]
+[source,xml,subs="attributes,verbatim"]
 ----
 <project>
   <!-- ... -->
@@ -17,7 +17,7 @@ weaving in the plugin configuration as shown below.
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
-      <version>${aspectjVersion}</version>
+      <version>{aspectjVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.agroup</groupId>
@@ -35,9 +35,9 @@ weaving in the plugin configuration as shown below.
   <build>
     <plugins>
       <plugin>
-        <groupId>${project.groupId}</groupId>
+        <groupId>{project-groupId}</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
-        <version>${project.version}</version>
+        <version>{project-version}</version>
         <configuration>
           <aspectLibraries>
             <aspectLibrary>
diff --git a/src/site/asciidoc/examples/usingReport.adoc b/src/site/asciidoc/examples/usingReport.adoc
index 904edc7..07cb98e 100644
--- a/src/site/asciidoc/examples/usingReport.adoc
+++ b/src/site/asciidoc/examples/usingReport.adoc
@@ -10,7 +10,7 @@ classes for javadoc generation on JDK 9+, you need to make sure that your `JAVA_
 correct JDK before using this feature. You can just try your default setup, but if classes or libraries are not found,
 you probably need to adjust your configuration correspondingly.
 
-[source,xml]
+[source,xml,subs="attributes,verbatim"]
 ----
 <project>
   <!-- ... -->
@@ -19,7 +19,7 @@ you probably need to adjust your configuration correspondingly.
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
-      <version>${aspectjVersion}</version>
+      <version>{aspectjVersion}</version>
       <scope>compile</scope>
     </dependency>
     <!-- ... -->
@@ -28,9 +28,9 @@ you probably need to adjust your configuration correspondingly.
   <reporting>
     <plugins>
       <plugin>
-        <groupId>${project.groupId}</groupId>
+        <groupId>{project-groupId}</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
-        <version>${project.version}</version>
+        <version>{project-version}</version>
         <configuration>
           <verbose>true</verbose>
           <privateScope>true</privateScope>
diff --git a/src/site/asciidoc/examples/usingTogetherWithAJDT.adoc b/src/site/asciidoc/examples/usingTogetherWithAJDT.adoc
index d0a8974..0dd2454 100644
--- a/src/site/asciidoc/examples/usingTogetherWithAJDT.adoc
+++ b/src/site/asciidoc/examples/usingTogetherWithAJDT.adoc
@@ -7,7 +7,7 @@ To use this plugin together with AJDT (AspectJ Development Tools for Eclipse IDE
 `ajdtBuildDefFile` property to point to the `build.ajproperties` file generated by AJDT. The use of this property
 overrides the configured project source folders. Any include or exclude elements in the POM are also disregarded.
 
-[source,xml]
+[source,xml,subs="attributes,verbatim"]
 ----
 <project>
   <!-- ... -->
@@ -16,7 +16,7 @@ overrides the configured project source folders. Any include or exclude elements
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
-      <version>${aspectjVersion}</version>
+      <version>{aspectjVersion}</version>
     </dependency>
     <!-- ... -->
   </dependencies>
@@ -24,9 +24,9 @@ overrides the configured project source folders. Any include or exclude elements
   <build>
     <plugins>
       <plugin>
-        <groupId>${project.groupId}</groupId>
+        <groupId>{project-groupId}</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
-        <version>${project.version}</version>
+        <version>{project-version}</version>
         <configuration>
           <ajdtBuildDefFile>build.ajproperties</ajdtBuildDefFile>
         </configuration>
diff --git a/src/site/asciidoc/examples/weaveDirectories.adoc b/src/site/asciidoc/examples/weaveDirectories.adoc
index 3946fe1..2b202aa 100644
--- a/src/site/asciidoc/examples/weaveDirectories.adoc
+++ b/src/site/asciidoc/examples/weaveDirectories.adoc
@@ -11,7 +11,7 @@ specify the folder(s) with the compiled classes via `weaveDirectories` and execu
     default phases `compile` and `test-compile`,
   * or you select later phases for AspectJ Maven Plugin, i.e. `process-classes` and `process-test-classes` or later.
 
-[source,xml]
+[source,xml,subs="attributes,verbatim"]
 ----
 <project>
   <!-- ... -->
@@ -35,7 +35,7 @@ specify the folder(s) with the compiled classes via `weaveDirectories` and execu
         </executions>
       </plugin>
       <plugin>
-        <groupId>${project.groupId}</groupId>
+        <groupId>{project-groupId}</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
         <configuration>
           <weaveDirectories>
diff --git a/src/site/asciidoc/examples/weaveJars.adoc b/src/site/asciidoc/examples/weaveJars.adoc
index a508a53..7c63dad 100644
--- a/src/site/asciidoc/examples/weaveJars.adoc
+++ b/src/site/asciidoc/examples/weaveJars.adoc
@@ -8,7 +8,7 @@ you need do configure all the JAR files you want to weave in the plugin configur
 
 **Note:** The artifacts you reference must exist as regular dependencies in the project.
 
-[source,xml]
+[source,xml,subs="attributes,verbatim"]
 ----
 <project>
   <!-- ... -->
@@ -17,7 +17,7 @@ you need do configure all the JAR files you want to weave in the plugin configur
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
-      <version>${aspectjVersion}</version>
+      <version>{aspectjVersion}</version>
     </dependency>
 
      <dependency>
@@ -37,9 +37,9 @@ you need do configure all the JAR files you want to weave in the plugin configur
   <build>
     <plugins>
       <plugin>
-        <groupId>${project.groupId}</groupId>
+        <groupId>{project-groupId}</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
-        <version>${project.version}</version>
+        <version>{project-version}</version>
         <configuration>
           <weaveDependencies>
             <weaveDependency>
diff --git a/src/site/asciidoc/multimodule/multimodule_strategy.adoc b/src/site/asciidoc/multimodule/multimodule_strategy.adoc
index 449e656..4102d31 100644
--- a/src/site/asciidoc/multimodule/multimodule_strategy.adoc
+++ b/src/site/asciidoc/multimodule/multimodule_strategy.adoc
@@ -178,7 +178,7 @@ Now that our tiny validation API is complete, it is time to implement its corres
 that the `validation-aspect` module assigns its POM parent to `rootParentPOM`, since we want to use the AspectJ
 dependencies managed in the parent. The POM bits of the `validation-aspect` project are shown below:
 
-[source,xml]
+[source,xml,subs="attributes,verbatim"]
 ----
 <!-- +========================================= -->
 <!-- | Define the Parent POM                    -->
@@ -210,9 +210,9 @@ dependencies managed in the parent. The POM bits of the `validation-aspect` proj
 <build>
   <plugins>
     <plugin>
-      <groupId>${project.groupId}</groupId>
+      <groupId>{project-groupId}</groupId>
       <artifactId>aspectj-maven-plugin</artifactId>
-      <version>${project.version}</version>
+      <version>{project-version}</version>
       <configuration>
         <complianceLevel>8</complianceLevel>
       </configuration>
@@ -344,7 +344,7 @@ The last piece of the AspectJ plugin puzzle is the inclusion of our validation a
 which is performed within the `aspectParentPOM` module. The `aspectParentPOM` must therefore include a dependency on the
 `validation-aspect` project, and use the `rootParentPOM` as a parent.
 
-[source,xml]
+[source,xml,subs="attributes,verbatim"]
 ----
 <!-- +========================================= -->
 <!-- | Define the Parent POM                    -->
@@ -386,9 +386,9 @@ which is performed within the `aspectParentPOM` module. The `aspectParentPOM` mu
 <build>
   <plugins>
     <plugin>
-      <groupId>${project.groupId}</groupId>
+      <groupId>{project-groupId}</groupId>
       <artifactId>aspectj-maven-plugin</artifactId>
-      <version>${project.version}</version>
+      <version>{project-version}</version>
       <configuration>
         <complianceLevel>8</complianceLevel>
         <aspectDirectory>src/main/aspect</aspectDirectory>
diff --git a/src/site/asciidoc/usage.adoc b/src/site/asciidoc/usage.adoc
index 151929e..6f5cdac 100644
--- a/src/site/asciidoc/usage.adoc
+++ b/src/site/asciidoc/usage.adoc
@@ -11,7 +11,7 @@ modules contain aspects and other modules within the Maven reactor contain code
 
 Below follows a standard single-project usage example.
 
-[source,xml]
+[source,xml,subs="attributes,verbatim"]
 ----
 <project>
   <!-- ... -->
@@ -20,7 +20,7 @@ Below follows a standard single-project usage example.
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
-      <version>${aspectjVersion}</version>
+      <version>{aspectjVersion}</version>
     </dependency>
     <!-- ... -->
   </dependencies>
@@ -28,9 +28,9 @@ Below follows a standard single-project usage example.
   <build>
     <plugins>
       <plugin>
-        <groupId>${project.groupId}</groupId>
+        <groupId>{project-groupId}</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
-        <version>${project.version}</version>
+        <version>{project-version}</version>
         <executions>
           <execution>
             <goals>
@@ -58,7 +58,7 @@ This plugin's release frequency is lower than AspectJ's. Therefore, if for examp
 you need to adjust the `aspectjtools` compiler dependency within the plugin and ideally also the `aspectjrt` runtime
 used by the compiled module in sync with it.
 
-[source,xml]
+[source,xml,subs="attributes,verbatim"]
 ----
 <project>
   <!-- ... -->
@@ -81,9 +81,9 @@ used by the compiled module in sync with it.
   <build>
     <plugins>
       <plugin>
-        <groupId>${project.groupId}</groupId>
+        <groupId>{project-groupId}</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
-        <version>${project.version}</version>
+        <version>{project-version}</version>
         <dependencies>
           <dependency>
             <groupId>org.aspectj</groupId>