Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,10 @@ class SbomPlugin implements Plugin<Project> {
// Bouncy Castle Licence is the MIT license (https://www.bouncycastle.org/licence.html); pulled in transitively by the CAS client
'pkg:maven/org.bouncycastle/bcpkix-jdk15on@1.70?type=jar' : 'MIT',
'pkg:maven/org.bouncycastle/bcprov-jdk15on@1.70?type=jar' : 'MIT',
'pkg:maven/org.bouncycastle/bcutil-jdk15on@1.70?type=jar' : 'MIT'
'pkg:maven/org.bouncycastle/bcutil-jdk15on@1.70?type=jar' : 'MIT',
// jQuery UI is MIT licensed (https://jquery.org/license/); the webjars POM reports NOASSERTION
'pkg:maven/org.webjars/jquery-ui@1.14.2?type=jar' : 'MIT',
'pkg:maven/org.webjars/jquery-ui-themes@1.14.2?type=jar' : 'MIT'
]

// we don't distribute these so these licenses are considered acceptable, but we still prefer ASF licenses.
Expand Down
4 changes: 4 additions & 0 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ ext {

bomDependencyVersions = [
'asset-pipeline-bom.version' : '5.0.34',
// A transitive dependency resolves biz.aQute.bnd.annotation to 7.1.0, newer than the BOM
// previously managed (7.0.0); pin it here so the BOM stays authoritative.
'bnd-annotation.version' : '7.1.0',
'cas-client-core.version' : '4.0.4',
'bootstrap-icons.version' : '1.13.1',
'bootstrap.version' : '5.3.8',
Expand Down Expand Up @@ -125,6 +128,7 @@ ext {

// Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly
bomDependencies = [
'bnd-annotation' : "biz.aQute.bnd:biz.aQute.bnd.annotation:${bomDependencyVersions['bnd-annotation.version']}",
'bootstrap' : "org.webjars.npm:bootstrap:${bomDependencyVersions['bootstrap.version']}",
'bootstrap-icons' : "org.webjars.npm:bootstrap-icons:${bomDependencyVersions['bootstrap-icons.version']}",
'cas-client-core' : "org.apereo.cas.client:cas-client-core:${bomDependencyVersions['cas-client-core.version']}",
Expand Down
6 changes: 3 additions & 3 deletions grails-spring-security/ui/plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ dependencies {

// 3rd party client-side assets bundled in webjars
implementation 'org.webjars:datatables:1.10.25'
implementation 'org.webjars:jquery:2.1.4'
implementation 'org.webjars:jquery:3.7.1'
implementation 'org.webjars:jquery-form:3.51'
implementation 'org.webjars:jquery-ui:1.10.3'
implementation 'org.webjars:jquery-ui-themes:1.10.3'
implementation 'org.webjars:jquery-ui:1.14.2'
implementation 'org.webjars:jquery-ui-themes:1.14.2'
implementation 'org.webjars.bower:bgiframe:3.0.1'
implementation 'org.webjars.bower:jgrowl:1.4.6'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
* under the License.
*/

//= require webjars/jquery/2.1.4/jquery.min.js
//= require webjars/jquery-ui/1.10.3/ui/minified/jquery-ui.min.js
//= require webjars/jquery/3.7.1/jquery.min.js
//= require webjars/jquery-ui/1.14.2/jquery-ui.min.js
//= require webjars/jgrowl/1.4.6/jquery.jgrowl.min.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
* under the License.
*/

//= require webjars/jquery/2.1.4/jquery.min.js
//= require webjars/jquery-ui/1.10.3/ui/minified/jquery-ui.min.js
//= require webjars/jquery/3.7.1/jquery.min.js
//= require webjars/jquery-ui/1.14.2/jquery-ui.min.js
//= require webjars/jgrowl/1.4.6/jquery.jgrowl.min.js
//= require jquery/jquery.positionBy.js
//= require webjars/bgiframe/3.0.1/jquery.bgiframe.js
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
*/

/*
*= require webjars/jquery-ui-themes/1.10.3/smoothness/jquery-ui
*= require webjars/jquery-ui-themes/1.14.2/base/jquery-ui
*/
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

/*
*= require reset
*= require webjars/jquery-ui-themes/1.10.3/smoothness/jquery-ui
*= require webjars/jquery-ui-themes/1.14.2/base/jquery-ui
*= require jquery.jdMenu
*= require jquery.jdMenu.slate
*= require webjars/jgrowl/1.4.6/jquery.jgrowl
Expand Down
Loading