From d7b7f1f0e6e61c069fb49f317af1bccf370b6f2a Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Tue, 26 Nov 2019 15:16:30 -0700
Subject: [PATCH] update to Gradle 6
---
build.gradle | 66 ++++++++++++-----------
gradle/wrapper/gradle-wrapper.jar | Bin 56172 -> 56177 bytes
gradle/wrapper/gradle-wrapper.properties | 2 +-
3 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/build.gradle b/build.gradle
index 869bc73b3..4cda63b1b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,9 +23,11 @@
* default Eclipse directories such as WebContent may be deleted.
*/
-apply plugin: 'jacoco'
-apply plugin: 'war'
-apply plugin: 'eclipse-wtp'
+plugins {
+ id 'eclipse-wtp'
+ id 'jacoco'
+ id 'war'
+}
sourceCompatibility = 1.8
compileJava.options.encoding = 'UTF-8'
@@ -39,15 +41,15 @@ repositories {
}
dependencies {
- compile 'org.apache.tomcat:tomcat-catalina:8.0.45'
- compile 'javax.websocket:javax.websocket-api:1.1'
- compile 'com.amazonaws:aws-lambda-java-core:1.1.0'
- compile 'com.amazonaws:aws-java-sdk-lambda:1.11.461'
- compile 'com.amazonaws:aws-java-sdk-s3:1.11.579'
- compile 'com.amazonaws:aws-java-sdk-ec2:1.11.619'
- compile project(':nshmp-lib')
-
- testCompile 'junit:junit:4.12'
+ implementation 'org.apache.tomcat:tomcat-catalina:8.0.45'
+ implementation 'javax.websocket:javax.websocket-api:1.1'
+ implementation 'com.amazonaws:aws-lambda-java-core:1.1.0'
+ implementation 'com.amazonaws:aws-java-sdk-lambda:1.11.461'
+ implementation 'com.amazonaws:aws-java-sdk-s3:1.11.579'
+ implementation 'com.amazonaws:aws-java-sdk-ec2:1.11.619'
+ implementation project(':nshmp-lib')
+
+ testImplementation 'junit:junit:4.12'
}
sourceSets {
@@ -75,7 +77,7 @@ ext {
projectName = 'nshmp-haz'
propsPath = '/classes/java/main/service.properties'
-
+
/* Multi-model repository paths for version tracking */
repo_cous_2008 = '../nshm-cous-2008'
repo_cous_2014 = '../nshm-cous-2014'
@@ -83,7 +85,7 @@ ext {
repo_cous_2018 = '../nshm-cous-2018'
repo_hi_2020 = '../nshm-hi-2020'
repo_ak_2007 = '../nshm-ak-2007'
-
+
/* Explicit model paths */
model_wus_2008 = "${repo_cous_2008}/Western US"
model_ceus_2008 = "${repo_cous_2008}/Central & Eastern US"
@@ -109,15 +111,15 @@ ext {
dev_models = [
[ model_ceus_2018, 'models/ceus/2018' ],
[ model_wus_2018, 'models/wus/2018' ],
- [ model_hi_2020, 'models/hi/2020' ]
+ [ model_hi_2020, 'models/hi/2020' ]
]
- getGitTag = { gitDir ->
+ getGitTag = { gitDir ->
def cmd = 'git --git-dir=' + gitDir + '/.git describe --tags'
return cmd.execute().text.replace('\n', '') ?: 'unknown'
}
- /*
+ /*
* The git-dir option gets the correct tag when
* build is called from nshmp-haz-ws.
*/
@@ -128,7 +130,7 @@ ext {
docTitle = projectName + ': ' + gitLink
docFooter = '<div style="float: left; font-size: 16px; text-align: right; ' +
'padding: 10px; width: 100%; box-sizing: border-box; background-color: #f9f9f9">' +
- '<b><a href="https://www.usgs.gov" target="_top">U.S. Geological Survey</a></b> ' +
+ '<b><a href="https://www.usgs.gov" target="_top">U.S. Geological Survey</a></b> ' +
'– National Seismic Hazard Model Project ' +
'(<a href="https://earthquake.usgs.gov/hazards/" target="_top">NSHMP</a>) ' +
'– <a href="https://github.com/usgs/nshmp-haz/blob/master/LICENSE.md" ' +
@@ -149,11 +151,11 @@ jacocoTestReport {
html.enabled true
}
afterEvaluate {
- classDirectories = files(classDirectories.files.collect {
+ classDirectories.from(files(classDirectories.files.collect {
fileTree(
dir: it,
exclude: ['**/etc/**'])
- })
+ }))
}
}
check.dependsOn jacocoTestReport
@@ -205,14 +207,14 @@ jar {
doFirst {
/* possible fat jar */
if (rootProject.name == projectName && !thinJar) {
- from { configurations.compile.collect {
+ from { configurations.compileClasspath.collect {
it.isDirectory() ? it : zipTree(it).matching {
exclude { it.path.contains('META-INF') }
}
}}
}
-
- /*
+
+ /*
* Possibly record app version. The creation of this file
* on each build causes the classpath to appear changed so
* Gradle reruns tests, even though no code has changed.
@@ -245,8 +247,8 @@ war {
enabled = true
webAppDirName = 'webapp'
dependsOn jar
-
- /*
+
+ /*
* Exclude existing models directory with symlinks
* to support Eclipse deployments.
*/
@@ -279,7 +281,7 @@ task assembleDev(type: War, dependsOn: 'war') {
* Create am exploded war file with production models
*/
task assembleUsgs(type: Sync) {
- into "${libsDir}/exploded-war"
+ into "${libsDirectory.get()}/exploded-war"
with war
doFirst {
@@ -292,7 +294,7 @@ task assembleUsgs(type: Sync) {
* Create am exploded war file with development models
*/
task assembleUsgsDev(type: Sync) {
- into "${libsDir}/exploded-war"
+ into "${libsDirectory.get()}/exploded-war"
with assembleDev
doFirst {
@@ -304,17 +306,17 @@ task assembleUsgsDev(type: Sync) {
/**
* Create a zip file of all dependencies
*/
-task dependencies(type: Zip) {
- baseName = "nshmp-haz-dependencies"
+task libs(type: Zip) {
+ archiveBaseName = "nshmp-haz-dependencies"
from {
- configurations.compile.collect {
+ configurations.compileClasspath.collect {
it
}
}
into("java/lib")
-
- destinationDir libsDir
+
+ destinationDirectory.value(libsDirectory)
}
/**
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 28861d273a5d270fd8f65dd74570c17c9c507736..29953ea141f55e3b8fc691d31b5ca8816d89fa87 100644
GIT binary patch
delta 692
zcmYk4T}V@59LD$ljeUgX0c~w(3!|<&)^Y_cbGDU=kufKRN}=s4!gix{6~!d1*u`S;
zP!wZj7m=3<V-Q^|g+-g5xeqtD^>GuyE+pJ_U37doEnhgizvuUybKuYWZpEAG@uslD
zkT{SUyr9u&#-F&a7{r>nK3kt<ny|POv!~j#r%2-+(&=yge*e^{ywt8dIG?kkE#3M5
zOAMw*Srn19oh?I7pJ7|5n~booO4PydQQnWq)qYyga?EH2d{&xyof-}Jpff>Qljx^G
zReGGx7!h0(sbXrVR<jY^vVfYRQ)aHs@+B%AQqY1q`5cQNA&=8n8}E*1y6Mvij`tLN
z;NU1{98@3T*m1d;|8LPFG%I7NE9&88X1xVvj|ri5iQafs)k~TQj<$(|aAhU3P4YOG
z?Wesy6?Jg=_F+3Ku>dSNFZ&LE&PgrPSn`|UnilabC((1i5_=UCFqRkDHO%CvSRL8?
z7>(RUE^kGxVui0D((5}IDIdYBf}MqsE8HYUfQzXOCmp-bF|jc~p@$rg7Kf=X$T1MK
z;&Dkpswh%C%$2@0KrwLK#!f3y;+Yz?_)$7b#TSiuakGaCkw$DSYZ2S*qQc8v%FUAS
zmaj7_-j)4y^{rAJhP%?m`Y=-&rTG;^S8VVW1njAbw3x(l(#ePRS4DOgkE%D=Fn(1}
WT6W(r)4!wO`vQ8tbZY;kcEVq&z$0q_
delta 717
zcmYk4Ur19?9LMkZS<acsP1@M5%jPDOS8y5P!VDL*q9!&dF^D93=nwg#L=aj_ABw~W
z<y+B~+BOWKhe84aDJ`R7)9L=XbbHWxDhR=#?4{^<GW0xsKHu*-m-D-v<&ms!BUwFm
zt-EjKZmlFq4ZV(&o9V~*R@VEvaQH<<s6dk3E=|s++vDf9^Pa1O#jpv6aM}7H)P+wl
zAN=78Hime3ANz`BvmV8hDw!Bqt`2Udpq*=fHrE|^H@TNOGy-2~jId3q^jXW*iW?kL
z2GM+&a?pDtM;(eH$0%VI=!qPn2i7&r#$seY&6gu!*CXGS&yUMU+T=Wb&9(K`#!D0a
z*mAHkCnGSeP^X<o7A#DwwB!<BGS5_zuO4sQ7G&xTcoLTpoKYy~=Fx8aO3C=i^>?G#
zyeoQy%FYN}jB3ywJwTeXYg)_NVUD?31}(7~mW!vcCc4**XE7rp%_VTfRXWvzWv>Z{
zAEc#Lfi>}+*p^VJ{)*6}i7GaLn~4VMYU6<wQ*8<sk}{m0je}KsM0wRyAO@@Ml(+n!
zS&~ZOPhO&~TVhN3>~V735g433OwW4+ZcRC97#vG+J>{U6_XU1QRa4x{u^LSuRf;|o
zsi7|q<EuLGPao-_&Z#sJz^6bZ#%5*s<`gmx^45yegGC~`IJEJ)jYGV&z&XE%9Ha10
zSm5Q@F~PB1{BUhrVUJOgzQC@bJAIz&Lbx0%hAtx)ZhU=)^&vU+!;vY=UJ0#+e*s)7
B6KDVc
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e0b3fb8d7..1ba7206f8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
--
GitLab