Attachment 192158 Details for Bug 227240 – port patch

[patch] port patch

gradle-4.6.patch (text/plain), 13.76 KB, created by Pavel Timofeev on 2018-04-03 04:46:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2018-04-03 04:46:46 UTC

Size: 13.76 KB

patch

obsolete

>diff -ruN /home/pavel.timofeev/gradle.orig/Makefile gradle/Makefile
>--- /home/pavel.timofeev/gradle.orig/Makefile	2018-04-02 22:18:30.536013000 +0300
>+++ gradle/Makefile	2018-04-02 22:19:23.925401000 +0300
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/gradle/Makefile 445657 2017-07-13 15:46:06Z tobik $
> 
> PORTNAME=	gradle
>-PORTVERSION=	4.0
>+PORTVERSION=	4.6
> CATEGORIES=	devel java
> MASTER_SITES=	https://downloads.gradle.org/distributions/
> EXTRACT_SUFX=	-bin.zip
>@@ -14,6 +14,7 @@
> 
> NO_ARCH=	yes
> USES=		zip
>+JAVA_VERSION=	1.7+
> USE_JAVA=	yes
> NO_BUILD=	yes
> SUB_LIST=	PORTVERSION=${PORTVERSION} \
>diff -ruN /home/pavel.timofeev/gradle.orig/distinfo gradle/distinfo
>--- /home/pavel.timofeev/gradle.orig/distinfo	2018-04-02 22:18:30.538497000 +0300
>+++ gradle/distinfo	2018-04-02 22:21:33.835767000 +0300
>@@ -1,3 +1,3 @@
> TIMESTAMP = 1499872390
>-SHA256 (gradle-4.0-bin.zip) = 56bd2dde29ba2a93903c557da1745cafd72cdd8b6b0b83c05a40ed7896b79dfe
>-SIZE (gradle-4.0-bin.zip) = 67523890
>+SHA256 (gradle-4.6-bin.zip) = 98bd5fd2b30e070517e03c51cbb32beee3e2ee1a84003a5a5d748996d4b1b915
>+SIZE (gradle-4.6-bin.zip) = 74176889
>diff -ruN /home/pavel.timofeev/gradle.orig/pkg-plist gradle/pkg-plist
>--- /home/pavel.timofeev/gradle.orig/pkg-plist	2018-04-02 22:18:30.540584000 +0300
>+++ gradle/pkg-plist	2018-04-02 22:27:57.857298000 +0300
>@@ -1,45 +1,56 @@
>-bin/gradle
> %%DATADIR%%/lib/annotations-13.0.jar
>-%%DATADIR%%/lib/ant-1.9.6.jar
>-%%DATADIR%%/lib/ant-launcher-1.9.6.jar
>-%%DATADIR%%/lib/asm-all-5.1.jar
>+%%DATADIR%%/lib/ant-1.9.9.jar
>+%%DATADIR%%/lib/ant-launcher-1.9.9.jar
>+%%DATADIR%%/lib/asm-6.0.jar
>+%%DATADIR%%/lib/asm-commons-6.0.jar
>+%%DATADIR%%/lib/asm-tree-6.0.jar
> %%DATADIR%%/lib/commons-collections-3.2.2.jar
>-%%DATADIR%%/lib/commons-io-2.2.jar
>+%%DATADIR%%/lib/commons-compress-1.14.jar
>+%%DATADIR%%/lib/commons-io-2.4.jar
> %%DATADIR%%/lib/commons-lang-2.6.jar
>-%%DATADIR%%/lib/gradle-base-services-4.0.jar
>-%%DATADIR%%/lib/gradle-base-services-groovy-4.0.jar
>-%%DATADIR%%/lib/gradle-cli-4.0.jar
>-%%DATADIR%%/lib/gradle-core-4.0.jar
>-%%DATADIR%%/lib/gradle-docs-4.0.jar
>-%%DATADIR%%/lib/gradle-installation-beacon-4.0.jar
>-%%DATADIR%%/lib/gradle-jvm-services-4.0.jar
>-%%DATADIR%%/lib/gradle-launcher-4.0.jar
>-%%DATADIR%%/lib/gradle-logging-4.0.jar
>-%%DATADIR%%/lib/gradle-messaging-4.0.jar
>-%%DATADIR%%/lib/gradle-model-core-4.0.jar
>-%%DATADIR%%/lib/gradle-model-groovy-4.0.jar
>-%%DATADIR%%/lib/gradle-native-4.0.jar
>-%%DATADIR%%/lib/gradle-process-services-4.0.jar
>-%%DATADIR%%/lib/gradle-resources-4.0.jar
>-%%DATADIR%%/lib/gradle-runtime-api-info-4.0.jar
>-%%DATADIR%%/lib/gradle-script-kotlin-0.9.0.jar
>-%%DATADIR%%/lib/gradle-script-kotlin-compiler-plugin-0.9.0.jar
>-%%DATADIR%%/lib/gradle-script-kotlin-tooling-builders-0.9.0.jar
>-%%DATADIR%%/lib/gradle-script-kotlin-tooling-models-0.9.0.jar
>-%%DATADIR%%/lib/gradle-tooling-api-4.0.jar
>-%%DATADIR%%/lib/gradle-wrapper-4.0.jar
>-%%DATADIR%%/lib/groovy-all-2.4.11.jar
>+%%DATADIR%%/lib/fastutil-7.2.1-min.jar
>+%%DATADIR%%/lib/gradle-base-services-4.6.jar
>+%%DATADIR%%/lib/gradle-base-services-groovy-4.6.jar
>+%%DATADIR%%/lib/gradle-build-cache-4.6.jar
>+%%DATADIR%%/lib/gradle-build-option-4.6.jar
>+%%DATADIR%%/lib/gradle-cli-4.6.jar
>+%%DATADIR%%/lib/gradle-core-4.6.jar
>+%%DATADIR%%/lib/gradle-core-api-4.6.jar
>+%%DATADIR%%/lib/gradle-docs-4.6.jar
>+%%DATADIR%%/lib/gradle-installation-beacon-4.6.jar
>+%%DATADIR%%/lib/gradle-jvm-services-4.6.jar
>+%%DATADIR%%/lib/gradle-kotlin-dsl-0.15.6.jar
>+%%DATADIR%%/lib/gradle-kotlin-dsl-tooling-builders-0.15.6.jar
>+%%DATADIR%%/lib/gradle-kotlin-dsl-tooling-models-0.15.6.jar
>+%%DATADIR%%/lib/gradle-launcher-4.6.jar
>+%%DATADIR%%/lib/gradle-logging-4.6.jar
>+%%DATADIR%%/lib/gradle-messaging-4.6.jar
>+%%DATADIR%%/lib/gradle-model-core-4.6.jar
>+%%DATADIR%%/lib/gradle-model-groovy-4.6.jar
>+%%DATADIR%%/lib/gradle-native-4.6.jar
>+%%DATADIR%%/lib/gradle-persistent-cache-4.6.jar
>+%%DATADIR%%/lib/gradle-process-services-4.6.jar
>+%%DATADIR%%/lib/gradle-resources-4.6.jar
>+%%DATADIR%%/lib/gradle-runtime-api-info-4.6.jar
>+%%DATADIR%%/lib/gradle-tooling-api-4.6.jar
>+%%DATADIR%%/lib/gradle-wrapper-4.6.jar
>+%%DATADIR%%/lib/groovy-all-2.4.12.jar
> %%DATADIR%%/lib/guava-jdk5-17.0.jar
> %%DATADIR%%/lib/jansi-1.14.jar
> %%DATADIR%%/lib/javax.inject-1.jar
> %%DATADIR%%/lib/jcip-annotations-1.0.jar
>-%%DATADIR%%/lib/jcl-over-slf4j-1.7.10.jar
>-%%DATADIR%%/lib/jul-to-slf4j-1.7.10.jar
>-%%DATADIR%%/lib/kotlin-compiler-embeddable-1.1.0.jar
>-%%DATADIR%%/lib/kotlin-reflect-1.1.0.jar
>-%%DATADIR%%/lib/kotlin-stdlib-1.1.0.jar
>+%%DATADIR%%/lib/jcl-over-slf4j-1.7.16.jar
>+%%DATADIR%%/lib/jsr305-2.0.1.jar
>+%%DATADIR%%/lib/jul-to-slf4j-1.7.16.jar
>+%%DATADIR%%/lib/kotlin-compiler-embeddable-1.2.21.jar
>+%%DATADIR%%/lib/kotlin-reflect-1.2.21.jar
>+%%DATADIR%%/lib/kotlin-sam-with-receiver-compiler-plugin-1.2.21.jar
>+%%DATADIR%%/lib/kotlin-script-runtime-1.2.21.jar
>+%%DATADIR%%/lib/kotlin-stdlib-1.2.21.jar
>+%%DATADIR%%/lib/kotlin-stdlib-jdk7-1.2.21.jar
>+%%DATADIR%%/lib/kotlin-stdlib-jdk8-1.2.21.jar
> %%DATADIR%%/lib/kryo-2.20.jar
>-%%DATADIR%%/lib/log4j-over-slf4j-1.7.10.jar
>+%%DATADIR%%/lib/log4j-over-slf4j-1.7.16.jar
> %%DATADIR%%/lib/minlog-1.2.jar
> %%DATADIR%%/lib/native-platform-0.14.jar
> %%DATADIR%%/lib/native-platform-freebsd-amd64-libcpp-0.14.jar
>@@ -62,72 +73,88 @@
> %%DATADIR%%/lib/plugins/aether-impl-1.13.1.jar
> %%DATADIR%%/lib/plugins/aether-spi-1.13.1.jar
> %%DATADIR%%/lib/plugins/aether-util-1.13.1.jar
>-%%DATADIR%%/lib/plugins/aws-java-sdk-core-1.11.6.jar
>-%%DATADIR%%/lib/plugins/aws-java-sdk-kms-1.11.6.jar
>-%%DATADIR%%/lib/plugins/aws-java-sdk-s3-1.11.6.jar
>-%%DATADIR%%/lib/plugins/bcpg-jdk15on-1.51.jar
>-%%DATADIR%%/lib/plugins/bcprov-jdk15on-1.51.jar
>-%%DATADIR%%/lib/plugins/biz.aQute.bndlib-3.2.0.jar
>-%%DATADIR%%/lib/plugins/bsh-2.0b4.jar
>+%%DATADIR%%/lib/plugins/apiguardian-api-1.0.0.jar
>+%%DATADIR%%/lib/plugins/asm-util-6.0.jar
>+%%DATADIR%%/lib/plugins/aws-java-sdk-core-1.11.267.jar
>+%%DATADIR%%/lib/plugins/aws-java-sdk-kms-1.11.267.jar
>+%%DATADIR%%/lib/plugins/aws-java-sdk-s3-1.11.267.jar
>+%%DATADIR%%/lib/plugins/bcpg-jdk15on-1.58.jar
>+%%DATADIR%%/lib/plugins/bcprov-jdk15on-1.58.jar
>+%%DATADIR%%/lib/plugins/biz.aQute.bndlib-3.4.0.jar
>+%%DATADIR%%/lib/plugins/bsh-2.0b6.jar
> %%DATADIR%%/lib/plugins/commons-cli-1.2.jar
>-%%DATADIR%%/lib/plugins/commons-codec-1.6.jar
>-%%DATADIR%%/lib/plugins/gradle-announce-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-antlr-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-build-cache-http-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-build-comparison-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-build-init-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-code-quality-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-composite-builds-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-dependency-management-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-diagnostics-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-ear-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-ide-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-ide-native-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-ide-play-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-ivy-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-jacoco-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-javascript-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-language-groovy-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-language-java-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-language-jvm-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-language-native-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-language-scala-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-maven-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-osgi-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-platform-base-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-platform-jvm-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-platform-native-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-platform-play-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-plugin-development-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-plugin-use-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-plugins-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-publish-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-reporting-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-resources-http-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-resources-s3-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-resources-sftp-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-scala-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-signing-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-test-kit-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-testing-base-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-testing-jvm-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-testing-native-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-tooling-api-builders-4.0.jar
>-%%DATADIR%%/lib/plugins/gradle-workers-4.0.jar
>+%%DATADIR%%/lib/plugins/commons-codec-1.10.jar
>+%%DATADIR%%/lib/plugins/dd-plist-1.20.jar
>+%%DATADIR%%/lib/plugins/google-api-client-1.23.0.jar
>+%%DATADIR%%/lib/plugins/google-api-services-storage-v1-rev116-1.23.0.jar
>+%%DATADIR%%/lib/plugins/google-http-client-1.23.0.jar
>+%%DATADIR%%/lib/plugins/google-http-client-jackson2-1.23.0.jar
>+%%DATADIR%%/lib/plugins/google-oauth-client-1.23.0.jar
>+%%DATADIR%%/lib/plugins/gradle-announce-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-antlr-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-build-cache-http-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-build-comparison-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-build-init-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-code-quality-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-composite-builds-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-dependency-management-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-diagnostics-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-ear-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-ide-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-ide-native-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-ide-play-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-ivy-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-jacoco-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-javascript-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-language-groovy-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-language-java-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-language-jvm-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-language-native-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-language-scala-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-maven-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-osgi-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-platform-base-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-platform-jvm-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-platform-native-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-platform-play-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-plugin-development-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-plugin-use-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-plugins-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-publish-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-reporting-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-resources-gcs-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-resources-http-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-resources-s3-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-resources-sftp-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-scala-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-signing-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-test-kit-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-testing-base-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-testing-junit-platform-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-testing-jvm-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-testing-native-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-tooling-api-builders-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-version-control-4.6.jar
>+%%DATADIR%%/lib/plugins/gradle-workers-4.6.jar
> %%DATADIR%%/lib/plugins/gson-2.7.jar
> %%DATADIR%%/lib/plugins/hamcrest-core-1.3.jar
>-%%DATADIR%%/lib/plugins/httpclient-4.4.1.jar
>-%%DATADIR%%/lib/plugins/httpcore-4.4.4.jar
>+%%DATADIR%%/lib/plugins/httpclient-4.5.5.jar
>+%%DATADIR%%/lib/plugins/httpcore-4.4.9.jar
>+%%DATADIR%%/lib/plugins/ion-java-1.0.2.jar
> %%DATADIR%%/lib/plugins/ivy-2.2.0.jar
>-%%DATADIR%%/lib/plugins/jackson-annotations-2.6.6.jar
>-%%DATADIR%%/lib/plugins/jackson-core-2.6.6.jar
>-%%DATADIR%%/lib/plugins/jackson-databind-2.6.6.jar
>+%%DATADIR%%/lib/plugins/jackson-annotations-2.8.11.jar
>+%%DATADIR%%/lib/plugins/jackson-core-2.8.11.jar
>+%%DATADIR%%/lib/plugins/jackson-databind-2.8.11.jar
> %%DATADIR%%/lib/plugins/jatl-0.2.2.jar
> %%DATADIR%%/lib/plugins/jcifs-1.3.17.jar
>-%%DATADIR%%/lib/plugins/jcommander-1.12.jar
>+%%DATADIR%%/lib/plugins/jcommander-1.47.jar
>+%%DATADIR%%/lib/plugins/jmespath-java-1.11.267.jar
> %%DATADIR%%/lib/plugins/joda-time-2.8.2.jar
> %%DATADIR%%/lib/plugins/jsch-0.1.54.jar
> %%DATADIR%%/lib/plugins/junit-4.12.jar
>+%%DATADIR%%/lib/plugins/junit-platform-commons-1.0.3.jar
>+%%DATADIR%%/lib/plugins/junit-platform-engine-1.0.3.jar
>+%%DATADIR%%/lib/plugins/junit-platform-launcher-1.0.3.jar
> %%DATADIR%%/lib/plugins/maven-aether-provider-3.0.4.jar
> %%DATADIR%%/lib/plugins/maven-artifact-3.0.4.jar
> %%DATADIR%%/lib/plugins/maven-compat-3.0.4.jar
>@@ -138,14 +165,16 @@
> %%DATADIR%%/lib/plugins/maven-repository-metadata-3.0.4.jar
> %%DATADIR%%/lib/plugins/maven-settings-3.0.4.jar
> %%DATADIR%%/lib/plugins/maven-settings-builder-3.0.4.jar
>-%%DATADIR%%/lib/plugins/nekohtml-1.9.14.jar
>+%%DATADIR%%/lib/plugins/nekohtml-1.9.20.jar
>+%%DATADIR%%/lib/plugins/opentest4j-1.0.0.jar
>+%%DATADIR%%/lib/plugins/org.eclipse.jgit-4.5.3.201708160445-r.jar
> %%DATADIR%%/lib/plugins/plexus-cipher-1.7.jar
> %%DATADIR%%/lib/plugins/plexus-classworlds-2.4.jar
> %%DATADIR%%/lib/plugins/plexus-component-annotations-1.5.5.jar
> %%DATADIR%%/lib/plugins/plexus-container-default-1.5.5.jar
> %%DATADIR%%/lib/plugins/plexus-interpolation-1.14.jar
> %%DATADIR%%/lib/plugins/plexus-sec-dispatcher-1.3.jar
>-%%DATADIR%%/lib/plugins/plexus-utils-2.0.6.jar
>+%%DATADIR%%/lib/plugins/plexus-utils-3.0.8.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
>@@ -157,7 +186,8 @@
> %%DATADIR%%/lib/plugins/wagon-http-shared4-2.4.jar
> %%DATADIR%%/lib/plugins/wagon-provider-api-2.4.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/plugins/xercesImpl-2.11.0.jar
> %%DATADIR%%/lib/reflectasm-1.07-shaded.jar
>-%%DATADIR%%/lib/slf4j-api-1.7.10.jar
>+%%DATADIR%%/lib/slf4j-api-1.7.16.jar
>+%%DATADIR%%/lib/xml-apis-1.4.01.jar
>+bin/gradle

Actions: View | Diff

Attachments on bug 227240: 192158