chore(deps): update dependency gradle to v5

.travis.yml

@@ -8,13 +8,13 @@ matrix:
       jdk: openjdk8
     - os: osx
       osx_image: xcode9.2 # OSX 10.12, Oracle Java 8
-      script: ./gradlew -u -S --no-daemon --no-parallel build # skip coveralls on MacOS
+      script: ./gradlew -S --no-daemon --no-parallel build # skip coveralls on MacOS
 
 # The 'build' task runs most things, including test, check, & static analysis
 install: true
 script:
-  - ./gradlew -u -S --no-daemon --no-parallel build jacocoAggregateReport coveralls
-  - ./gradlew -u -S --no-daemon --no-parallel :npm_run_lint-js
+  - ./gradlew -S --no-daemon --no-parallel build jacocoAggregateReport coveralls
+  - ./gradlew -S --no-daemon --no-parallel :npm_run_lint-js
 
 cache:
   directories:

appveyor.yml

@@ -6,7 +6,7 @@ install:
   - gradlew.bat --version
 # The 'build' task runs most things, including test, check, & static analysis
 build: off
-test_script: gradlew.bat -u -S --no-daemon --no-parallel build
+test_script: gradlew.bat -S --no-daemon --no-parallel build
 cache:
   - C:\Users\appveyor\.npm
   - C:\Users\appveyor\.gradle

build.gradle

@@ -6,7 +6,7 @@ plugins {
     id 'net.researchgate.release' version '2.7.0'
     // Records all tasks in task graph, generates `build/reports/visteg.dot`
     // dot file can be converted to an image using graphviz. `dot -Tsvg -O -v visteg.dot`
-    id 'cz.malohlava' version '1.0.3'
+    id 'cz.malohlava.visteg' version '1.0.5'
 
     // Sub project plugins
     id 'com.github.sherter.google-java-format' version '0.8' apply false

gradle.properties

@@ -119,3 +119,4 @@ whatwgFetchPolyfillVersion=3.0.0
 
 # gradle settings
 org.gradle.parallel=true
+org.gradle.jvmargs=-Xmx2048M -XX\:MaxHeapSize\=32g

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
-distributionSha256Sum=8626cbf206b4e201ade7b87779090690447054bc93f052954c78480fa6ed186e
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+distributionSha256Sum=7bdbad1e4f54f13c8a78abc00c26d44dd8709d4aedb704d913fb1bb78ac025dc
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

uPortal-content/uPortal-content-portlet/build.gradle

@@ -1,7 +1,6 @@
 description = "Apereo uPortal Portlet Support"
 
 ext {
-    // Solution for JPA Modelgen based on http://stackoverflow.com/a/23218255/1651116
     generatedSourcesDir = file("${buildDir}/generated-sources/javac/main/java")
 }
 
@@ -10,7 +9,7 @@ dependencies {
     compile project(':uPortal-rdbm')
 
     compileOnly "org.apache.portals.pluto:pluto-container-api:${plutoVersion}"
-    compileOnly "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" // Required for javac -s
+    annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}"
     compileOnly "${portletApiDependency}"
     compileOnly "${servletApiDependency}"
 
@@ -32,12 +31,6 @@ sourceSets {
     }
 }
 
-// These are the only modifications to build process that are required.
-compileJava {
-    doFirst {
-        // Generated sources directory should be present & empty before compilation
-        generatedSourcesDir.deleteDir()
-        generatedSourcesDir.mkdirs()
-    }
-    options.compilerArgs += ['-s', generatedSourcesDir]
+tasks.withType(JavaCompile) {
+    options.annotationProcessorGeneratedSourcesDirectory = file(generatedSourcesDir)
 }

uPortal-events/build.gradle

@@ -1,7 +1,6 @@
 description = "Apereo uPortal Events"
 
 ext {
-    // Solution for JPA Modelgen based on http://stackoverflow.com/a/23218255/1651116
     generatedSourcesDir = file("${buildDir}/generated-sources/javac/main/java")
 }
 
@@ -15,7 +14,7 @@ dependencies {
     compile "org.apache.httpcomponents:httpclient:${httpclientVersion}"
 
     compileOnly "org.apache.portals.pluto:pluto-container-api:${plutoVersion}"
-    compileOnly "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" // Required for javac -s
+    annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}"
     compileOnly "${portletApiDependency}"
     compileOnly "${servletApiDependency}"
 }
@@ -35,12 +34,6 @@ sourceSets {
     }
 }
 
