diff --git a/pom.xml b/pom.xml
index a2791d417..f518c905f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,14 +174,17 @@ under the License.
 
     <!-- non-org.apache.maven plugins -->
 
-    <!-- org.apache plugins -->
-    <apache-rat-plugin.version>0.18</apache-rat-plugin.version>
-    <apache-source-release-assembly-descriptor.version>1.8</apache-source-release-assembly-descriptor.version>
-
     <!-- com.github.hazendaz.maven plugins -->
     <coveralls-repo-token></coveralls-repo-token>
     <coveralls-maven-plugin.version>5.0.0</coveralls-maven-plugin.version>
 
+    <!-- io.github.git-commit-id plugins-->
+    <git-commit-id-maven-plugin.version>10.0.0</git-commit-id-maven-plugin.version>
+
+    <!-- org.apache plugins -->
+    <apache-rat-plugin.version>0.18</apache-rat-plugin.version>
+    <apache-source-release-assembly-descriptor.version>1.8</apache-source-release-assembly-descriptor.version>
+
     <!-- org.jacoco plugins -->
     <jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
 
@@ -500,6 +503,41 @@ under the License.
 
         <!-- non-org-apache-maven plugins -->
 
+        <plugin>
+          <!-- Submit code coverage report to Coveralls.io. -->
+          <groupId>com.github.hazendaz.maven</groupId>
+          <artifactId>coveralls-maven-plugin</artifactId>
+          <version>${coveralls-maven-plugin.version}</version>
+          <configuration>
+            <repoToken>${coveralls-repo-token}</repoToken>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <groupId>io.github.git-commit-id</groupId>
+          <artifactId>git-commit-id-maven-plugin</artifactId>
+          <version>${git-commit-id-maven-plugin.version}</version>
+          <executions>
+            <execution>
+              <id>get-the-git-infos</id>
+              <goals>
+                <goal>revision</goal>
+              </goals>
+              <phase>initialize</phase>
+            </execution>
+          </executions>
+          <configuration>
+            <generateGitPropertiesFile>true</generateGitPropertiesFile>
+            <generateGitPropertiesFilename>${project.basedir}/git.properties</generateGitPropertiesFilename>
+            <includeOnlyProperties>
+              <includeOnlyProperty>^git\.branch$</includeOnlyProperty>
+              <includeOnlyProperty>^git\.commit\.id$</includeOnlyProperty>
+              <includeOnlyProperty>^git\.commit\.time$</includeOnlyProperty>
+              <includeOnlyProperty>^git\.build\.user\.email$</includeOnlyProperty>
+            </includeOnlyProperties>
+          </configuration>
+        </plugin>
+
         <plugin>
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
@@ -535,16 +573,6 @@ under the License.
           </configuration>
         </plugin>
 
-        <plugin>
-          <!-- Submit code coverage report to Coveralls.io. -->
-          <groupId>com.github.hazendaz.maven</groupId>
-          <artifactId>coveralls-maven-plugin</artifactId>
-          <version>${coveralls-maven-plugin.version}</version>
-          <configuration>
-            <repoToken>${coveralls-repo-token}</repoToken>
-          </configuration>
-        </plugin>
-
         <plugin>
           <!-- Generates code coverage report banner for website. -->
           <groupId>org.jacoco</groupId>
@@ -592,18 +620,18 @@ under the License.
         <artifactId>maven-clean-plugin</artifactId>
       </plugin>
 
-      <!-- compiler plugin not required here -->
+      <!-- compiler plugin is automatic and not required here -->
 
-      <!-- deploy plugin not required here -->
+      <!-- deploy plugin is automatic and not required here -->
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
       </plugin>
 
-      <!-- gpg plugin only activated in nexus-jars profile -->
+      <!-- gpg plugin activated in nexus-jars profile -->
 
-      <!-- install plugin not required here -->
+      <!-- install plugin is automatic and not required here -->
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -641,7 +669,10 @@ under the License.
         <artifactId>coveralls-maven-plugin</artifactId>
       </plugin>
 
-
+      <plugin>
+        <groupId>io.github.git-commit-id</groupId>
+        <artifactId>git-commit-id-maven-plugin</artifactId>
+      </plugin>
 
       <plugin>
         <groupId>org.apache.rat</groupId>
diff --git a/src/assembly/source-release.xml b/src/assembly/source-release.xml
index 1d8d7ecb6..fe3e857a8 100644
--- a/src/assembly/source-release.xml
+++ b/src/assembly/source-release.xml
@@ -23,6 +23,7 @@ under the License.
   <formats>
     <format>zip</format>
   </formats>
+  <baseDirectory>${project.artifactId}-${project.version}-source-release</baseDirectory>
   <fileSets>
     <fileSet>
       <directory>${project.basedir}</directory>
@@ -32,9 +33,14 @@ under the License.
         <!-- Git & Build folders -->
         <exclude>**/.git/**</exclude>
         <exclude>**/target/**</exclude>
-        
+        <!-- GitHub and SCM configuration -->
+        <exclude>**/.github/**</exclude>
+        <exclude>**/.gitattributes</exclude>
         <!-- Private / Tooling folders requested to be blocked -->
         <exclude>**/.vscode/**</exclude>
+        <exclude>**/.idea/**</exclude>
+        <exclude>**/.checkstyle</exclude>
+        <exclude>**/.DS_Store</exclude>
         <exclude>**/.settings/**</exclude>
         <exclude>**/.asf.yaml</exclude>
         <exclude>**/.classpath</exclude>