Merge branch 'master' of https://github.com/Azure/azure-sdk-for-java …

…into Azure-core
Azure · Jun 21, 2019 · b808e6e · b808e6e
2 parents 6dc875f + ea2c8c9
commit b808e6e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
@@ -440,6 +440,14 @@
     <Bug pattern="UPM_UNCALLED_PRIVATE_METHOD"/>
   </Match>
 
+  <Match>
+    <Or>
+      <Class name="com.azure.core.util.polling.PollResponseJavaDocCodeSnippets"/>
+      <Class name="com.azure.core.util.polling.PollerJavaDocCodeSnippets"/>
+    </Or>
+    <Bug pattern="URF_UNREAD_FIELD,NP_LOAD_OF_KNOWN_NULL_VALUE,DLS_DEAD_LOCAL_STORE,NP_ALWAYS_NULL,UPM_UNCALLED_PRIVATE_METHOD,SIC_INNER_SHOULD_BE_STATIC_ANON"/>
+  </Match>
+
   <!-- Field initialized by jackson property annotation -->
   <Match>
     <Class name="com.azure.keyvault.keys.models.webkey.JsonWebKey"/>

diff --git a/eng/spotbugs-aggregate-report/pom.xml b/eng/spotbugs-aggregate-report/pom.xml
@@ -45,6 +45,7 @@
                 <source>..\..\appconfiguration\client\src\main\java</source>
                 <source>..\..\appconfiguration\client\src\samples\java</source>
                 <source>..\..\core\azure-core\src\main\java</source>
+                <source>..\..\core\azure-core\src\samples\java</source>
                 <source>..\..\core\azure-core-auth\src\main\java</source>
                 <source>..\..\core\azure-core-management\src\main\java</source>
                 <source>..\..\core\azure-core-test\src\main\java</source>

diff --git a/pom.client.xml b/pom.client.xml
@@ -503,6 +503,7 @@
                   So, path for aggregate reports have to be defined relative to parent pom -->
               <additionalOptions>-maxLineLength 120
                 -snippetpath ${project.basedir}/applicationconfig/client/src/samples/java
+                -snippetpath ${project.basedir}/core/azure-core/src/samples/java
                 -snippetpath ${project.basedir}/keyvault/client/keys/src/samples/java
                 -snippetpath ${project.basedir}/keyvault/client/secrets/src/samples/java
               </additionalOptions>