-// These are the only modifications to build process that are required.
-compileJava {
-    doFirst {
-        // Generated sources directory should be present & empty before compilation
-        generatedSourcesDir.deleteDir()
-        generatedSourcesDir.mkdirs()
-    }
-    options.compilerArgs += ['-s', generatedSourcesDir]
+tasks.withType(JavaCompile) {
+    options.annotationProcessorGeneratedSourcesDirectory = file(generatedSourcesDir)
 }

uPortal-groups/uPortal-groups-pags/build.gradle

@@ -1,7 +1,6 @@
 description = "Apereo uPortal Groups PAGS"
 
 ext {
-    // Solution for JPA Modelgen based on http://stackoverflow.com/a/23218255/1651116
     generatedSourcesDir = file("${buildDir}/generated-sources/javac/main/java")
 }
 
@@ -15,7 +14,7 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
     compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
 
-    compileOnly "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" // Required for javac -s
+    annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}"
     compileOnly "${servletApiDependency}"
 }
 
@@ -34,12 +33,6 @@ sourceSets {
     }
 }
 
-// These are the only modifications to build process that are required.
-compileJava {
-    doFirst {
-        // Generated sources directory should be present & empty before compilation
-        generatedSourcesDir.deleteDir()
-        generatedSourcesDir.mkdirs()
-    }
-    options.compilerArgs += ['-s', generatedSourcesDir]
+tasks.withType(JavaCompile) {
+    options.annotationProcessorGeneratedSourcesDirectory = file(generatedSourcesDir)
 }

uPortal-i18n/build.gradle

@@ -1,7 +1,6 @@
 description = "Apereo uPortal i18n"
 
 ext {
-    // Solution for JPA Modelgen based on http://stackoverflow.com/a/23218255/1651116
     generatedSourcesDir = file("${buildDir}/generated-sources/javac/main/java")
 }
 
@@ -10,7 +9,7 @@ dependencies {
 
     compile "org.slf4j:log4j-over-slf4j:${slf4jVersion}"
 
-    compileOnly "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" // Required for javac -s
+    annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}"
     compileOnly "${servletApiDependency}"
 }
 
@@ -29,13 +28,6 @@ sourceSets {
     }
 }
 
-// These are the only modifications to build process that are required.
-compileJava {
-    doFirst {
-        // Generated sources directory should be present & empty before compilation
-        generatedSourcesDir.deleteDir()
-        generatedSourcesDir.mkdirs()
-    }
-    options.compilerArgs += ['-s', generatedSourcesDir]
+tasks.withType(JavaCompile) {
+    options.annotationProcessorGeneratedSourcesDirectory = file(generatedSourcesDir)
 }
-

uPortal-layout/uPortal-layout-core/build.gradle

@@ -1,7 +1,6 @@
 description = "Apereo uPortal Layout"
 
 ext {
-    // Solution for JPA Modelgen based on http://stackoverflow.com/a/23218255/1651116
     generatedSourcesDir = file("${buildDir}/generated-sources/javac/main/java")
 }
 
@@ -19,7 +18,7 @@ dependencies {
     testCompile "${servletApiDependency}"
 
     compileOnly "org.apache.portals.pluto:pluto-container-api:${plutoVersion}"
-    compileOnly "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" // Required for javac -s
+    annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}"
     compileOnly "${servletApiDependency}"
 }
 
@@ -38,12 +37,6 @@ sourceSets {
     }
 }
 
-// These are the only modifications to build process that are required.
-compileJava {
-    doFirst {
-        // Generated sources directory should be present & empty before compilation
-        generatedSourcesDir.deleteDir()
-        generatedSourcesDir.mkdirs()
-    }
-    options.compilerArgs += ['-s', generatedSourcesDir]
+tasks.withType(JavaCompile) {
+    options.annotationProcessorGeneratedSourcesDirectory = file(generatedSourcesDir)
 }

uPortal-persondir/build.gradle

@@ -1,14 +1,13 @@
 description = "Apereo uPortal Person Directory"
 
 ext {
-    // Solution for JPA Modelgen based on http://stackoverflow.com/a/23218255/1651116
     generatedSourcesDir = file("${buildDir}/generated-sources/javac/main/java")
 }
 
 dependencies {
     compile project(':uPortal-security:uPortal-security-core')
 
-    compileOnly "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" // Required for javac -s
+    annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}"
     compileOnly "${portletApiDependency}"
     compileOnly "${servletApiDependency}"
 
@@ -31,12 +30,6 @@ sourceSets {
     }
 }
 
