-
Notifications
You must be signed in to change notification settings - Fork 273
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* AnalyticsEvent capture additional data, support query * delete extra files * update query for event_type * fix serialization error for to event properties * perform endpoint authentication * remove ipaddress from AnalyticsPortalEvent * build.gradle changes compile to implementation started * added java-library plugin, replaced some compile with api * additional conversion from compile to implementation or api * more updates from compile to implementation and api * additional migration from compile to implementation and api * migrated remaining compile to implementation and api * replace deprecated runtime with runtimeOnly * resolve merge conflicts Co-authored-by: Michael Gillian <[email protected]> Co-authored-by: Benito Gonzalez <[email protected]>
- Loading branch information
3 people
authored
Jan 15, 2023
1 parent
fc0b8ef
commit b542fce
Showing
46 changed files
with
306 additions
and
305 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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}" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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') | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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}" | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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') | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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}" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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}" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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}" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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}" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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}" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| description = "Apereo uPortal Health Check" | ||
|
|
||
| dependencies { | ||
| compile project(':uPortal-spring') | ||
| implementation project(':uPortal-spring') | ||
|
|
||
| compileOnly "${servletApiDependency}" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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}" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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}" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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}" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.