minor: cleanups for ant-phase-verify

ThatSneakyCoder · Oct 23, 2022 · 5768a5e · 5768a5e
1 parent 469a4a8
commit 5768a5e
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 19 deletions.
diff --git a/config/ant-phase-verify.xml b/config/ant-phase-verify.xml
@@ -12,7 +12,6 @@
              classpath="${mvn.runtime_classpath}"
              />
 
-    <property name="checkstyle.pattern.todo" value="NOTHingWillMatCH_-"/>
     <property name="check.config" location="config/checkstyle_checks.xml"/>
     <property name="check.config_non_main"
               location="config/checkstyle_non_main_files_checks.xml"/>
@@ -38,7 +37,6 @@
       <formatter type="plain"/>
       <formatter type="xml" toFile="${mvn.project.build.directory}/cs_errors.xml"/>
       <formatter type="sarif" toFile="${mvn.project.build.directory}/cs_errors.sarif"/>
-      <classpath path="${mvn.runtime_classpath}"/>
       <property key="checkstyle.cache.file" file="${mvn.project.build.directory}/cachefile"/>
       <property key="checkstyle.header.file" file="config/java.header"/>
       <property key="checkstyle.regexp.header.file" file="config/java_regexp.header"/>
@@ -129,7 +127,6 @@
       </path>
       <formatter type="plain"/>
       <formatter type="xml" toFile="${mvn.project.build.directory}/cs_non_main_files_errors.xml"/>
-      <classpath path="${mvn.runtime_classpath}"/>
     </checkstyle>
 
     <tstamp>
@@ -164,7 +161,6 @@
       </path>
       <formatter type="plain"/>
       <formatter type="xml" toFile="${mvn.project.build.directory}/cs_resources_errors.xml"/>
-      <classpath path="${mvn.runtime_classpath}"/>
     </checkstyle>
 
     <tstamp>
@@ -228,7 +224,6 @@
       </path>
       <formatter type="plain"/>
       <formatter type="xml" toFile="${mvn.project.build.directory}/cs_input_errors.xml"/>
-      <classpath path="${mvn.runtime_classpath}"/>
     </checkstyle>
 
     <tstamp>

diff --git a/config/checkstyle_input_checks.xml b/config/checkstyle_input_checks.xml
@@ -12,7 +12,7 @@
   <!-- Suppressions for resources -->
   <module name="SuppressionFilter">
     <property name="file"
-             value="${project.basedir}/config/checkstyle_input_suppressions.xml"/>
+             value="config/checkstyle_input_suppressions.xml"/>
   </module>
 
   <module name="RegexpSingleline">

diff --git a/config/checkstyle_non_main_files_checks.xml b/config/checkstyle_non_main_files_checks.xml
@@ -11,7 +11,7 @@
   <!-- Suppressions for resources -->
   <module name="SuppressionFilter">
     <property name="file"
-             value="${project.basedir}/config/checkstyle_non_main_files_suppressions.xml"/>
+             value="config/checkstyle_non_main_files_suppressions.xml"/>
   </module>
   <!-- Miscellaneous -->
   <module name="NewlineAtEndOfFile" />

diff --git a/config/checkstyle_resources_checks.xml b/config/checkstyle_resources_checks.xml
@@ -12,7 +12,7 @@
   <!-- Suppressions for resources -->
   <module name="SuppressionFilter">
     <property name="file"
-             value="${project.basedir}/config/checkstyle_resources_suppressions.xml"/>
+             value="config/checkstyle_resources_suppressions.xml"/>
   </module>
   <module name="FileTabCharacter"/>
   <module name="RegexpSingleline">

diff --git a/config/checkstyle_sevntu_checks.xml b/config/checkstyle_sevntu_checks.xml
@@ -9,7 +9,7 @@
 
   <!-- Filters -->
   <module name="SuppressionFilter">
-    <property name="file" value="${project.basedir}/config/sevntu_suppressions.xml"/>
+    <property name="file" value="config/sevntu_suppressions.xml"/>
   </module>
 
   <module name="TreeWalker">

diff --git a/pom.xml b/pom.xml
@@ -686,7 +686,6 @@
               <maxAllowedViolations>0</maxAllowedViolations>
               <violationSeverity>error</violationSeverity>
               <cacheFile>${project.build.directory}/cachefile_sevntu</cacheFile>
-              <propertyExpansion>project.basedir=${project.basedir}</propertyExpansion>
               <sourceDirectories>
                 <sourceDirectory>${project.basedir}/src</sourceDirectory>
               </sourceDirectories>
@@ -1496,21 +1495,12 @@
             <configuration>
               <target>
                 <property name="mvn.project.build.directory" value="${project.build.directory}" />
-                <property name="mvn.project.version" value="${project.version}" />
                 <property name="mvn.runtime_classpath" refid="maven.runtime.classpath" />
-                <property name="project.basedir" value="${project.basedir}" />
                 <ant antfile="config/ant-phase-verify.xml" />
               </target>
             </configuration>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant-nodeps</artifactId>
-            <version>1.8.1</version>
-          </dependency>
-        </dependencies>
       </plugin>
 
       <!-- Ensure the manifest has all the gory details -->