diff --git a/build.gradle b/build.gradle index f0a4be4fb1f..f45815a57ee 100644 --- a/build.gradle +++ b/build.gradle @@ -30,6 +30,7 @@ node { allprojects { apply plugin: 'java' + apply plugin: 'java-library' apply plugin: 'jacoco' apply plugin: 'eclipse' apply plugin: 'com.github.spotbugs' @@ -115,12 +116,12 @@ subprojects { } dependencies { - testCompile "junit:junit:${junitVersion}" - testCompile "org.easymock:easymock:${easymockVersion}" - testCompile "org.hamcrest:hamcrest-all:${hamcrestVersion}" - testCompile "org.mockito:mockito-core:${mockitoVersion}" - testCompile "org.springframework:spring-test:${springVersion}" - testCompile "org.xmlunit:xmlunit-legacy:${xmlunitVersion}" + testImplementation "junit:junit:${junitVersion}" + testImplementation "org.easymock:easymock:${easymockVersion}" + testImplementation "org.hamcrest:hamcrest-all:${hamcrestVersion}" + testImplementation "org.mockito:mockito-core:${mockitoVersion}" + testImplementation "org.springframework:spring-test:${springVersion}" + testImplementation "org.xmlunit:xmlunit-legacy:${xmlunitVersion}" spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.12.0' } diff --git a/uPortal-api/uPortal-api-internal/build.gradle b/uPortal-api/uPortal-api-internal/build.gradle index 3c7453cb453..11ba7529919 100644 --- a/uPortal-api/uPortal-api-internal/build.gradle +++ b/uPortal-api/uPortal-api-internal/build.gradle @@ -1,16 +1,16 @@ description = "Apereo uPortal Internal API" dependencies { - compile project(':uPortal-io:uPortal-io-jaxb') - compile project(':uPortal-layout:uPortal-layout-core') - compile project(':uPortal-marketplace') - compile project(':uPortal-persondir') - compile project(':uPortal-rendering') - compile project(':uPortal-security:uPortal-security-services') + implementation project(':uPortal-io:uPortal-io-jaxb') + implementation project(':uPortal-layout:uPortal-layout-core') + implementation project(':uPortal-marketplace') + implementation project(':uPortal-persondir') + implementation project(':uPortal-rendering') + api project(':uPortal-security:uPortal-security-services') compileOnly "${portletApiDependency}" compileOnly "${servletApiDependency}" compileOnly "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" - testCompile "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" + testImplementation "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" } diff --git a/uPortal-api/uPortal-api-rest/build.gradle b/uPortal-api/uPortal-api-rest/build.gradle index 887ca472f44..5a0c44028de 100644 --- a/uPortal-api/uPortal-api-rest/build.gradle +++ b/uPortal-api/uPortal-api-rest/build.gradle @@ -1,28 +1,28 @@ description = "Apereo uPortal REST APIs" dependencies { - compile project(':uPortal-groups:uPortal-groups-pags') - compile project(':uPortal-index') - compile project(':uPortal-layout:uPortal-layout-impl') - compile project(':uPortal-security:uPortal-security-permissions') + implementation project(':uPortal-groups:uPortal-groups-pags') + implementation project(':uPortal-index') + implementation project(':uPortal-layout:uPortal-layout-impl') + api project(':uPortal-security:uPortal-security-permissions') compileOnly "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" - compile "commons-beanutils:commons-beanutils:${commonsBeanutilsVersion}" - compile "io.springfox:springfox-swagger2:${springfoxSwaggerVersion}" - compile "io.springfox:springfox-swagger-ui:${springfoxSwaggerVersion}" - compile "org.apache.lucene:lucene-queryparser:${luceneVersion}" - compile "org.json:json:${orgJsonVersion}" - compile "org.slf4j:slf4j-api:${slf4jVersion}" + implementation "commons-beanutils:commons-beanutils:${commonsBeanutilsVersion}" + implementation "io.springfox:springfox-swagger2:${springfoxSwaggerVersion}" + implementation "io.springfox:springfox-swagger-ui:${springfoxSwaggerVersion}" + implementation "org.apache.lucene:lucene-queryparser:${luceneVersion}" + implementation "org.json:json:${orgJsonVersion}" + implementation "org.slf4j:slf4j-api:${slf4jVersion}" compileOnly "org.projectlombok:lombok:${lombokVersion}" annotationProcessor "org.projectlombok:lombok:${lombokVersion}" compileOnly "${portletApiDependency}" compileOnly "${servletApiDependency}" - testCompile "${servletApiDependency}" - testCompile "${portletApiDependency}" + testImplementation "${servletApiDependency}" + testImplementation "${portletApiDependency}" //need to add for SessionRESTControllerTest.java - testCompile "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" - testCompile "org.mockito:mockito-inline:${mockitoVersion}" - testCompile project(':uPortal-security:uPortal-security-permissions') + testImplementation "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" + testImplementation "org.mockito:mockito-inline:${mockitoVersion}" + testImplementation project(':uPortal-security:uPortal-security-permissions') } diff --git a/uPortal-concurrency/build.gradle b/uPortal-concurrency/build.gradle index 83a8aa5086b..59b00dac534 100644 --- a/uPortal-concurrency/build.gradle +++ b/uPortal-concurrency/build.gradle @@ -1,9 +1,9 @@ description = "Apereo uPortal Concurrency" dependencies { - compile project(':uPortal-core') + api project(':uPortal-core') - compile "com.google.guava:guava:${guavaVersion}" - compile "org.springframework:spring-web:${springVersion}" + implementation "com.google.guava:guava:${guavaVersion}" + implementation "org.springframework:spring-web:${springVersion}" } diff --git a/uPortal-content/uPortal-content-portlet/build.gradle b/uPortal-content/uPortal-content-portlet/build.gradle index c1955ca8757..fb809fae19b 100644 --- a/uPortal-content/uPortal-content-portlet/build.gradle +++ b/uPortal-content/uPortal-content-portlet/build.gradle @@ -5,15 +5,15 @@ ext { } dependencies { - compile project(':uPortal-layout:uPortal-layout-core') - compile project(':uPortal-rdbm') + api project(':uPortal-layout:uPortal-layout-core') + implementation project(':uPortal-rdbm') compileOnly "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" compileOnly "${portletApiDependency}" compileOnly "${servletApiDependency}" - testCompile "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" + testImplementation "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" } /* diff --git a/uPortal-content/uPortal-content-publishing/build.gradle b/uPortal-content/uPortal-content-publishing/build.gradle index ad1df7f2e14..73d1e2c6636 100644 --- a/uPortal-content/uPortal-content-publishing/build.gradle +++ b/uPortal-content/uPortal-content-publishing/build.gradle @@ -1,7 +1,7 @@ description = "Apereo uPortal Content Publishing" dependencies { - compile project(':uPortal-content:uPortal-content-portlet') - compile project(':uPortal-io:uPortal-io-jaxb') - compile project(':uPortal-utils:uPortal-utils-core') + implementation project(':uPortal-content:uPortal-content-portlet') + implementation project(':uPortal-io:uPortal-io-jaxb') + implementation project(':uPortal-utils:uPortal-utils-core') } diff --git a/uPortal-core/build.gradle b/uPortal-core/build.gradle index ea6b9c5bdab..a431631e8f3 100644 --- a/uPortal-core/build.gradle +++ b/uPortal-core/build.gradle @@ -1,25 +1,25 @@ description = "Apereo uPortal Core" dependencies { - compile("com.googlecode.ehcache-spring-annotations:ehcache-spring-annotations:${ehcacheSpringAnnotationsVersion}") { + api("com.googlecode.ehcache-spring-annotations:ehcache-spring-annotations:${ehcacheSpringAnnotationsVersion}") { exclude group: 'com.google.guava', module: 'guava' } - compile 'javax.annotation:javax.annotation-api:1.3.2' - compile "commons-lang:commons-lang:${commonsLangVersion}" - compile "joda-time:joda-time:${jodaTimeVersion}" - compile "org.apache.commons:commons-lang3:${commonsLang3Version}" - compile "org.hibernate:hibernate-core:${hibernateVersion}" - compile("org.jadira.usertype:usertype.core:${usertypeVersion}") { + api 'javax.annotation:javax.annotation-api:1.3.2' + api "commons-lang:commons-lang:${commonsLangVersion}" + api "joda-time:joda-time:${jodaTimeVersion}" + api "org.apache.commons:commons-lang3:${commonsLang3Version}" + api "org.hibernate:hibernate-core:${hibernateVersion}" + api("org.jadira.usertype:usertype.core:${usertypeVersion}") { exclude group: 'org.hibernate', module: 'hibernate-core' exclude group: 'org.hibernate', module: 'hibernate-entitymanager' } - compile "org.jadira.usertype:usertype.spi:${usertypeVersion}" - compile "org.slf4j:log4j-over-slf4j:${slf4jVersion}" - compile "org.slf4j:jcl-over-slf4j:${slf4jVersion}" - compile "org.slf4j:slf4j-api:${slf4jVersion}" - compile "org.springframework:spring-context:${springVersion}" - compile "org.springframework:spring-jdbc:${springVersion}" - compile "org.springframework.security:spring-security-core:${springSecurityVersion}" + api "org.jadira.usertype:usertype.spi:${usertypeVersion}" + implementation "org.slf4j:log4j-over-slf4j:${slf4jVersion}" + implementation "org.slf4j:jcl-over-slf4j:${slf4jVersion}" + implementation "org.slf4j:slf4j-api:${slf4jVersion}" + implementation "org.springframework:spring-context:${springVersion}" + implementation "org.springframework:spring-jdbc:${springVersion}" + implementation "org.springframework.security:spring-security-core:${springSecurityVersion}" compileOnly "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" compileOnly "${portletApiDependency}" diff --git a/uPortal-events/build.gradle b/uPortal-events/build.gradle index b1d15f5cb9b..60ec31e4682 100644 --- a/uPortal-events/build.gradle +++ b/uPortal-events/build.gradle @@ -5,13 +5,13 @@ ext { } dependencies { - compile project(':uPortal-rendering') - compile project(':uPortal-security:uPortal-security-core') + api project(':uPortal-rendering') + api project(':uPortal-security:uPortal-security-core') - compile "org.apache.commons:commons-math3:${commonsMath3Version}" + implementation "org.apache.commons:commons-math3:${commonsMath3Version}" // NOTE: String that the group and version don't seem to // match, but apparently this version is correct. - compile "org.apache.httpcomponents:httpclient:${httpclientVersion}" + implementation "org.apache.httpcomponents:httpclient:${httpclientVersion}" compileOnly "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" diff --git a/uPortal-groups/uPortal-groups-core/build.gradle b/uPortal-groups/uPortal-groups-core/build.gradle index 6ff54f33417..a95a6b45ee5 100644 --- a/uPortal-groups/uPortal-groups-core/build.gradle +++ b/uPortal-groups/uPortal-groups-core/build.gradle @@ -1,10 +1,10 @@ description = "Apereo uPortal Groups Core" dependencies { - compile project(':uPortal-content:uPortal-content-portlet') - compile project(':uPortal-rdbm') + api project(':uPortal-content:uPortal-content-portlet') + implementation project(':uPortal-rdbm') - compile "com.google.guava:guava:${guavaVersion}" + implementation "com.google.guava:guava:${guavaVersion}" compileOnly "${servletApiDependency}" } diff --git a/uPortal-groups/uPortal-groups-filesystem/build.gradle b/uPortal-groups/uPortal-groups-filesystem/build.gradle index 719e26e8e7c..cb885629c69 100644 --- a/uPortal-groups/uPortal-groups-filesystem/build.gradle +++ b/uPortal-groups/uPortal-groups-filesystem/build.gradle @@ -1,7 +1,7 @@ description = "Apereo uPortal Groups Filesystem" dependencies { - compile project(':uPortal-groups:uPortal-groups-core') + implementation project(':uPortal-groups:uPortal-groups-core') // compile "commons-io:commons-io:${commonsIoVersion}" } diff --git a/uPortal-groups/uPortal-groups-grouper/build.gradle b/uPortal-groups/uPortal-groups-grouper/build.gradle index 688314de4cb..b7459e4bcb2 100644 --- a/uPortal-groups/uPortal-groups-grouper/build.gradle +++ b/uPortal-groups/uPortal-groups-grouper/build.gradle @@ -1,7 +1,7 @@ description = "Apereo uPortal Groups Grouper" dependencies { - compile project(':uPortal-groups:uPortal-groups-core') + implementation project(':uPortal-groups:uPortal-groups-core') - compile "edu.internet2.middleware.grouper:grouperClient:${grouperClientVersion}" + implementation "edu.internet2.middleware.grouper:grouperClient:${grouperClientVersion}" } diff --git a/uPortal-groups/uPortal-groups-ldap/build.gradle b/uPortal-groups/uPortal-groups-ldap/build.gradle index 1031f924a97..f0a6dc91cb5 100644 --- a/uPortal-groups/uPortal-groups-ldap/build.gradle +++ b/uPortal-groups/uPortal-groups-ldap/build.gradle @@ -1,8 +1,8 @@ description = "Apereo uPortal Groups LDAP" dependencies { - compile project(':uPortal-groups:uPortal-groups-core') + implementation project(':uPortal-groups:uPortal-groups-core') - compile "org.springframework.ldap:spring-ldap-core:${springLdapVersion}" - compile "org.springframework.ldap:spring-ldap-core-tiger:${springLdapVersion}" + implementation "org.springframework.ldap:spring-ldap-core:${springLdapVersion}" + implementation "org.springframework.ldap:spring-ldap-core-tiger:${springLdapVersion}" } diff --git a/uPortal-groups/uPortal-groups-local/build.gradle b/uPortal-groups/uPortal-groups-local/build.gradle index 5dc6d2c50c6..5ea94f71fd8 100644 --- a/uPortal-groups/uPortal-groups-local/build.gradle +++ b/uPortal-groups/uPortal-groups-local/build.gradle @@ -1,7 +1,7 @@ description = "Apereo uPortal Groups Local" dependencies { - compile project(':uPortal-groups:uPortal-groups-core') + implementation project(':uPortal-groups:uPortal-groups-core') // compile "commons-io:commons-io:${commonsIoVersion}" } diff --git a/uPortal-groups/uPortal-groups-pags/build.gradle b/uPortal-groups/uPortal-groups-pags/build.gradle index 6575d518dc6..07f43347171 100644 --- a/uPortal-groups/uPortal-groups-pags/build.gradle +++ b/uPortal-groups/uPortal-groups-pags/build.gradle @@ -5,14 +5,14 @@ ext { } dependencies { - compile project(':uPortal-groups:uPortal-groups-core') - compile project(':uPortal-layout:uPortal-layout-core') - compile project(':uPortal-security:uPortal-security-core') - compile project(':uPortal-url') + implementation project(':uPortal-groups:uPortal-groups-core') + implementation project(':uPortal-layout:uPortal-layout-core') + api project(':uPortal-security:uPortal-security-core') + implementation project(':uPortal-url') - compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" - compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}" - compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" + implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" + implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}" + implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" compileOnly "${servletApiDependency}" diff --git a/uPortal-groups/uPortal-groups-smartldap/build.gradle b/uPortal-groups/uPortal-groups-smartldap/build.gradle index da1d077d483..f0dacaa6e56 100644 --- a/uPortal-groups/uPortal-groups-smartldap/build.gradle +++ b/uPortal-groups/uPortal-groups-smartldap/build.gradle @@ -1,9 +1,9 @@ description = "Apereo uPortal Groups SmartLdap" dependencies { - compile project(':uPortal-groups:uPortal-groups-core') + implementation project(':uPortal-groups:uPortal-groups-core') - compile("com.googlecode.cernunnos:cernunnos:${cernunnosVersion}") { + implementation("com.googlecode.cernunnos:cernunnos:${cernunnosVersion}") { exclude group: 'org.netbeans.lib', module: 'cvsclient' exclude group: 'org.springframework', module: 'spring' exclude group: 'net.sf.retrotranslator', module: 'retrotranslator-runtime' @@ -17,5 +17,5 @@ dependencies { exclude group: 'javax.script', module: 'groovy-engine' exclude group: 'javax.script', module: 'script-api' } - compile "org.springframework.ldap:spring-ldap-core:${springLdapVersion}" + implementation "org.springframework.ldap:spring-ldap-core:${springLdapVersion}" } diff --git a/uPortal-health/build.gradle b/uPortal-health/build.gradle index 53b46c2101b..01f1faa6e08 100644 --- a/uPortal-health/build.gradle +++ b/uPortal-health/build.gradle @@ -1,7 +1,7 @@ description = "Apereo uPortal Health Check" dependencies { - compile project(':uPortal-spring') + implementation project(':uPortal-spring') compileOnly "${servletApiDependency}" } diff --git a/uPortal-hibernate/build.gradle b/uPortal-hibernate/build.gradle index 934e539fd86..544da8943b5 100644 --- a/uPortal-hibernate/build.gradle +++ b/uPortal-hibernate/build.gradle @@ -1,8 +1,8 @@ description = "Apereo uPortal Hibernate Utilities" dependencies { - compile "commons-lang:commons-lang:${commonsLangVersion}" - compile "net.sf.ehcache:ehcache-core:${ehcacheVersion}" - compile "org.hibernate:hibernate-core:${hibernateVersion}" - compile "org.hibernate:hibernate-ehcache:${hibernateVersion}" + implementation "commons-lang:commons-lang:${commonsLangVersion}" + implementation "net.sf.ehcache:ehcache-core:${ehcacheVersion}" + implementation "org.hibernate:hibernate-core:${hibernateVersion}" + implementation "org.hibernate:hibernate-ehcache:${hibernateVersion}" } diff --git a/uPortal-i18n/build.gradle b/uPortal-i18n/build.gradle index d259144e826..6fddfb58845 100644 --- a/uPortal-i18n/build.gradle +++ b/uPortal-i18n/build.gradle @@ -5,9 +5,9 @@ ext { } dependencies { - compile project(':uPortal-rdbm') + api project(':uPortal-rdbm') - compile "org.slf4j:log4j-over-slf4j:${slf4jVersion}" + implementation "org.slf4j:log4j-over-slf4j:${slf4jVersion}" annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" compileOnly "${servletApiDependency}" diff --git a/uPortal-index/build.gradle b/uPortal-index/build.gradle index c4cda44def4..da6aec42753 100644 --- a/uPortal-index/build.gradle +++ b/uPortal-index/build.gradle @@ -1,14 +1,14 @@ description = "Apereo uPortal Search Indexing" dependencies { - compile project(':uPortal-content:uPortal-content-portlet') + implementation project(':uPortal-content:uPortal-content-portlet') - compile "org.apache.lucene:lucene-core:${luceneVersion}" - compile "org.jsoup:jsoup:${jsoupVersion}" + implementation "org.apache.lucene:lucene-core:${luceneVersion}" + implementation "org.jsoup:jsoup:${jsoupVersion}" compileOnly "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" compileOnly "${servletApiDependency}" - testCompile "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" - testCompile "${servletApiDependency}" + testImplementation "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" + testImplementation "${servletApiDependency}" } diff --git a/uPortal-io/uPortal-io-core/build.gradle b/uPortal-io/uPortal-io-core/build.gradle index 5d217938320..b1d11c5e210 100644 --- a/uPortal-io/uPortal-io-core/build.gradle +++ b/uPortal-io/uPortal-io-core/build.gradle @@ -1,11 +1,11 @@ description = "Apereo uPortal Import/Export Core" dependencies { - compile project(':uPortal-utils:uPortal-utils-core') + implementation project(':uPortal-utils:uPortal-utils-core') - compile "commons-lang:commons-lang:${commonsLangVersion}" - compile "org.apache.commons:commons-compress:${commonsCompressVersion}" - compile "org.apache.tika:tika-core:${tikaVersion}" - compile "org.slf4j:slf4j-api:${slf4jVersion}" - compile "org.springframework:spring-oxm:${springVersion}" + implementation "commons-lang:commons-lang:${commonsLangVersion}" + implementation "org.apache.commons:commons-compress:${commonsCompressVersion}" + implementation "org.apache.tika:tika-core:${tikaVersion}" + implementation "org.slf4j:slf4j-api:${slf4jVersion}" + api "org.springframework:spring-oxm:${springVersion}" } diff --git a/uPortal-io/uPortal-io-types/build.gradle b/uPortal-io/uPortal-io-types/build.gradle index 9fa01489d90..6d05ffd7bf4 100644 --- a/uPortal-io/uPortal-io-types/build.gradle +++ b/uPortal-io/uPortal-io-types/build.gradle @@ -1,14 +1,14 @@ description = "Apereo uPortal Import/Export Data Types" dependencies { - compile project(':uPortal-events') - compile project(':uPortal-groups:uPortal-groups-pags') - compile project(':uPortal-io:uPortal-io-core') - compile project(':uPortal-io:uPortal-io-jaxb') - compile project(':uPortal-security:uPortal-security-permissions') + implementation project(':uPortal-events') + api project(':uPortal-groups:uPortal-groups-pags') + implementation project(':uPortal-io:uPortal-io-core') + implementation project(':uPortal-io:uPortal-io-jaxb') + api project(':uPortal-security:uPortal-security-permissions') - compile "com.fasterxml.staxmate:staxmate:${staxmateVersion}" - compile("com.googlecode.cernunnos:cernunnos:${cernunnosVersion}") { + implementation "com.fasterxml.staxmate:staxmate:${staxmateVersion}" + api("com.googlecode.cernunnos:cernunnos:${cernunnosVersion}") { exclude group: 'org.netbeans.lib', module: 'cvsclient' exclude group: 'org.springframework', module: 'spring' exclude group: 'net.sf.retrotranslator', module: 'retrotranslator-runtime' diff --git a/uPortal-layout/uPortal-layout-core/build.gradle b/uPortal-layout/uPortal-layout-core/build.gradle index 1780575ee5e..ac3d15aa970 100644 --- a/uPortal-layout/uPortal-layout-core/build.gradle +++ b/uPortal-layout/uPortal-layout-core/build.gradle @@ -5,23 +5,23 @@ ext { } dependencies { - compile project(':uPortal-io:uPortal-io-core') - compile project(':uPortal-i18n') - compile project(':uPortal-utils:uPortal-utils-core') + implementation project(':uPortal-io:uPortal-io-core') + implementation project(':uPortal-i18n') + api project(':uPortal-utils:uPortal-utils-core') - compile "com.google.guava:guava:${guavaVersion}" - compile("dom4j:dom4j:${dom4jVersion}"){ + implementation "com.google.guava:guava:${guavaVersion}" + implementation("dom4j:dom4j:${dom4jVersion}"){ exclude group: 'xml-apis', module: 'xml-apis' } - testCompile "${portletApiDependency}" - testCompile "${servletApiDependency}" + testImplementation "${portletApiDependency}" + testImplementation "${servletApiDependency}" compileOnly "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" compileOnly "${servletApiDependency}" - compile "org.slf4j:slf4j-api:${slf4jVersion}" + implementation "org.slf4j:slf4j-api:${slf4jVersion}" compileOnly "org.projectlombok:lombok:${lombokVersion}" annotationProcessor "org.projectlombok:lombok:${lombokVersion}"} diff --git a/uPortal-layout/uPortal-layout-impl/build.gradle b/uPortal-layout/uPortal-layout-impl/build.gradle index eca96045f2c..7fd4d77dbf3 100644 --- a/uPortal-layout/uPortal-layout-impl/build.gradle +++ b/uPortal-layout/uPortal-layout-impl/build.gradle @@ -1,13 +1,13 @@ description = "Apereo uPortal Layout Manager Implementations" dependencies { - compile project(':uPortal-content:uPortal-content-portlet') - compile project(':uPortal-layout:uPortal-layout-core') - compile project(':uPortal-rendering') - compile project(':uPortal-security:uPortal-security-core') - compile project(':uPortal-spring') + implementation project(':uPortal-content:uPortal-content-portlet') + implementation project(':uPortal-layout:uPortal-layout-core') + implementation project(':uPortal-rendering') + implementation project(':uPortal-security:uPortal-security-core') + implementation project(':uPortal-spring') - testCompile "${servletApiDependency}" + testImplementation "${servletApiDependency}" compileOnly "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" compileOnly "${portletApiDependency}" diff --git a/uPortal-marketplace/build.gradle b/uPortal-marketplace/build.gradle index e0f75b03a84..e08692994b7 100644 --- a/uPortal-marketplace/build.gradle +++ b/uPortal-marketplace/build.gradle @@ -1,14 +1,14 @@ description = "Apereo uPortal Marketplace" dependencies { - compile project(':uPortal-layout:uPortal-layout-core') - compile project(':uPortal-security:uPortal-security-core') + implementation project(':uPortal-layout:uPortal-layout-core') + api project(':uPortal-security:uPortal-security-core') - testCompile "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" + testImplementation "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" compileOnly "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" - compile "org.slf4j:slf4j-api:${slf4jVersion}" + implementation "org.slf4j:slf4j-api:${slf4jVersion}" compileOnly "org.projectlombok:lombok:${lombokVersion}" annotationProcessor "org.projectlombok:lombok:${lombokVersion}" } diff --git a/uPortal-persondir/build.gradle b/uPortal-persondir/build.gradle index 2068d297c48..030828c61a9 100644 --- a/uPortal-persondir/build.gradle +++ b/uPortal-persondir/build.gradle @@ -5,14 +5,14 @@ ext { } dependencies { - compile project(':uPortal-security:uPortal-security-core') + api project(':uPortal-security:uPortal-security-core') annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" compileOnly "${portletApiDependency}" compileOnly "${servletApiDependency}" - testCompile "${portletApiDependency}" - testCompile "${servletApiDependency}" + testImplementation "${portletApiDependency}" + testImplementation "${servletApiDependency}" } /* diff --git a/uPortal-portlets/build.gradle b/uPortal-portlets/build.gradle index a2cc05f90c1..74180bbb5a5 100644 --- a/uPortal-portlets/build.gradle +++ b/uPortal-portlets/build.gradle @@ -1,27 +1,27 @@ description = "Apereo uPortal Framework Portlets" dependencies { - compile project(':uPortal-io:uPortal-io-types') - compile project(':uPortal-tenants') - compile project(':uPortal-web') + api project(':uPortal-io:uPortal-io-types') + api project(':uPortal-tenants') + api project(':uPortal-web') - compile "com.amazonaws:aws-java-sdk-s3:${awsVersion}" - compile "javax.mail:mail:${javaxMailVersion}" - compile("net.sf.json-lib:json-lib-ext-spring:${jsonLibExtSpringVersion}") { + implementation "com.amazonaws:aws-java-sdk-s3:${awsVersion}" + implementation "javax.mail:mail:${javaxMailVersion}" + implementation("net.sf.json-lib:json-lib-ext-spring:${jsonLibExtSpringVersion}") { exclude group: 'javax.servlet', module: 'servlet-api' } - compile "org.antlr:ST4:${stringtemplateVersion}" - compile("org.lesscss:lesscss:${lesscssVersion}") { + api "org.antlr:ST4:${stringtemplateVersion}" + api("org.lesscss:lesscss:${lesscssVersion}") { exclude group: 'org.slf4j', module: 'slf4j-simple' } - compile "org.springframework:spring-context-support:${springVersion}" + api "org.springframework:spring-context-support:${springVersion}" // needed for stats portlet - compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:${jacksonVersion}" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:${jacksonVersion}" - testCompile "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" - testCompile "${portletApiDependency}" - testCompile "${servletApiDependency}" + testImplementation "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" + testImplementation "${portletApiDependency}" + testImplementation "${servletApiDependency}" compileOnly "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" compileOnly "org.apache.portals.pluto:pluto-container-driver-api:${plutoVersion}" diff --git a/uPortal-rdbm/build.gradle b/uPortal-rdbm/build.gradle index 25803f98987..4782422a039 100644 --- a/uPortal-rdbm/build.gradle +++ b/uPortal-rdbm/build.gradle @@ -1,15 +1,15 @@ description = "Apereo uPortal RDBM" dependencies { - compile project(':uPortal-utils:uPortal-utils-core') + api project(':uPortal-utils:uPortal-utils-core') - compile "com.google.guava:guava:${guavaVersion}" - compile "org.apache.commons:commons-math3:${commonsMath3Version}" - compile "org.hibernate:hibernate-core:${hibernateVersion}" - compile "org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.1.Final" - compile "org.jasig.portlet.utils:portlet-jdbc-util:${apereoPortletUtilsVersion}" - compile "org.springframework:spring-context:${springVersion}" - compile "org.springframework:spring-jdbc:${springVersion}" - compile "org.springframework:spring-orm:${springVersion}" - compile "org.springframework:spring-tx:${springVersion}" + implementation "com.google.guava:guava:${guavaVersion}" + api "org.apache.commons:commons-math3:${commonsMath3Version}" + implementation "org.hibernate:hibernate-core:${hibernateVersion}" + implementation "org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.1.Final" + api "org.jasig.portlet.utils:portlet-jdbc-util:${apereoPortletUtilsVersion}" + implementation "org.springframework:spring-context:${springVersion}" + implementation "org.springframework:spring-jdbc:${springVersion}" + implementation "org.springframework:spring-orm:${springVersion}" + implementation "org.springframework:spring-tx:${springVersion}" } diff --git a/uPortal-rendering/build.gradle b/uPortal-rendering/build.gradle index 684cf0fcc1e..7fbdeb24960 100644 --- a/uPortal-rendering/build.gradle +++ b/uPortal-rendering/build.gradle @@ -1,23 +1,23 @@ description = "Apereo uPortal Rendering" dependencies { - compile project(':uPortal-api:uPortal-api-search') - compile project(':uPortal-marketplace') - compile project(':uPortal-security:uPortal-security-core') - compile project(':uPortal-url') + api project(':uPortal-api:uPortal-api-search') + api project(':uPortal-marketplace') + api project(':uPortal-security:uPortal-security-core') + api project(':uPortal-url') - compile "org.apache.httpcomponents:httpcore:${httpcomponentsVersion}" - compile "org.apache.commons:commons-pool2:${commonsPoolVersion}" - compile("org.apache.portals.pluto:pluto-container:${plutoVersion}") { + implementation "org.apache.httpcomponents:httpcore:${httpcomponentsVersion}" + implementation "org.apache.commons:commons-pool2:${commonsPoolVersion}" + api("org.apache.portals.pluto:pluto-container:${plutoVersion}") { exclude group: 'javax.xml.bind', module: 'jaxb-api' exclude group: 'com.sun.xml.bind', module: 'jaxb-impl' exclude group: 'stax', module: 'stax' } - compile "org.apache.portals.pluto:pluto-portal-driver:${plutoVersion}" + api "org.apache.portals.pluto:pluto-portal-driver:${plutoVersion}" - testCompile "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" - testCompile "${portletApiDependency}" - testCompile "${servletApiDependency}" + testImplementation "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" + testImplementation "${portletApiDependency}" + testImplementation "${servletApiDependency}" compileOnly "javax.ccpp:ccpp:${ccppVersion}" compileOnly "org.apache.portals.pluto:pluto-container-driver-api:${plutoVersion}" diff --git a/uPortal-security/uPortal-security-authn/build.gradle b/uPortal-security/uPortal-security-authn/build.gradle index dc6d7df4084..f136cd02bb8 100644 --- a/uPortal-security/uPortal-security-authn/build.gradle +++ b/uPortal-security/uPortal-security-authn/build.gradle @@ -1,11 +1,11 @@ description = "Apereo uPortal Security Authentication" dependencies { - compile project(':uPortal-persondir') - compile project(':uPortal-security:uPortal-security-core') - compile project(':uPortal-spring') + implementation project(':uPortal-persondir') + implementation project(':uPortal-security:uPortal-security-core') + implementation project(':uPortal-spring') - compile("org.jasig.cas.client:cas-client-core:${casClientVersion}") { + implementation("org.jasig.cas.client:cas-client-core:${casClientVersion}") { exclude group: 'org.opensaml', module: 'opensaml' } diff --git a/uPortal-security/uPortal-security-core/build.gradle b/uPortal-security/uPortal-security-core/build.gradle index 3700c52f77f..1908cdded43 100644 --- a/uPortal-security/uPortal-security-core/build.gradle +++ b/uPortal-security/uPortal-security-core/build.gradle @@ -1,19 +1,19 @@ description = "Apereo uPortal Security Core" dependencies { - compile project(':uPortal-content:uPortal-content-portlet') - compile project(':uPortal-groups:uPortal-groups-core') - compile project(':uPortal-i18n') - compile project(':uPortal-soffit:uPortal-soffit-core') - compile project(':uPortal-utils:uPortal-utils-url') + api project(':uPortal-content:uPortal-content-portlet') + api project(':uPortal-groups:uPortal-groups-core') + api project(':uPortal-i18n') + api project(':uPortal-soffit:uPortal-soffit-core') + api project(':uPortal-utils:uPortal-utils-url') - compile "io.jsonwebtoken:jjwt-api:${jjwtVersion}" - runtime "io.jsonwebtoken:jjwt-impl:${jjwtVersion}", + implementation "io.jsonwebtoken:jjwt-api:${jjwtVersion}" + runtimeOnly "io.jsonwebtoken:jjwt-impl:${jjwtVersion}", "org.bouncycastle:bcprov-jdk15on:${bouncyVersion}", // for RSASSA-PSS "io.jsonwebtoken:jjwt-jackson:${jjwtVersion}" - compile "org.jasypt:jasypt:${jasyptVersion}" + implementation "org.jasypt:jasypt:${jasyptVersion}" - testCompile "${servletApiDependency}" + testImplementation "${servletApiDependency}" compileOnly "${portletApiDependency}" compileOnly "${servletApiDependency}" diff --git a/uPortal-security/uPortal-security-mvc/build.gradle b/uPortal-security/uPortal-security-mvc/build.gradle index 5c298131d10..e655452b372 100644 --- a/uPortal-security/uPortal-security-mvc/build.gradle +++ b/uPortal-security/uPortal-security-mvc/build.gradle @@ -1,16 +1,16 @@ description = "Apereo uPortal Security MVC" dependencies { - compile project(':uPortal-core') - compile project(':uPortal-events') + api project(':uPortal-core') + api project(':uPortal-events') - testCompile "${servletApiDependency}" + testImplementation "${servletApiDependency}" compileOnly "${servletApiDependency}" compileOnly "org.springframework:spring-web:${springVersion}" compileOnly "org.springframework:spring-test:${springVersion}" - compile "org.slf4j:slf4j-api:${slf4jVersion}" + implementation "org.slf4j:slf4j-api:${slf4jVersion}" compileOnly "org.projectlombok:lombok:${lombokVersion}" annotationProcessor "org.projectlombok:lombok:${lombokVersion}" } diff --git a/uPortal-security/uPortal-security-permissions/build.gradle b/uPortal-security/uPortal-security-permissions/build.gradle index ce0570e5daf..e6f834de0c5 100644 --- a/uPortal-security/uPortal-security-permissions/build.gradle +++ b/uPortal-security/uPortal-security-permissions/build.gradle @@ -5,11 +5,11 @@ ext { } dependencies { - compile project(':uPortal-api:uPortal-api-internal') - compile project(':uPortal-content:uPortal-content-publishing') - compile project(':uPortal-io:uPortal-io-jaxb') - compile project(':uPortal-security:uPortal-security-core') - compile project(':uPortal-spring') + api project(':uPortal-api:uPortal-api-internal') + api project(':uPortal-content:uPortal-content-publishing') + api project(':uPortal-io:uPortal-io-jaxb') + api project(':uPortal-security:uPortal-security-core') + api project(':uPortal-spring') annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" } diff --git a/uPortal-security/uPortal-security-services/build.gradle b/uPortal-security/uPortal-security-services/build.gradle index eaf1d9487e7..65175ea62c2 100644 --- a/uPortal-security/uPortal-security-services/build.gradle +++ b/uPortal-security/uPortal-security-services/build.gradle @@ -1,8 +1,8 @@ description = "Apereo uPortal Security MVC" dependencies { - compile project(':uPortal-events') - compile project(':uPortal-security:uPortal-security-core') + api project(':uPortal-events') + api project(':uPortal-security:uPortal-security-core') compileOnly "${servletApiDependency}" } diff --git a/uPortal-security/uPortal-security-xslt/build.gradle b/uPortal-security/uPortal-security-xslt/build.gradle index 6fb56f9383e..29b6c3b5957 100644 --- a/uPortal-security/uPortal-security-xslt/build.gradle +++ b/uPortal-security/uPortal-security-xslt/build.gradle @@ -1,7 +1,7 @@ description = "Apereo uPortal Security MVC" dependencies { - compile project(':uPortal-security:uPortal-security-core') + api project(':uPortal-security:uPortal-security-core') compileOnly "${servletApiDependency}" } diff --git a/uPortal-soffit/uPortal-soffit-connector/build.gradle b/uPortal-soffit/uPortal-soffit-connector/build.gradle index 287976afdd7..6af633865c3 100644 --- a/uPortal-soffit/uPortal-soffit-connector/build.gradle +++ b/uPortal-soffit/uPortal-soffit-connector/build.gradle @@ -1,15 +1,15 @@ description = "Apereo uPortal Soffit Connector" dependencies { - compile project(':uPortal-groups:uPortal-groups-core') - compile project(':uPortal-i18n') - compile project(':uPortal-marketplace') - compile project(':uPortal-soffit:uPortal-soffit-core') + api project(':uPortal-groups:uPortal-groups-core') + api project(':uPortal-i18n') + api project(':uPortal-marketplace') + api project(':uPortal-soffit:uPortal-soffit-core') - compile "commons-io:commons-io:${commonsIoVersion}" - compile "net.sf.ehcache:ehcache-core:${ehcacheVersion}" - compile "org.apache.httpcomponents:httpclient:${httpclientVersion}" - compile "org.springframework:spring-webmvc-portlet:${springVersion}" + implementation "commons-io:commons-io:${commonsIoVersion}" + implementation "net.sf.ehcache:ehcache-core:${ehcacheVersion}" + implementation "org.apache.httpcomponents:httpclient:${httpclientVersion}" + implementation "org.springframework:spring-webmvc-portlet:${springVersion}" compileOnly "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" compileOnly "${portletApiDependency}" diff --git a/uPortal-soffit/uPortal-soffit-core/build.gradle b/uPortal-soffit/uPortal-soffit-core/build.gradle index be740995164..27e398dc542 100644 --- a/uPortal-soffit/uPortal-soffit-core/build.gradle +++ b/uPortal-soffit/uPortal-soffit-core/build.gradle @@ -1,15 +1,15 @@ description = "Apereo uPortal Soffit Core" dependencies { - compile "io.jsonwebtoken:jjwt-api:${jjwtVersion}" - compile 'javax.annotation:javax.annotation-api:1.3.2' - runtime "io.jsonwebtoken:jjwt-impl:${jjwtVersion}", + api "io.jsonwebtoken:jjwt-api:${jjwtVersion}" + api 'javax.annotation:javax.annotation-api:1.3.2' + runtimeOnly "io.jsonwebtoken:jjwt-impl:${jjwtVersion}", "org.bouncycastle:bcprov-jdk15on:${bouncyVersion}", // for RSASSA-PSS "io.jsonwebtoken:jjwt-jackson:${jjwtVersion}" - compile "org.apache.commons:commons-lang3:${commonsLang3Version}" - compile "org.jasypt:jasypt:${jasyptVersion}" - compile "org.slf4j:slf4j-api:${slf4jVersion}" - compile "org.springframework:spring-web:${springVersion}" + api "org.apache.commons:commons-lang3:${commonsLang3Version}" + api "org.jasypt:jasypt:${jasyptVersion}" + api "org.slf4j:slf4j-api:${slf4jVersion}" + api "org.springframework:spring-web:${springVersion}" compileOnly "org.projectlombok:lombok:${lombokVersion}" annotationProcessor "org.projectlombok:lombok:${lombokVersion}" } diff --git a/uPortal-soffit/uPortal-soffit-renderer/build.gradle b/uPortal-soffit/uPortal-soffit-renderer/build.gradle index ee3e4c1e9e4..2de775321d5 100644 --- a/uPortal-soffit/uPortal-soffit-renderer/build.gradle +++ b/uPortal-soffit/uPortal-soffit-renderer/build.gradle @@ -1,16 +1,16 @@ description = "Apereo uPortal Soffit Renderer" dependencies { - compile(project(':uPortal-soffit:uPortal-soffit-core')) { + api(project(':uPortal-soffit:uPortal-soffit-core')) { exclude group: 'org.springframework', module: 'spring-web' } - compile "org.springframework:spring-webmvc:${springVersion}" - compile "org.springframework.security:spring-security-web:${springSecurityVersion}" + implementation "org.springframework:spring-webmvc:${springVersion}" + implementation "org.springframework.security:spring-security-web:${springSecurityVersion}" - testCompile "junit:junit:${junitVersion}" - testCompile "org.mockito:mockito-core:${mockitoVersion}" - testCompile "${servletApiDependency}" + testImplementation "junit:junit:${junitVersion}" + testImplementation "org.mockito:mockito-core:${mockitoVersion}" + testImplementation "${servletApiDependency}" compileOnly "${servletApiDependency}" } diff --git a/uPortal-spring/build.gradle b/uPortal-spring/build.gradle index 3f8358a14ae..c0ad32c3bf8 100644 --- a/uPortal-spring/build.gradle +++ b/uPortal-spring/build.gradle @@ -1,25 +1,25 @@ description = "Apereo uPortal Spring Components" dependencies { - compile project(':uPortal-api:uPortal-api-internal') - compile project(':uPortal-security:uPortal-security-core') - compile project(':uPortal-security:uPortal-security-mvc') - compile project(':uPortal-tools') + api project(':uPortal-api:uPortal-api-internal') + api project(':uPortal-security:uPortal-security-core') + api project(':uPortal-security:uPortal-security-mvc') + api project(':uPortal-tools') - compile "commons-codec:commons-codec:${commonsCodecVersion}" - compile "commons-lang:commons-lang:${commonsLangVersion}" - compile "net.oauth.core:oauth:${oauthVersion}" - compile "org.jasypt:jasypt:${jasyptVersion}" - compile "org.slf4j:slf4j-api:${slf4jVersion}" - compile "org.springframework:spring-web:${springVersion}" - compile "org.springframework:spring-webmvc:${springVersion}" - compile "org.springframework:spring-webmvc-portlet:${springVersion}" + implementation "commons-codec:commons-codec:${commonsCodecVersion}" + implementation "commons-lang:commons-lang:${commonsLangVersion}" + implementation "net.oauth.core:oauth:${oauthVersion}" + implementation "org.jasypt:jasypt:${jasyptVersion}" + implementation "org.slf4j:slf4j-api:${slf4jVersion}" + implementation "org.springframework:spring-web:${springVersion}" + implementation "org.springframework:spring-webmvc:${springVersion}" + implementation "org.springframework:spring-webmvc-portlet:${springVersion}" compileOnly "${portletApiDependency}" compileOnly "${servletApiDependency}" - testCompile "${portletApiDependency}" - testCompile "${servletApiDependency}" + testImplementation "${portletApiDependency}" + testImplementation "${servletApiDependency}" compileOnly "org.projectlombok:lombok:${lombokVersion}" annotationProcessor "org.projectlombok:lombok:${lombokVersion}"} diff --git a/uPortal-tenants/build.gradle b/uPortal-tenants/build.gradle index b7edf728e91..0fe322b344c 100644 --- a/uPortal-tenants/build.gradle +++ b/uPortal-tenants/build.gradle @@ -5,10 +5,10 @@ ext { } dependencies { - compile project(':uPortal-api:uPortal-api-internal') - compile project(':uPortal-io:uPortal-io-types') + api project(':uPortal-api:uPortal-api-internal') + api project(':uPortal-io:uPortal-io-types') - compile "javax.mail:mail:${javaxMailVersion}" + implementation "javax.mail:mail:${javaxMailVersion}" annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" // Required for javac -s compileOnly "${servletApiDependency}" diff --git a/uPortal-tools/build.gradle b/uPortal-tools/build.gradle index ea936d99089..f05053958e0 100644 --- a/uPortal-tools/build.gradle +++ b/uPortal-tools/build.gradle @@ -5,14 +5,14 @@ ext { } dependencies { - compile project(':uPortal-hibernate') - compile project(':uPortal-io:uPortal-io-core') - compile project(':uPortal-persondir') - compile project(':uPortal-rdbm') + api project(':uPortal-hibernate') + api project(':uPortal-io:uPortal-io-core') + api project(':uPortal-persondir') + api project(':uPortal-rdbm') - compile "commons-cli:commons-cli:${commonsCliVersion}" - compile "org.apache.ant:ant:${antVersion}" - compile "org.codehaus.groovy:groovy:${groovyVersion}" + implementation "commons-cli:commons-cli:${commonsCliVersion}" + implementation "org.apache.ant:ant:${antVersion}" + implementation "org.codehaus.groovy:groovy:${groovyVersion}" annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" // Required for javac -s compileOnly "${servletApiDependency}" diff --git a/uPortal-url/build.gradle b/uPortal-url/build.gradle index 9ce6d17d711..3310f6f9c18 100644 --- a/uPortal-url/build.gradle +++ b/uPortal-url/build.gradle @@ -1,9 +1,9 @@ description = "Apereo uPortal URL" dependencies { - compile project(':uPortal-content:uPortal-content-portlet') - compile project(':uPortal-groups:uPortal-groups-core') - compile project(':uPortal-security:uPortal-security-core') + api project(':uPortal-content:uPortal-content-portlet') + api project(':uPortal-groups:uPortal-groups-core') + api project(':uPortal-security:uPortal-security-core') compileOnly "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" compileOnly "org.apache.portals.pluto:pluto-container:${plutoVersion}" diff --git a/uPortal-utils/uPortal-utils-core/build.gradle b/uPortal-utils/uPortal-utils-core/build.gradle index 57ecc6a1c6c..c582270a1f7 100644 --- a/uPortal-utils/uPortal-utils-core/build.gradle +++ b/uPortal-utils/uPortal-utils-core/build.gradle @@ -5,40 +5,40 @@ ext { } dependencies { - compile project(':uPortal-concurrency') - compile project(':uPortal-hibernate:uPortal-hibernate4-dialects') + api project(':uPortal-concurrency') + api project(':uPortal-hibernate:uPortal-hibernate4-dialects') - compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" - compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}" - compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" - compile "com.google.guava:guava:${guavaVersion}" - compile "net.sf.ehcache:ehcache-core:${ehcacheVersion}" - compile "org.apache.ant:ant:${antVersion}" - compile "org.apache.commons:commons-lang3:${commonsLang3Version}" - compile "org.aspectj:aspectjrt:${aspectjVersion}" - compile "com.fasterxml.woodstox:woodstox-core:${woodstoxVersion}" - compile "org.jasig.resourceserver:resource-server-api:${resourceServerVersion}" - compile "org.jasig.resourceserver:resource-server-utils:${resourceServerVersion}" - compile("org.apereo.service.persondir:person-directory-impl:${personDirectoryVersion}") { + api "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" + api "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}" + api "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" + api "com.google.guava:guava:${guavaVersion}" + api "net.sf.ehcache:ehcache-core:${ehcacheVersion}" + api "org.apache.ant:ant:${antVersion}" + api "org.apache.commons:commons-lang3:${commonsLang3Version}" + api "org.aspectj:aspectjrt:${aspectjVersion}" + api "com.fasterxml.woodstox:woodstox-core:${woodstoxVersion}" + api "org.jasig.resourceserver:resource-server-api:${resourceServerVersion}" + api "org.jasig.resourceserver:resource-server-utils:${resourceServerVersion}" + api("org.apereo.service.persondir:person-directory-impl:${personDirectoryVersion}") { exclude group: 'com.google.guava', module: 'guava' exclude group: 'org.springframework', module: 'spring-beans' exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-core' exclude group: 'org.springframework', module: 'spring-tx' } - compile "org.jgroups:jgroups:${jgroupsVersion}" - compile "org.jvnet.jaxb2_commons:jaxb2-basics-runtime:${jaxb2basicsVersion}" - compile "org.slf4j:jcl-over-slf4j:${slf4jVersion}" - compile "org.springframework:spring-beans:${springVersion}" - compile "org.springframework:spring-context:${springVersion}" - compile "org.springframework:spring-orm:${springVersion}" - compile "org.springframework:spring-web:${springVersion}" - compile "org.springframework:spring-webmvc-portlet:${springVersion}" - compile "org.springframework.ldap:spring-ldap-core:${springLdapVersion}" - compile "org.springframework.security:spring-security-web:${springSecurityVersion}" - compile "org.springframework.webflow:spring-binding:${springWebflowVersion}" - compile "org.springframework.webflow:spring-webflow:${springWebflowVersion}" - compile("org.springmodules:spring-modules-cache:${springModulesCacheVersion}") { + api "org.jgroups:jgroups:${jgroupsVersion}" + api "org.jvnet.jaxb2_commons:jaxb2-basics-runtime:${jaxb2basicsVersion}" + api "org.slf4j:jcl-over-slf4j:${slf4jVersion}" + api "org.springframework:spring-beans:${springVersion}" + api "org.springframework:spring-context:${springVersion}" + api "org.springframework:spring-orm:${springVersion}" + api "org.springframework:spring-web:${springVersion}" + api "org.springframework:spring-webmvc-portlet:${springVersion}" + api "org.springframework.ldap:spring-ldap-core:${springLdapVersion}" + api "org.springframework.security:spring-security-web:${springSecurityVersion}" + api "org.springframework.webflow:spring-binding:${springWebflowVersion}" + api "org.springframework.webflow:spring-webflow:${springWebflowVersion}" + api("org.springmodules:spring-modules-cache:${springModulesCacheVersion}") { exclude group: 'org.springframework', module: 'spring' exclude group: 'gigaspaces', module: 'gigaspaces-ce' exclude group: 'jini', module: 'jsk-lib' @@ -65,13 +65,13 @@ dependencies { exclude group: 'opensymphony', module: 'oscache' exclude group: 'ehcache', module: 'ehcache' } - compile "org.slf4j:slf4j-api:${slf4jVersion}" + api "org.slf4j:slf4j-api:${slf4jVersion}" compileOnly "org.projectlombok:lombok:${lombokVersion}" annotationProcessor "org.projectlombok:lombok:${lombokVersion}" - testCompile project(':uPortal-events') - testCompile "${portletApiDependency}" - testCompile "${servletApiDependency}" + testImplementation project(':uPortal-events') + testImplementation "${portletApiDependency}" + testImplementation "${servletApiDependency}" compileOnly "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateJpamodelgenVersion}" diff --git a/uPortal-utils/uPortal-utils-jmx/build.gradle b/uPortal-utils/uPortal-utils-jmx/build.gradle index 2ac2a9b7d43..f37ffe318ab 100644 --- a/uPortal-utils/uPortal-utils-jmx/build.gradle +++ b/uPortal-utils/uPortal-utils-jmx/build.gradle @@ -1,7 +1,7 @@ description = "Apereo uPortal JMX Utils" dependencies { - compile project(':uPortal-security:uPortal-security-services') + api project(':uPortal-security:uPortal-security-services') compileOnly "${servletApiDependency}" } diff --git a/uPortal-utils/uPortal-utils-url/build.gradle b/uPortal-utils/uPortal-utils-url/build.gradle index 19696a4dd8c..1bccd6536c4 100644 --- a/uPortal-utils/uPortal-utils-url/build.gradle +++ b/uPortal-utils/uPortal-utils-url/build.gradle @@ -1,9 +1,9 @@ description = "Apereo uPortal Utilities Url" dependencies { - compile "org.slf4j:slf4j-api:${slf4jVersion}" - compile "org.springframework:spring-beans:${springVersion}" - compile "org.springframework:spring-core:${springVersion}" + implementation "org.slf4j:slf4j-api:${slf4jVersion}" + implementation "org.springframework:spring-beans:${springVersion}" + implementation "org.springframework:spring-core:${springVersion}" compileOnly "org.apache.portals.pluto:pluto-container:${plutoVersion}" compileOnly "${portletApiDependency}" diff --git a/uPortal-web/build.gradle b/uPortal-web/build.gradle index 0e9064f04ab..c5bbe992e90 100644 --- a/uPortal-web/build.gradle +++ b/uPortal-web/build.gradle @@ -5,17 +5,17 @@ ext { } dependencies { - compile project(':uPortal-api:uPortal-api-rest') - compile project(':uPortal-health') - compile project(':uPortal-events') - compile project(':uPortal-layout:uPortal-layout-impl') - compile project(':uPortal-rendering') + api project(':uPortal-api:uPortal-api-rest') + api project(':uPortal-health') + api project(':uPortal-events') + api project(':uPortal-layout:uPortal-layout-impl') + api project(':uPortal-rendering') - compile "com.github.ci-rt:google-visualization-java:${googleVisualizationVersion}" - compile "joda-time:joda-time:${jodaTimeVersion}" + api "com.github.ci-rt:google-visualization-java:${googleVisualizationVersion}" + api "joda-time:joda-time:${jodaTimeVersion}" - testCompile "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" - testCompile "${servletApiDependency}" + testImplementation "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" + testImplementation "${servletApiDependency}" compileOnly "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" compileOnly "org.apache.portals.pluto:pluto-container-driver-api:${plutoVersion}" diff --git a/uPortal-webapp/build.gradle b/uPortal-webapp/build.gradle index 69f2a9a155c..7529684ed0a 100644 --- a/uPortal-webapp/build.gradle +++ b/uPortal-webapp/build.gradle @@ -29,43 +29,43 @@ configurations { } dependencies { - compile project(':uPortal-groups:uPortal-groups-filesystem') - compile project(':uPortal-groups:uPortal-groups-grouper') - compile project(':uPortal-groups:uPortal-groups-ldap') - compile project(':uPortal-groups:uPortal-groups-local') - compile project(':uPortal-groups:uPortal-groups-smartldap') - compile project(':uPortal-index') - compile project(':uPortal-portlets') - compile project(':uPortal-security:uPortal-security-authn') - compile project(':uPortal-security:uPortal-security-xslt') - compile project(':uPortal-security:uPortal-security-filters') - compile project(':uPortal-soffit:uPortal-soffit-connector') - compile project(':uPortal-utils:uPortal-utils-jmx') - compile project(':uPortal-utils:uPortal-utils-url') + api project(':uPortal-groups:uPortal-groups-filesystem') + api project(':uPortal-groups:uPortal-groups-grouper') + api project(':uPortal-groups:uPortal-groups-ldap') + api project(':uPortal-groups:uPortal-groups-local') + api project(':uPortal-groups:uPortal-groups-smartldap') + api project(':uPortal-index') + api project(':uPortal-portlets') + api project(':uPortal-security:uPortal-security-authn') + api project(':uPortal-security:uPortal-security-xslt') + api project(':uPortal-security:uPortal-security-filters') + api project(':uPortal-soffit:uPortal-soffit-connector') + api project(':uPortal-utils:uPortal-utils-jmx') + api project(':uPortal-utils:uPortal-utils-url') compileOnly "org.apereo.service.persondir:person-directory-api:${personDirectoryVersion}" compileOnly "${servletApiDependency}" - testCompile "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" - testCompile "org.apache.portals.pluto:pluto-container-driver-api:${plutoVersion}" - testCompile "org.skyscreamer:jsonassert:${jsonassertVersion}" - testCompile "org.codehaus.groovy:groovy-test:${groovyVersion}" - testCompile "org.spockframework:spock-core:${spockVersion}" - testCompile "${portletApiDependency}" - testCompile "${servletApiDependency}" - - runtime "ch.qos.logback:logback-classic:${logbackVersion}" - runtime "joda-time:joda-time-jsptags:${jodaTimeJsptagsVersion}" - runtime "org.aspectj:aspectjweaver:${aspectjVersion}" - runtime "org.codehaus.groovy:groovy-jsr223:${groovyVersion}" - runtime "org.hibernate:hibernate-entitymanager:${hibernateVersion}" - runtime "org.jasig.cas.client:cas-client-support-distributed-ehcache:${casClientVersion}" - runtime "org.jasig.ehcache:ehcache-jgroups3replication:${ehcacheJgroups3ReplicationVersion}" - runtime "org.jasig.portlet.utils:portlet-ws-util:${apereoPortletUtilsVersion}" - runtime "org.slf4j:jul-to-slf4j:${slf4jVersion}" - runtime "org.slf4j:log4j-over-slf4j:${slf4jVersion}" - runtime "org.springframework.security:spring-security-config:${springSecurityVersion}" - runtime "com.thoughtworks.xstream:xstream:${xstreamVersion}" + testImplementation "org.apache.portals.pluto:pluto-container-api:${plutoVersion}" + testImplementation "org.apache.portals.pluto:pluto-container-driver-api:${plutoVersion}" + testImplementation "org.skyscreamer:jsonassert:${jsonassertVersion}" + testImplementation "org.codehaus.groovy:groovy-test:${groovyVersion}" + testImplementation "org.spockframework:spock-core:${spockVersion}" + testImplementation "${portletApiDependency}" + testImplementation "${servletApiDependency}" + + runtimeOnly "ch.qos.logback:logback-classic:${logbackVersion}" + runtimeOnly "joda-time:joda-time-jsptags:${jodaTimeJsptagsVersion}" + runtimeOnly "org.aspectj:aspectjweaver:${aspectjVersion}" + runtimeOnly "org.codehaus.groovy:groovy-jsr223:${groovyVersion}" + runtimeOnly "org.hibernate:hibernate-entitymanager:${hibernateVersion}" + runtimeOnly "org.jasig.cas.client:cas-client-support-distributed-ehcache:${casClientVersion}" + runtimeOnly "org.jasig.ehcache:ehcache-jgroups3replication:${ehcacheJgroups3ReplicationVersion}" + runtimeOnly "org.jasig.portlet.utils:portlet-ws-util:${apereoPortletUtilsVersion}" + runtimeOnly "org.slf4j:jul-to-slf4j:${slf4jVersion}" + runtimeOnly "org.slf4j:log4j-over-slf4j:${slf4jVersion}" + runtimeOnly "org.springframework.security:spring-security-config:${springSecurityVersion}" + runtimeOnly "com.thoughtworks.xstream:xstream:${xstreamVersion}" /* * The HSQL driver jar should always be provided by uPortal-start;