-// These are the only modifications to build process that are required.
-compileJava {
-    doFirst {
-        // Generated sources directory should be present & empty before compilation
-        generatedSourcesDir.deleteDir()
-        generatedSourcesDir.mkdirs()
-    }
-    options.compilerArgs += ['-s', generatedSourcesDir]
+tasks.withType(JavaCompile) {
+    options.annotationProcessorGeneratedSourcesDirectory = file(generatedSourcesDir)
 }

uPortal-security/uPortal-security-permissions/build.gradle

@@ -1,7 +1,6 @@
 description = "Apereo uPortal Security Permissions"
 
 ext {
-    // Solution for JPA Modelgen based on http://stackoverflow.com/a/23218255/1651116
     generatedSourcesDir = file("${buildDir}/generated-sources/javac/main/java")
 }
 
@@ -12,7 +11,7 @@ dependencies {
     compile project(':uPortal-security:uPortal-security-core')
     compile project(':uPortal-spring')
 
-    compileOnly "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" // Required for javac -s
+    annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}"
 }
 
 /*
@@ -30,12 +29,6 @@ sourceSets {
     }
 }
 
-// These are the only modifications to build process that are required.
-compileJava {
-    doFirst {
-        // Generated sources directory should be present & empty before compilation
-        generatedSourcesDir.deleteDir()
-        generatedSourcesDir.mkdirs()
-    }
-    options.compilerArgs += ['-s', generatedSourcesDir]
+tasks.withType(JavaCompile) {
+    options.annotationProcessorGeneratedSourcesDirectory = file(generatedSourcesDir)
 }

uPortal-tenants/build.gradle

@@ -1,7 +1,6 @@
 description = "Apereo uPortal Tenants"
 
 ext {
-    // Solution for JPA Modelgen based on http://stackoverflow.com/a/23218255/1651116
     generatedSourcesDir = file("${buildDir}/generated-sources/javac/main/java")
 }
 
@@ -11,7 +10,7 @@ dependencies {
 
     compile "javax.mail:mail:${javaxMailVersion}"
 
-    compileOnly "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" // Required for javac -s
+    annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" // Required for javac -s
     compileOnly "${servletApiDependency}"
 }
 
@@ -30,12 +29,6 @@ sourceSets {
     }
 }
 
-// These are the only modifications to build process that are required.
-compileJava {
-    doFirst {
-        // Generated sources directory should be present & empty before compilation
-        generatedSourcesDir.deleteDir()
-        generatedSourcesDir.mkdirs()
-    }
-    options.compilerArgs += ['-s', generatedSourcesDir]
-}
+tasks.withType(JavaCompile) {
+    options.annotationProcessorGeneratedSourcesDirectory = file(generatedSourcesDir)
+}

uPortal-tools/build.gradle

@@ -1,7 +1,6 @@
 description = "Apereo uPortal Tools"
 
 ext {
-    // Solution for JPA Modelgen based on http://stackoverflow.com/a/23218255/1651116
     generatedSourcesDir = file("${buildDir}/generated-sources/javac/main/java")
 }
 
@@ -15,7 +14,7 @@ dependencies {
     compile "org.apache.ant:ant:${antVersion}"
     compile "org.codehaus.groovy:groovy:${groovyVersion}"
 
-    compileOnly "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" // Required for javac -s
+    annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" // Required for javac -s
     compileOnly "${servletApiDependency}"
 }
 
@@ -34,12 +33,6 @@ sourceSets {
     }
 }
 
-// These are the only modifications to build process that are required.
-compileJava {
-    doFirst {
-        // Generated sources directory should be present & empty before compilation
-        generatedSourcesDir.deleteDir()
-        generatedSourcesDir.mkdirs()
-    }
-    options.compilerArgs += ['-s', generatedSourcesDir]
+tasks.withType(JavaCompile) {
+    options.annotationProcessorGeneratedSourcesDirectory = file(generatedSourcesDir)
 }

uPortal-utils/uPortal-utils-core/build.gradle

@@ -1,7 +1,6 @@
 description = "Apereo uPortal Utilities"
 
 ext {
-    // Solution for JPA Modelgen based on http://stackoverflow.com/a/23218255/1651116
     generatedSourcesDir = file("${buildDir}/generated-sources/javac/main/java")
 }
 
@@ -72,7 +71,7 @@ dependencies {
     testCompile "${servletApiDependency}"
 
     compileOnly "org.apache.portals.pluto:pluto-container-api:${plutoVersion}"
-    compileOnly "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" // Required for javac -s
+    annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}"
     compileOnly "${portletApiDependency}"
     compileOnly "${servletApiDependency}"
 }
@@ -92,12 +91,6 @@ sourceSets {
     }
 }
 
-// These are the only modifications to build process that are required.
-compileJava {
-    doFirst {
-        // Generated sources directory should be present & empty before compilation
-        generatedSourcesDir.deleteDir()
-        generatedSourcesDir.mkdirs()
-    }
-    options.compilerArgs += ['-s', generatedSourcesDir]
+tasks.withType(JavaCompile) {
+    options.annotationProcessorGeneratedSourcesDirectory = file(generatedSourcesDir)
 }