Update to 2.4

Approved-by:	maintainer

3 files changed, 89 insertions, 61 deletions

diff --git a/devel/gradle/Makefile b/devel/gradle/Makefile
index fca3ea9baa3d..4048697b791c 100644
--- a/devel/gradle/Makefile
+++ b/devel/gradle/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gradle
-PORTVERSION=	2.1
+PORTVERSION=	2.4
 CATEGORIES=	devel java
 MASTER_SITES=	https://services.gradle.org/distributions/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
diff --git a/devel/gradle/distinfo b/devel/gradle/distinfo
index 38eb2f81b892..5bc94389326f 100644
--- a/devel/gradle/distinfo
+++ b/devel/gradle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gradle-2.1-bin.zip) = 3eee4f9ea2ab0221b89f8e4747a96d4554d00ae46d8d633f11cfda60988bf878
-SIZE (gradle-2.1-bin.zip) = 41540840
+SHA256 (gradle-2.4-bin.zip) = c4eaecc621a81f567ded1aede4a5ddb281cc02a03a6a87c4f5502add8fc2f16f
+SIZE (gradle-2.4-bin.zip) = 45383133
diff --git a/devel/gradle/pkg-plist b/devel/gradle/pkg-plist
index 2efcfa56bb60..0b39352c407d 100644
--- a/devel/gradle/pkg-plist
+++ b/devel/gradle/pkg-plist
@@ -1,40 +1,38 @@
 bin/gradle
-%%DATADIR%%/lib/ant-1.9.3.jar
-%%DATADIR%%/lib/ant-launcher-1.9.3.jar
+%%DATADIR%%/lib/ant-1.9.4.jar
+%%DATADIR%%/lib/ant-launcher-1.9.4.jar
 %%DATADIR%%/lib/asm-all-5.0.3.jar
 %%DATADIR%%/lib/commons-collections-3.2.1.jar
 %%DATADIR%%/lib/commons-io-1.4.jar
 %%DATADIR%%/lib/commons-lang-2.6.jar
 %%DATADIR%%/lib/dom4j-1.6.1.jar
-%%DATADIR%%/lib/gradle-base-services-2.1.jar
-%%DATADIR%%/lib/gradle-base-services-groovy-2.1.jar
-%%DATADIR%%/lib/gradle-cli-2.1.jar
-%%DATADIR%%/lib/gradle-core-2.1.jar
-%%DATADIR%%/lib/gradle-docs-2.1.jar
-%%DATADIR%%/lib/gradle-launcher-2.1.jar
-%%DATADIR%%/lib/gradle-messaging-2.1.jar
-%%DATADIR%%/lib/gradle-model-core-2.1.jar
-%%DATADIR%%/lib/gradle-model-groovy-2.1.jar
-%%DATADIR%%/lib/gradle-native-2.1.jar
-%%DATADIR%%/lib/gradle-open-api-2.1.jar
-%%DATADIR%%/lib/gradle-resources-2.1.jar
-%%DATADIR%%/lib/gradle-tooling-api-2.1.jar
-%%DATADIR%%/lib/gradle-ui-2.1.jar
-%%DATADIR%%/lib/gradle-wrapper-2.1.jar
-%%DATADIR%%/lib/groovy-all-2.3.6.jar
+%%DATADIR%%/lib/gradle-base-services-2.4.jar
+%%DATADIR%%/lib/gradle-base-services-groovy-2.4.jar
+%%DATADIR%%/lib/gradle-cli-2.4.jar
+%%DATADIR%%/lib/gradle-core-2.4.jar
+%%DATADIR%%/lib/gradle-docs-2.4.jar
+%%DATADIR%%/lib/gradle-launcher-2.4.jar
+%%DATADIR%%/lib/gradle-messaging-2.4.jar
+%%DATADIR%%/lib/gradle-model-core-2.4.jar
+%%DATADIR%%/lib/gradle-model-groovy-2.4.jar
+%%DATADIR%%/lib/gradle-native-2.4.jar
+%%DATADIR%%/lib/gradle-open-api-2.4.jar
+%%DATADIR%%/lib/gradle-resources-2.4.jar
+%%DATADIR%%/lib/gradle-tooling-api-2.4.jar
+%%DATADIR%%/lib/gradle-ui-2.4.jar
+%%DATADIR%%/lib/gradle-wrapper-2.4.jar
+%%DATADIR%%/lib/groovy-all-2.3.10.jar
 %%DATADIR%%/lib/guava-jdk5-17.0.jar
 %%DATADIR%%/lib/jansi-1.2.1.jar
 %%DATADIR%%/lib/jarjar-1.3.jar
 %%DATADIR%%/lib/javax.inject-1.jar
 %%DATADIR%%/lib/jaxen-1.1.jar
 %%DATADIR%%/lib/jcip-annotations-1.0.jar
