From 63bcc1aac1891bb7ae566a4f4af32386e3203477 Mon Sep 17 00:00:00 2001
From: Oli Dagenais <olivida@microsoft.com>
Date: Thu, 4 Feb 2016 10:59:03 -0500
Subject: [PATCH 1/2] Use `groovy` dependency, `groovy-ant` in verify

This removes the following warning when building or
running tests with JDK 6:

Feb 4, 2016 10:56:26 AM
org.codehaus.groovy.runtime.m12n.MetaInfExtensionModule newModule
WARNING: Module [groovy-all] - Unable to load extension class
[org.codehaus.groovy.runtime.NioGroovyMethods]
---
 pom.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dd8681ec..d7361160 100644
--- a/pom.xml
+++ b/pom.xml
@@ -303,6 +303,13 @@ Licensed under the MIT license. See License.txt in the project root. -->
             </configuration>
           </execution>
         </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-ant</artifactId>
+            <version>2.4.5</version>
+          </dependency>
+        </dependencies>
       </plugin>
       <plugin>
         <groupId>com.ruleoftech</groupId>
@@ -521,7 +528,7 @@ Licensed under the MIT license. See License.txt in the project root. -->
     </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-all</artifactId>
+      <artifactId>groovy</artifactId>
       <version>2.4.5</version>
       <scope>test</scope>
     </dependency>

From f3b918bf721ce3ae0450fbbbe7f7a24390d68482 Mon Sep 17 00:00:00 2001
From: Oli Dagenais <olivida@microsoft.com>
Date: Thu, 4 Feb 2016 11:03:11 -0500
Subject: [PATCH 2/2] Scope POM property references to project

This eliminates the following warnings during build:

[WARNING] The expression ${artifactId} is deprecated. Please use
${project.artifactId} instead.
[WARNING] The expression ${version} is deprecated. Please use
${project.version} instead.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d7361160..6d346e76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,7 +286,7 @@ Licensed under the MIT license. See License.txt in the project root. -->
             <configuration>
               <!-- http://stackoverflow.com/a/9339405 -->
               <properties>
-                <shaded_jar_checksum_file>${artifactId}-${version}.jar.sha256</shaded_jar_checksum_file>
+                <shaded_jar_checksum_file>${project.artifactId}-${project.version}.jar.sha256</shaded_jar_checksum_file>
               </properties>
               <scripts>
                 <script><![CDATA[