Merge pull request #970 from hazendaz/master

[build] Use project.version directly instead of loading it to yet ano…
spotbugs · Jan 20, 2025 · 7cf8924 · 7cf8924
2 parents 1ea3753 + bd44f12
commit 7cf8924
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -167,8 +167,6 @@
 
         <sourceDirectory>${project.basedir}/src/main/groovy</sourceDirectory>
 
-        <projectVersion>${project.version}</projectVersion>
-
         <!-- Reproducible Builds: override timestamp value from parent -->
         <project.build.outputTimestamp>1731432691</project.build.outputTimestamp>
 

diff --git a/src/site/apt/examples/multi-module-config.apt.vm b/src/site/apt/examples/multi-module-config.apt.vm
@@ -151,7 +151,7 @@ whizbang
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>${projectVersion}</version>
+        <version>${project.version}</version>
         <configuration>
           <effort>Max</effort>
           <threshold>Low</threshold>

diff --git a/src/site/apt/examples/violationChecking.apt.vm b/src/site/apt/examples/violationChecking.apt.vm
@@ -56,7 +56,7 @@ Violation Checking
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>${projectVersion}</version>
+        <version>${project.version}</version>
         <configuration>
           <effort>Max</effort>
           <threshold>Low</threshold>

diff --git a/src/site/apt/usage.apt.vm b/src/site/apt/usage.apt.vm
@@ -40,7 +40,7 @@
 ~~ https://maven.apache.org/doxia/references/apt-format.html
 
 Usage
-<version>${projectVersion}</version>
+<version>${project.version}</version>
  The following examples describe the basic usage of the SpotBugs plugin.
 
 * Generate SpotBugs Report As Part of the Project Reports
@@ -58,7 +58,7 @@ Usage
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>${projectVersion}</version>
+        <version>${project.version}</version>
       </plugin>
     </plugins>
   </reporting>
@@ -91,7 +91,7 @@ mvn site
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>${projectVersion}</version>
+        <version>${project.version}</version>
         <configuration>
           <xmlOutput>true</xmlOutput>
           <!-- Optional directory to put spotbugs xdoc xml report -->
@@ -128,7 +128,7 @@ mvn site
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>${projectVersion}</version>
+        <version>${project.version}</version>
         <configuration>
           <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
           <includeFilterFile>spotbugs-include.xml</includeFilterFile>
@@ -162,7 +162,7 @@ mvn site
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>${projectVersion}</version>
+        <version>${project.version}</version>
         <configuration>
           <visitors>FindDeadLocalStores,UnreadFields</visitors>
         </configuration>
@@ -193,7 +193,7 @@ mvn site
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>${projectVersion}</version>
+        <version>${project.version}</version>
         <configuration>
           <omitVisitors>FindDeadLocalStores,UnreadFields</omitVisitors>
         </configuration>
@@ -224,7 +224,7 @@ mvn site
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>${projectVersion}</version>
+        <version>${project.version}</version>
         <configuration>
          <onlyAnalyze>com.github.spotbugs.spotbugs.*</onlyAnalyze>
         </configuration>
@@ -255,7 +255,7 @@ mvn site
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>${projectVersion}</version>
+        <version>${project.version}</version>
         <configuration>
           <pluginList>myDetectors.jar, yourDetectors.jar</pluginList>
         </configuration>
@@ -285,7 +285,7 @@ mvn site
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>${projectVersion}</version>
+        <version>${project.version}</version>
         <configuration>
           <plugins>
             <plugin>
@@ -324,7 +324,7 @@ mvn site
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>${projectVersion}</version>
+        <version>${project.version}</version>
         <configuration>
           <!-- Optional directory to put spotbugs xml report -->
         </configuration>