Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: uPortal-Project/uPortal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 01b059e2509c34a504661d4bffb119408bde8045
Choose a base ref
..
head repository: uPortal-Project/uPortal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 66797e905d7a557761d4fdc81f1b19d00f374583
Choose a head ref
Showing with 3,427 additions and 14,271 deletions.
  1. +3 −2 .github/workflows/CI.yml
  2. +1 −1 build.gradle
  3. +15 −14 gradle.properties
  4. +1,871 −13,968 package-lock.json
  5. +15 −6 package.json
  6. +30 −0 uPortal-api/uPortal-api-rest/src/main/java/org/apereo/portal/dao/portletlist/IPortletList.java
  7. +21 −0 uPortal-api/uPortal-api-rest/src/main/java/org/apereo/portal/dao/portletlist/IPortletListDao.java
  8. +20 −0 uPortal-api/uPortal-api-rest/src/main/java/org/apereo/portal/dao/portletlist/IPortletListItem.java
  9. +171 −0 uPortal-api/uPortal-api-rest/src/main/java/org/apereo/portal/dao/portletlist/jpa/PortletList.java
  10. +197 −0 uPortal-api/uPortal-api-rest/src/main/java/org/apereo/portal/dao/portletlist/jpa/PortletListDao.java
  11. +73 −0 ...tal-api/uPortal-api-rest/src/main/java/org/apereo/portal/dao/portletlist/jpa/PortletListItem.java
  12. +516 −0 .../uPortal-api-rest/src/main/java/org/apereo/portal/rest/portletlist/PortletListRESTController.java
  13. +42 −0 uPortal-api/uPortal-api-rest/src/main/java/org/apereo/portal/rest/utils/InputValidator.java
  14. +27 −0 ...pi/uPortal-api-rest/src/main/java/org/apereo/portal/services/portletlist/IPortletListService.java
  15. +80 −0 ...api/uPortal-api-rest/src/main/java/org/apereo/portal/services/portletlist/PortletListService.java
  16. +4 −3 uPortal-api/uPortal-api-search/build.gradle
  17. +1 −0 uPortal-core/build.gradle
  18. +7 −7 uPortal-events/src/main/java/org/apereo/portal/events/AnalyticsPortalEvent.java
  19. +5 −0 uPortal-events/src/main/java/org/apereo/portal/events/PortletExecutionEvent.java
  20. +12 −0 uPortal-events/src/main/java/org/apereo/portal/events/PortletModeJsonConverter.java
  21. +12 −0 uPortal-events/src/main/java/org/apereo/portal/events/WindowStateJsonConverter.java
  22. +33 −1 ...eo/portal/events/analytics/{AnalyticsPortalEventsService.java → AnalyticsPortalEventService.java}
  23. +42 −1 uPortal-events/src/main/java/org/apereo/portal/events/analytics/AnalyticsPortalEventsController.java
  24. +6 −0 uPortal-events/src/main/java/org/apereo/portal/events/analytics/IAnalyticsPortalEventService.java
  25. +8 −0 uPortal-events/src/main/java/org/apereo/portal/events/handlers/db/IPortalEventDao.java
  26. +24 −0 uPortal-events/src/main/java/org/apereo/portal/events/handlers/db/JpaPortalEventStore.java
  27. +4 −3 uPortal-io/uPortal-io-jaxb/build.gradle
  28. +1 −0 ...-security-permissions/src/main/java/org/apereo/portal/permission/target/PermissionTargetImpl.java
  29. +1 −0 uPortal-soffit/uPortal-soffit-core/build.gradle
  30. +19 −1 uPortal-utils/uPortal-utils-core/src/main/java/org/apereo/portal/events/LoginEvent.java
  31. +3 −0 uPortal-webapp/build.gradle
  32. +13 −2 uPortal-webapp/src/main/resources/properties/contexts/servlet/analyticsEventsServletContext.xml
  33. +2 −0 uPortal-webapp/src/main/resources/properties/db/hibernate.cfg.xml
  34. +4 −0 uPortal-webapp/src/main/resources/properties/portal.properties
  35. +23 −23 uPortal-webapp/src/main/webapp/media/skins/respondr/common/common.less
  36. +10 −12 uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/entity-selector.less
  37. +0 −4 uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/fluid_stopgap.less
  38. +12 −21 uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/gallery.less
  39. +7 −6 uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/header.less
  40. +36 −16 uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/jsr-168.less
  41. +17 −70 uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/mixins.less
  42. +10 −72 uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/navigation.less
  43. +2 −0 uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/no-chrome.less
  44. +4 −0 uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/portlet.less
  45. +6 −12 uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/regions.less
  46. +1 −0 uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/search.less
  47. +0 −6 uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/tabs.less
  48. +11 −15 uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/tags.less
  49. +1 −1 uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/variables.less
  50. +3 −3 uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/views.less
  51. +1 −1 uPortal-webapp/src/main/webapp/media/skins/respondr/defaultSkin.less