-%%DATADIR%%/lib/jcl-over-slf4j-1.7.5.jar
+%%DATADIR%%/lib/jcl-over-slf4j-1.7.10.jar
 %%DATADIR%%/lib/jna-3.2.7.jar
-%%DATADIR%%/lib/jul-to-slf4j-1.7.5.jar
+%%DATADIR%%/lib/jul-to-slf4j-1.7.10.jar
 %%DATADIR%%/lib/kryo-2.20.jar
-%%DATADIR%%/lib/log4j-over-slf4j-1.7.5.jar
-%%DATADIR%%/lib/logback-classic-1.0.13.jar
-%%DATADIR%%/lib/logback-core-1.0.13.jar
+%%DATADIR%%/lib/log4j-over-slf4j-1.7.10.jar
 %%DATADIR%%/lib/minlog-1.2.jar
 %%DATADIR%%/lib/native-platform-0.10.jar
 %%DATADIR%%/lib/native-platform-freebsd-amd64-0.10.jar
@@ -46,48 +44,64 @@ bin/gradle
 %%DATADIR%%/lib/native-platform-windows-amd64-0.10.jar
 %%DATADIR%%/lib/native-platform-windows-i386-0.10.jar
 %%DATADIR%%/lib/objenesis-1.2.jar
-%%DATADIR%%/lib/plugins/ant-antlr-1.9.3.jar
-%%DATADIR%%/lib/plugins/antlr-2.7.7.jar
-%%DATADIR%%/lib/plugins/bcpg-jdk15-1.46.jar
-%%DATADIR%%/lib/plugins/bcprov-jdk15-1.46.jar
+%%DATADIR%%/lib/plugins/aws-java-sdk-core-1.9.19.jar
+%%DATADIR%%/lib/plugins/aws-java-sdk-kms-1.9.19.jar
+%%DATADIR%%/lib/plugins/aws-java-sdk-s3-1.9.19.jar
+%%DATADIR%%/lib/plugins/bcpg-jdk15on-1.51.jar
+%%DATADIR%%/lib/plugins/bcprov-jdk15on-1.51.jar
 %%DATADIR%%/lib/plugins/bndlib-2.1.0.jar
 %%DATADIR%%/lib/plugins/bsh-2.0b4.jar
+%%DATADIR%%/lib/plugins/classworlds-1.1-alpha-2.jar
 %%DATADIR%%/lib/plugins/commons-cli-1.2.jar
 %%DATADIR%%/lib/plugins/commons-codec-1.6.jar
 %%DATADIR%%/lib/plugins/core-3.1.1.jar
 %%DATADIR%%/lib/plugins/geronimo-annotation_1.0_spec-1.0.jar
-%%DATADIR%%/lib/plugins/gradle-announce-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-antlr-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-build-comparison-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-build-init-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-code-quality-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-core-impl-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-cpp-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-diagnostics-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-ear-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-ide-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-ivy-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-jacoco-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-javascript-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-jetty-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-language-base-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-language-jvm-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-maven-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-osgi-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-plugin-development-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-plugin-use-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-plugins-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-publish-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-reporting-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-resources-http-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-scala-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-signing-2.1.jar
-%%DATADIR%%/lib/plugins/gradle-sonar-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-announce-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-antlr-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-build-comparison-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-build-init-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-code-quality-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-dependency-management-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-diagnostics-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-ear-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-ide-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-ide-native-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-ivy-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-jacoco-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-javascript-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-jetty-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-language-groovy-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-language-java-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-language-jvm-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-language-native-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-language-scala-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-maven-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-osgi-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-platform-base-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-platform-jvm-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-platform-native-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-platform-play-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-plugin-development-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-plugin-use-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-plugins-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-publish-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-reporting-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-resources-http-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-resources-s3-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-resources-sftp-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-scala-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-signing-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-sonar-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-testing-native-2.4.jar
+%%DATADIR%%/lib/plugins/gradle-tooling-api-builders-2.4.jar
 %%DATADIR%%/lib/plugins/gson-2.2.4.jar
 %%DATADIR%%/lib/plugins/hamcrest-core-1.3.jar
 %%DATADIR%%/lib/plugins/httpclient-4.2.2.jar
 %%DATADIR%%/lib/plugins/httpcore-4.2.2.jar
 %%DATADIR%%/lib/plugins/ivy-2.2.0.jar
