Skip to content

Fix for asset pipeline (GPSHIRO-79) and Grails 2.4.4 #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
goeh wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix for asset pipeline (GPSHIRO-79) and Grails 2.4.4 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a822dd5
Fix for asset pipeline (GPSHIRO-79)
goeh Nov 14, 2014
811ab27
Added .idea
goeh Mar 1, 2015
cefa061
Changed version to 1.2.2-SNAPSHOT
goeh Mar 1, 2015
ffa0708
Upgraded dependencies to work with Grails 2.4.4
goeh Mar 1, 2015
2b1d5a9
Merge branch 'master' of https://github.com/goeh/grails-shiro
goeh Mar 1, 2015
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ test/reports/
work/
/web-app/
grails-shiro*.zip
*.iml
*.iml
.idea
2 changes: 1 addition & 1 deletion ShiroGrailsPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
app.grails.version=2.2.4
app.grails.version=2.4.4
app.name=grails-shiro
15 changes: 8 additions & 7 deletions grails-app/conf/BuildConfig.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
grails.project.work.dir = 'target'

grails.project.dependency.resolver = "maven" // or ivy
grails.project.dependency.resolution = {

inherits 'global'
Expand All @@ -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
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/templates/artifacts/filters/SecurityFilters.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down