5 changes: 3 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -21,8 +21,9 @@ jobs:
- zulu
java-version:
- 8
- 11
runs-on: ${{ matrix.platform }}
timeout-minutes: 20
timeout-minutes: 45
steps:
- name: Checkout
uses: actions/checkout@v3
@@ -34,4 +35,4 @@ jobs:
- name: Build and Test
run: ./gradlew -S --no-daemon --no-parallel build jacocoAggregateReport coveralls
- name: Lint JavaScript
run: ./gradlew -S --no-daemon --no-parallel :npm_run_lint-js
run: ./gradlew -S --no-daemon --no-parallel :npm_run_lint-js
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ allprojects {
}

dependencies {
errorprone 'com.google.errorprone:error_prone_core:2.3.3'
errorprone 'com.google.errorprone:error_prone_core:2.3.4'
errorproneJavac "com.google.errorprone:javac:9+181-r4173-1"
}

29 changes: 15 additions & 14 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -39,10 +39,10 @@ portletApiDependency=org.apache.portals:portlet-api_2.1.0_spec:1.0

# Dependency Versions
antVersion=1.10.12
awsVersion=1.12.339
awsVersion=1.12.352
apereoPortletUtilsVersion=1.1.3
aspectjVersion=1.9.7
casClientVersion=3.6.2
aspectjVersion=1.9.9.1
casClientVersion=3.6.4
ccppVersion=1.0
bouncyVersion=1.70
cernunnosVersion=1.4.0
@@ -62,19 +62,20 @@ ehcacheJgroups3ReplicationVersion=1.7.4
ehcacheSpringAnnotationsVersion=1.2.0
googleVisualizationVersion=release-1.1.3
groovyVersion=3.0.13
grouperClientVersion=2.5.56
grouperClientVersion=2.6.18
guavaVersion=31.1-jre
hamcrestVersion=1.3
hibernateVersion=4.2.21.Final
hibernateJpamodelgenVersion=1.3.0.Final
hsqldbVersion=2.5.1
hibernateJpamodelgenVersion=5.6.3.Final
hsqldbVersion=2.7.1
httpclientVersion=4.5.13
httpcomponentsVersion=4.4.15
jacksonVersion=2.13.4
httpcomponentsVersion=4.4.16
jacksonVersion=2.14.1
jansiVersion=1.11
javaxMailVersion=1.4.7
jasyptVersion=1.9.3
jaxb2basicsVersion=1.11.1
jaxbApiVersion=2.3.1
jgroupsVersion=3.6.20.Final
jjwtVersion=0.11.5
jodaTimeVersion=2.12.1
@@ -87,9 +88,9 @@ junitVersion=4.13.2
lesscssVersion=1.7.0.1.1
logbackVersion=1.2.11
lombokVersion=1.18.24
mockitoVersion=4.8.1
luceneVersion=8.9.0
nodejsVersion=16.16.0
mockitoVersion=4.9.0
luceneVersion=8.11.2
nodejsVersion=18.12.1
oauthVersion=20100527
orgJsonVersion=20220924
personDirectoryVersion=1.8.11
@@ -107,14 +108,14 @@ staxmateVersion=2.4.0
stringtemplateVersion=4.3.4
tikaVersion=1.28.5
usertypeVersion=3.1.0.GA
woodstoxVersion=5.3.0
woodstoxVersion=5.4.0
xmlunitVersion=2.9.0
xstreamVersion=1.4.19

# webjar versions
bootstrapVersion=3.4.1
coreJsBundleVersion=3.26.0
regeneratorRuntimeVersion=0.13.10
coreJsBundleVersion=3.26.1
regeneratorRuntimeVersion=0.13.11
jstreeVersion=3.3.12
webComponentPolyfillVersion=2.4.4
whatwgFetchPolyfillVersion=3.6.2
Loading