+%%DATADIR%%/lib/plugins/jackson-annotations-2.3.2.jar
+%%DATADIR%%/lib/plugins/jackson-core-2.3.2.jar
+%%DATADIR%%/lib/plugins/jackson-databind-2.3.2.jar
 %%DATADIR%%/lib/plugins/jarjar-aether-api-1.13.1.jar
 %%DATADIR%%/lib/plugins/jarjar-aether-connector-wagon-1.13.1.jar
 %%DATADIR%%/lib/plugins/jarjar-aether-impl-1.13.1.jar
@@ -121,13 +135,23 @@ bin/gradle
 %%DATADIR%%/lib/plugins/jetty-naming-6.1.25.jar
 %%DATADIR%%/lib/plugins/jetty-plus-6.1.25.jar
 %%DATADIR%%/lib/plugins/jetty-util-6.1.25.jar
+%%DATADIR%%/lib/plugins/joda-time-2.7.jar
 %%DATADIR%%/lib/plugins/jsch-0.1.51.jar
 %%DATADIR%%/lib/plugins/jsp-2.1-6.1.14.jar
 %%DATADIR%%/lib/plugins/jsp-api-2.1-6.1.14.jar
-%%DATADIR%%/lib/plugins/junit-4.11.jar
-%%DATADIR%%/lib/plugins/maven-ant-tasks-2.1.3.jar
+%%DATADIR%%/lib/plugins/junit-4.12.jar
+%%DATADIR%%/lib/plugins/maven-artifact-2.2.1.jar
+%%DATADIR%%/lib/plugins/maven-artifact-manager-2.2.1.jar
+%%DATADIR%%/lib/plugins/maven-error-diagnostics-2.2.1.jar
+%%DATADIR%%/lib/plugins/maven-model-2.2.1.jar
+%%DATADIR%%/lib/plugins/maven-project-2.2.1.jar
+%%DATADIR%%/lib/plugins/maven-repository-metadata-2.2.1.jar
+%%DATADIR%%/lib/plugins/maven-settings-2.2.1.jar
 %%DATADIR%%/lib/plugins/nekohtml-1.9.14.jar
 %%DATADIR%%/lib/plugins/plexus-component-annotations-1.5.2.jar
+%%DATADIR%%/lib/plugins/plexus-container-default-1.0-alpha-9-stable-1.jar
+%%DATADIR%%/lib/plugins/plexus-interpolation-1.11.jar
+%%DATADIR%%/lib/plugins/plexus-utils-1.5.15.jar
 %%DATADIR%%/lib/plugins/pmaven-common-0.8-20100325.jar
 %%DATADIR%%/lib/plugins/pmaven-groovy-0.8-20100325.jar
 %%DATADIR%%/lib/plugins/rhino-1.7R3.jar
@@ -135,10 +159,14 @@ bin/gradle
 %%DATADIR%%/lib/plugins/simple-4.1.21.jar
 %%DATADIR%%/lib/plugins/snakeyaml-1.6.jar
 %%DATADIR%%/lib/plugins/sonar-batch-bootstrapper-2.9.jar
-%%DATADIR%%/lib/plugins/sonar-runner-2.0.jar
+%%DATADIR%%/lib/plugins/sonar/logback-classic-1.0.13.jar
+%%DATADIR%%/lib/plugins/sonar/logback-core-1.0.13.jar
 %%DATADIR%%/lib/plugins/testng-6.3.1.jar
+%%DATADIR%%/lib/plugins/wagon-file-1.0-beta-6.jar
+%%DATADIR%%/lib/plugins/wagon-http-lightweight-1.0-beta-6.jar
+%%DATADIR%%/lib/plugins/wagon-provider-api-1.0-beta-6.jar
 %%DATADIR%%/lib/plugins/xbean-reflect-3.4.jar
 %%DATADIR%%/lib/plugins/xercesImpl-2.9.1.jar
 %%DATADIR%%/lib/plugins/xml-apis-1.3.04.jar
 %%DATADIR%%/lib/reflectasm-1.07-shaded.jar
-%%DATADIR%%/lib/slf4j-api-1.7.5.jar
+%%DATADIR%%/lib/slf4j-api-1.7.10.jar