Upgrade to Groovy 2.1.6

Author: jericks

pom.xml

@@ -204,8 +204,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy</artifactId>
-			<version>1.8.9</version>
+			<artifactId>groovy-all</artifactId>
+			<version>2.1.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>
@@ -248,32 +248,29 @@
 		<sourceDirectory>src/main/groovy</sourceDirectory>
 		<plugins>
 			<plugin>
-				<groupId>org.codehaus.gmaven</groupId>
-				<artifactId>gmaven-plugin</artifactId>
-				<version>1.4</version>
+				<groupId>org.codehaus.groovy</groupId>
+				<artifactId>groovy-eclipse-compiler</artifactId>
+				<version>2.8.0-01</version>
+				<extensions>true</extensions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.0</version>
+				<configuration>
+					<compilerId>groovy-eclipse-compiler</compilerId>
+				</configuration>
 				<dependencies>
 					<dependency>
-						<groupId>org.codehaus.gmaven.runtime</groupId>
-						<artifactId>gmaven-runtime-1.8</artifactId>
-						<version>1.4</version>
+						<groupId>org.codehaus.groovy</groupId>
+						<artifactId>groovy-eclipse-compiler</artifactId>
+						<version>2.8.0-01</version>
 					</dependency>
 					<dependency>
 						<groupId>org.codehaus.groovy</groupId>
-						<artifactId>groovy</artifactId>
-						<version>1.8.9</version>
+						<artifactId>groovy-eclipse-batch</artifactId>
+						<version>2.1.5-03</version>
 					</dependency>
 				</dependencies>
-				<executions>
-					<execution>
-						<configuration>
-							<providerSelection>1.8</providerSelection>
-						</configuration>
-						<goals>
-							<goal>compile</goal>
-							<goal>testCompile</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -342,35 +339,6 @@
 				<version>2.5.1</version>
 			</plugin>
 		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.codehaus.gmaven</groupId>
-										<artifactId>gmaven-plugin</artifactId>
-										<versionRange>1.4</versionRange>
-										<goals>
-											<goal>compile</goal>
-											<goal>testCompile</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<execute />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 		<extensions>
 			<extension>
 				<groupId>org.apache.maven.wagon</groupId>

src/assembly/dir.xml

@@ -15,7 +15,7 @@
             <scope>runtime</scope>
             <useProjectArtifact>true</useProjectArtifact>
             <excludes>
-				<!--<exclude>org.codehaus.groovy:groovy-all</exclude>-->
+				<exclude>org.codehaus.groovy:groovy-all</exclude>
                 <exclude>xml-apis:xml-apis</exclude>
                 <exclude>jai_*</exclude>
             </excludes>