Use Custom Properties for Compile Skipping (Azure#26834)

AzureSDKAutomation · Feb 2, 2022 · 0b513f7 · 0b513f7
1 parent 1af4a46
commit 0b513f7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml
@@ -326,7 +326,7 @@ jobs:
         displayName: 'Run SpotBugs, Checkstyle, RevApi, and Javadoc'
         inputs:
           mavenPomFile: pom.xml
-          options: '$(DefaultOptions) --no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme -Dmaven.main.skip=true -Dmaven.test.skip=true ${{ parameters.AdditionalLintingOptions }} -pl $(ProjectList)'
+          options: '$(DefaultOptions) --no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme -DskipCompile=true -DskipTestCompile=true ${{ parameters.AdditionalLintingOptions }} -pl $(ProjectList)'
           mavenOptions: '$(MemoryOptions)'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: $(JavaBuildVersion)

diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json
@@ -29,7 +29,7 @@
       "AZURE_TEST_HTTP_CLIENTS": "netty",
       "TestFromSource": true,
       "TestGoals": "verify",
-      "TestOptions": "-Dmaven.main.skip=true -Dmaven.test.skip=true -DcreateSourcesJar=false"
+      "TestOptions": "-DskipCompile=true -DskipTestCompile=true -DcreateSourcesJar=false"
     },
     {
       "Agent": {
@@ -39,7 +39,7 @@
       "AZURE_TEST_HTTP_CLIENTS": "netty",
       "TestFromSource": false,
       "TestGoals": "verify",
-      "TestOptions": "-Dmaven.main.skip=true -Dmaven.test.skip=true -DcreateSourcesJar=false"
+      "TestOptions": "-DskipCompile=true -DskipTestCompile=true -DcreateSourcesJar=false"
     }
   ]
 }
diff --git a/sdk/parents/azure-client-sdk-parent/pom.xml b/sdk/parents/azure-client-sdk-parent/pom.xml
@@ -181,6 +181,13 @@
 
     <!-- This property configures whether doclinting is performed when generating Javadocs. -->
     <doclint>all</doclint>
+
+    <!-- The following properties configure compile skipping. -->
+    <!-- While maven-compiler-plugin has properties for skipping source and test compile other plugins -->
+    <!-- key in on the properties as well. These properties ensure that skipping compiles doesn't result -->
+    <!-- in unexpected plugin changes outside of maven-compiler-plugin. -->
+    <skipCompile>false</skipCompile>
+    <skipTestCompile>false</skipTestCompile>
   </properties>
 
   <build>
@@ -509,6 +516,8 @@
           <configuration>
             <showWarnings>true</showWarnings>
             <failOnWarning>true</failOnWarning>
+            <skipMain>${skipCompile}</skipMain>
+            <skip>${skipTestCompile}</skip>
             <compilerArgs combine.children="append" combine.self="append">
               <!-- Turn off annotation processing -->
               <arg>-proc:none</arg>