From a822dd565b039207ea6a84d3b91a4e66198ececf Mon Sep 17 00:00:00 2001 From: Goran Ehrsson Date: Fri, 14 Nov 2014 09:50:20 +0100 Subject: [PATCH 1/4] Fix for asset pipeline (GPSHIRO-79) --- src/templates/artifacts/filters/SecurityFilters.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/artifacts/filters/SecurityFilters.groovy b/src/templates/artifacts/filters/SecurityFilters.groovy index 64bbf03..c80fc8c 100644 --- a/src/templates/artifacts/filters/SecurityFilters.groovy +++ b/src/templates/artifacts/filters/SecurityFilters.groovy @@ -7,7 +7,7 @@ class @filters.name@ { all(uri: "/**") { before = { // Ignore direct views (e.g. the default main index page). - if (!controllerName) return true + if (!controllerName || controllerName == 'assets') return true // Access control by convention. accessControl() From 811ab27ea606f0bafbf23e65422fc0b88ea8c735 Mon Sep 17 00:00:00 2001 From: Goran Ehrsson Date: Sun, 1 Mar 2015 13:33:35 +0100 Subject: [PATCH 2/4] Added .idea --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4202a57..77978bd 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ test/reports/ work/ /web-app/ grails-shiro*.zip -*.iml \ No newline at end of file +*.iml +.idea \ No newline at end of file From cefa061c2f4b6a210e9825495f881265261039a8 Mon Sep 17 00:00:00 2001 From: Goran Ehrsson Date: Sun, 1 Mar 2015 13:34:15 +0100 Subject: [PATCH 3/4] Changed version to 1.2.2-SNAPSHOT --- ShiroGrailsPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShiroGrailsPlugin.groovy b/ShiroGrailsPlugin.groovy index 7366824..e8487ba 100644 --- a/ShiroGrailsPlugin.groovy +++ b/ShiroGrailsPlugin.groovy @@ -43,7 +43,7 @@ import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreato class ShiroGrailsPlugin { - def version = "1.2.1" + def version = "1.2.2-SNAPSHOT" def grailsVersion = "1.2 > *" def author = "Peter Ledbrook" def authorEmail = "peter@cacoethes.co.uk" From ffa07087fc1b717814982646ef35d96dfd2f3c88 Mon Sep 17 00:00:00 2001 From: Goran Ehrsson Date: Sun, 1 Mar 2015 13:34:44 +0100 Subject: [PATCH 4/4] Upgraded dependencies to work with Grails 2.4.4 --- application.properties | 2 +- grails-app/conf/BuildConfig.groovy | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/application.properties b/application.properties index b0d6bf9..470b143 100644 --- a/application.properties +++ b/application.properties @@ -1,2 +1,2 @@ -app.grails.version=2.2.4 +app.grails.version=2.4.4 app.name=grails-shiro diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy index c9e7fc1..97ccc1f 100644 --- a/grails-app/conf/BuildConfig.groovy +++ b/grails-app/conf/BuildConfig.groovy @@ -1,5 +1,6 @@ grails.project.work.dir = 'target' +grails.project.dependency.resolver = "maven" // or ivy grails.project.dependency.resolution = { inherits 'global' @@ -12,22 +13,22 @@ grails.project.dependency.resolution = { } dependencies { - compile ('org.apache.shiro:shiro-core:1.2.2', - 'org.apache.shiro:shiro-web:1.2.2', - 'org.apache.shiro:shiro-spring:1.2.2', - 'org.apache.shiro:shiro-ehcache:1.2.2', - 'org.apache.shiro:shiro-quartz:1.2.2') { + compile ('org.apache.shiro:shiro-core:1.2.3', + 'org.apache.shiro:shiro-web:1.2.3', + 'org.apache.shiro:shiro-spring:1.2.3', + 'org.apache.shiro:shiro-ehcache:1.2.3', + 'org.apache.shiro:shiro-quartz:1.2.3') { excludes 'ejb', 'jsf-api', 'servlet-api', 'jsp-api', 'jstl', 'jms', 'connector-api', 'ehcache-core', 'slf4j-api', 'commons-logging' } } plugins { - runtime ":hibernate:$grailsVersion", { + runtime ":hibernate4:4.3.6.1", { export = false } - build ':release:2.2.1', ':rest-client-builder:1.0.3', { + build ':release:3.0.1', ':rest-client-builder:1.0.3', { export = false } }