Skip to content

Commit

Permalink
Merge branch 'release/3.0.0.RC1'
Browse files Browse the repository at this point in the history
  • Loading branch information
alvarosanchez committed May 10, 2019
2 parents 4ea4d5e + 13eff62 commit 8244976
Show file tree
Hide file tree
Showing 410 changed files with 4,894 additions and 24,978 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.idea/
*.iml
*.ipr
*.iws
.classpath
.project
target/
Expand All @@ -12,7 +14,10 @@ target/
/web-app
grails-app/i18n
.gradle
.gradletasknamecache

#Generated by test script
foo/
/out
build/
/test/apps/jwt/classes
38 changes: 11 additions & 27 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,52 +1,36 @@
language: groovy

sudo: false

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
cache:
directories:
- $HOME/.m2
- $HOME/.gradle
- $HOME/.grails

- "$HOME/.m2"
- "$HOME/.gradle/caches/"
- "$HOME/.gradle/wrapper/"
- "$HOME/.grails"
jdk:
- oraclejdk8

services:
- memcached
- redis-server

install:
- npm install divshot-cli -g

before_install: "./install-sdkman.sh"
install: true
script: "./test-app.sh"

after_success: "./doc.sh"

after_script: "./publish-test-results.sh"

notifications:
webhooks:
urls:
- https://webhooks.gitter.im/e/ab2251f887cfa63260af
on_success: change
on_failure: always
on_start: false

env:
global:
- secure: NDX1oObVIHhG5zUZzhmL8m/601SFB2pE29dci1EcgKrYhdZf+50+Va/b0/7lNzYXnT76CwQmdkbsJmwqBh6+YO+SXcJFE13zudyGfZhLOwY+/oueQB8Up/gk2WbkY4FdIlo0XP/jl+atz4gR9EoAnKCYbdcjYj2lQnJ8ocDpi5U=
- secure: i+HYyyMe2qXPZkP113Vo+uXDzWeiS96dE8EiURxB75HDLuQ1UuIKkfZylNyWXcJHh8gy6ypKffxjZ0FeN44FQeiChE+WC20Xh9UOG076zHogFIE/IooFawau+jcvqJzQU+3koDO9zocu8HfULqenfapSKri/5vMxaPTj85VdFfk=
- secure: XBD/lDc+U/9c6qKKRKuhjxrMe8nIz6T3MtAgPr77bowh0c4EpZiIOQ5+dpUBvA6jL5h8UYck8DAeqC9H7RTG0ZQS+2eJQiEVQXTKfwfe53LQP1CUfAC94o4yNnIpZ9nRikbHKUIqIqla8PXl94TteSpbO9fhb6byFyiGFgGwi34=
- secure: gb4ezV+KeMtpWVKoReJnK/6IEhCvnp+NLo9Q7NrxL7kdBch8zqHmY8ToG/MW8faDEG2JCp4XzIh+0Sh/kzkQY1KurI53M92TNjhXO0BTp/mUiToMhHEEkedZ99p+aCCSHoGzZiwLAOAuvcp7swQ6N75u6smrCBSy/gZVkXSVBnk=
- GIT_NAME="Alvaro Sanchez-Mariscal"
- GIT_EMAIL="alvaro.sanchezmariscal@gmail.com"

before_deploy: ./publish-plugin.sh
before_deploy: "./publish-plugin.sh"
deploy:
provider: releases
skip_cleanup: true
api_key:
secure: QpD/nt7wNuLHntXz2+C0LeD/W1m1F8x84t7KbFjNg+lswa3tfq7CZE4w979JUt0BQKJWR4mKb61ENtJtsVey/gth8tpO65xMLdDZ0+eYJ+oN9lCMfnzNfMOi7NWAixHeKe6bfClvW7xU8LsfY3eMZKiRPJ1SBNJ26b9YtkptTTU=
file: grails-spring-security-rest-${TRAVIS_TAG}.zip
file: spring-security-rest/build/libs/spring-security-rest-${TRAVIS_TAG}.jar
on:
repo: alvarosanchez/grails-spring-security-rest
tags: true
39 changes: 31 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,40 @@
Spring Security REST for Grails
===========================
[![Build Status](https://travis-ci.org/alvarosanchez/grails-spring-security-rest.png?branch=master)](https://travis-ci.org/alvarosanchez/grails-spring-security-rest)
[![Latest Release](http://img.shields.io/github/release/alvarosanchez/grails-spring-security-rest.svg)](https://github.com/alvarosanchez/grails-spring-security-rest/releases)
[![Gitter chat](https://badges.gitter.im/alvarosanchez/spring-security-rest.png)](https://gitter.im/alvarosanchez/spring-security-rest)
[![Build Status](https://travis-ci.org/alvarosanchez/grails-spring-security-rest.png?branch=develop)](https://travis-ci.org/alvarosanchez/grails-spring-security-rest)
[![Latest version](https://api.bintray.com/packages/grails/plugins/spring-security-rest/images/download.svg) ](https://bintray.com/grails/plugins/spring-security-rest/_latestVersion)
[![Known Vulnerabilities](https://snyk.io/test/github/alvarosanchez/grails-spring-security-rest/develop/badge.svg)](https://snyk.io/test/github/alvarosanchez/grails-spring-security-rest)

Grails plugin to implement a stateless, token-based, RESTful authentication using Spring Security.
Grails plugin to implement a stateless, token-based, RESTful authentication
using Spring Security. Sponsored and supported by [Object Computing Inc.](http://www.ociweb.com)

Documentation:

* [User guide](http://alvarosanchez.github.io/grails-spring-security-rest/latest/docs/).
* [Javadoc](http://alvarosanchez.github.io/grails-spring-security-rest/latest/docs/gapi/).

Companies using this plugin
---------------------------

* [CloudCard](http://www.cloudcardtools.com)
* [HealthReveal](http://www.healthreveal.com)
* [Murallo](http://murallo.com)
* [Odobo](http://www.odobo.com)
* [Sharptop Software](http://www.sharptop.co)
* [Zaccak Solutions](http://www.zaccak.com)
* [Lyshnia Limited](https://lyshnia.com)
* [Wiz Panda](https://www.wizpanda.com)

_Are you using this plugin and want to be listed here? [Include your company yourself](https://github.com/alvarosanchez/grails-spring-security-rest/edit/develop/README.md)_.

Support
-------

* For questions and general announcements, you can sign up to [the mailing list](https://groups.google.com/d/forum/spring-security-rest).
* Some users are also active in [the chat room in Gitter](https://gitter.im/alvarosanchez/spring-security-rest).
* General questions should go to the [`#spring-security-rest` channel in Slack](https://grails.slack.com/messages/spring-security-rest).
* You can also find answers at [StackOverflow](http://stackoverflow.com/questions/tagged/grails+spring-security-rest). Label your questions with both the `grails` and `spring-security-rest` tags.
* If you've got issues, report them [here in GitHub](https://github.com/alvarosanchez/grails-spring-security-rest/issues).
* If you need commercial support, you can ask [Salenda](http://www.salenda.es) at [desarrollo AT salenda DOT es](mailto:desarrolloATsalendaDOTes).
* If you need commercial support, you can ask [OCI](http://www.ociweb.com) at [info AT ociweb DOT com](mailto:infoATociwebDOTcom).

**NOTE**: if you have questions or issues, [enable debug logging](http://alvarosanchez.github.io/grails-spring-security-rest/latest/docs/guide/debugging.html),
**NOTE**: if you have questions or issues, [enable debug logging](http://alvarosanchez.github.io/grails-spring-security-rest/latest/docs/index.html#_debugging),
and include the output in your request.


Expand All @@ -35,23 +44,37 @@ Contributors
* [Aaron Eischeid](https://github.com/aeischeid).
* [A.J. Brown](https://github.com/ajbrown).
* [Andrew Wharton](https://github.com/andrew-wharton).
* [André Schmid](https://github.com/andrehschmid).
* [Alonso Torres](https://github.com/Alotor).
* [Bartek Gawel](https://github.com/bgawel).
* [Bob Finch](https://github.com/rbfinch).
* [Bobby Warner](https://github.com/bobbywarner).
* [Burt Beckwith](https://github.com/burtbeckwith).
* [Conall Laverty](https://github.com/conalllaverty).
* [Dennie de Lange](https://github.com/tkvw).
* [Dhiraj Mahapatro](https://github.com/dmahapatro).
* [Donal Murtagh](https://github.com/domurtag).
* [Greg Pagendam-Turner](https://github.com/liftyourgame).
* [James Kleeh](https://github.com/Schlogen).
* [Jonas Ladenfors](https://github.com/jladenfors).
* [Jorge Aguilera](https://github.com/jagedn).
* [Ludovic Ronsin](https://github.com/zeludo).
* [Lukasz Wozniak](https://github.com/stlhrt).
* [Marcos Carceles](https://github.com/marcos-carceles).
* [Michał Lula](https://github.com/michallula).
* [Michal Szulc](https://github.com/majkelo).
* [Nick Larson](https://github.com/nllarson).
* [Philipp Eschenbach](https://github.com/peh).
* [Philippe Gibert](https://github.com/giboow).
* [Polawat Phetra](https://github.com/pphetra).
* [Rafael Vargas](https://github.com/rvargas).
* [Sean Brady](https://github.com/sbrady).
* [Sergey Shatunov](https://github.com/Prototik).
* [Sergio del Amo](https://github.com/sdelamo).
* [Shashank Agrawal](https://github.com/sagrawal31).
* [Svante Rohlin](https://github.com/srohlin).
* [Tomás Crespo](https://github.com/tcrespog).
* [Tony Erskine](https://github.com/tonyerskine).
* [Victor Saar](https://github.com/vsaar).

License
Expand Down
3 changes: 0 additions & 3 deletions application.properties

This file was deleted.

175 changes: 137 additions & 38 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,51 +1,150 @@
buildscript {
ext {
grailsVersion = project.grailsVersion
}
repositories {
mavenLocal()
jcenter()
maven { url "https://repo.grails.org/grails/core" }
}
dependencies {
classpath "org.grails:grails-gradle-plugin:$grailsVersion"
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:latest.release"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
//classpath "io.spring.gradle:dependency-management-plugin:0.6.1.RELEASE"
}
}

plugins {
id "com.github.hierynomus.license" version "0.11.0"
id 'com.github.ben-manes.versions' version '0.17.0'
}

apply plugin:'groovy'

license {

sourceSets {
main {
groovy {
srcDirs = [
'grails-app/controllers',
'grails-app/domain',
'grails-app/services',
'grails-app/taglib',
'grails-app/utils',
'src/groovy',
'scripts'
]
}
java {
srcDirs = [
'src/java'
]
allprojects {
apply plugin:"idea"
}

def pluginProjects = ['spring-security-rest', 'spring-security-rest-memcached', 'spring-security-rest-redis', 'spring-security-rest-grailscache', 'spring-security-rest-gorm']
def profileProjects = ['spring-security-rest-testapp-profile']
def publishedProjects = pluginProjects + profileProjects

subprojects { Project project ->
group "org.grails.plugins"
version "3.0.0.RC1"

ext {
grailsVersion = project.grailsVersion
gradleWrapperVersion = project.gradleWrapperVersion
isSnapshot = version.endsWith('SNAPSHOT')
bintrayUser = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : ''
bintrayKey = project.hasProperty('bintrayKey') ? project.property('bintrayKey') : ''
pluginPortalUser = project.hasProperty('pluginPortalUser') ? project.property('pluginPortalUser') : ''
pluginPortalPassword = project.hasProperty('pluginPortalPassword') ? project.property('pluginPortalPassword') : ''
}

repositories {
mavenLocal()
maven { url "https://repo.grails.org/grails/core" }
}
if (project.name != "spring-security-rest-docs" &&
project.name != "spring-security-rest-testapp-profile" &&
!project.name.startsWith("build") ) {
apply plugin: "org.grails.grails-plugin"
apply plugin: "org.grails.grails-plugin-publish"
apply plugin: "com.jfrog.artifactory"
}

if (project.name in pluginProjects) {

sourceCompatibility = targetCompatibility = 1.8

dependencies {
console "org.grails:grails-console"

compile "org.springframework.boot:spring-boot-starter-logging"
compile "org.springframework.boot:spring-boot-autoconfigure"
compile "org.grails:grails-core"

provided "org.grails:grails-plugin-services"
provided "org.grails:grails-plugin-domain-class"

testCompile "org.grails:grails-gorm-testing-support"
//testCompile "org.grails:grails-plugin-testing"
testCompile "org.grails:grails-web-testing-support"
testCompile('com.athaydes:spock-reports:1.2.13') {
transitive = false
}
}

test {
groovy {
def dirs = [
'test/functional',
'test/integration',
'test/unit'
]
new File('test/apps').eachDir { File app ->
dirs << "test/apps/${app.name}/test/functional"
dirs << "test/apps/${app.name}/test/integration"
dirs << "test/apps/${app.name}/test/unit"
}
testLogging {
exceptionFormat = 'full'
events 'failed', 'standardOut', 'standardError'
}

beforeTest { descriptor -> logger.quiet " -- $descriptor" }
}

artifactoryPublish {
dependsOn sourcesJar, javadocJar
}
}

srcDirs = dirs
if (project.name in profileProjects) {
apply plugin: "org.grails.grails-profile"
apply plugin: "org.grails.grails-profile-publish"
}

if (project.name in publishedProjects && project.name != "spring-security-rest-docs" &&
project.name != "spring-security-rest-testapp-profile") {
grailsPublish {
user = bintrayUser
key = bintrayKey
portalUser = pluginPortalUser
portalPassword = pluginPortalPassword
userOrg = 'grails'
repo = 'plugins'
githubSlug = 'alvarosanchez/grails-spring-security-rest'
license {
name = 'Apache-2.0'
}
title = "Spring Security REST plugin"
desc = "Grails plugin to implement token-based, RESTful authentication using Spring Security"
developers = [
alvarosanchez: "Alvaro Sanchez-Mariscal",
Schlogen: "James Kleeh"
]
}

artifactory {
contextUrl = 'http://oss.jfrog.org'
publish {
repository {
repoKey = isSnapshot ? 'oss-snapshot-local' : 'oss-release-local'
username = bintrayUser
password = bintrayKey
}
defaults {
// Reference to Gradle configurations defined in the build script.
// This is how we tell the Artifactory Plugin which artifacts should be
// published to Artifactory.
publications('maven')
}
}
}
}
}

ext.year = Calendar.instance.get(Calendar.YEAR)
ext.name = 'Alvaro Sanchez-Mariscal'
ext.email = 'alvaro.sanchezmariscal@gmail.com'
task wrapper(type: Wrapper) {
gradleVersion = gradleWrapperVersion
}

licenseMain.dependsOn 'licenseTest'
task aggregateGroovyDoc(type: Groovydoc) {
def groovyDocProjects = subprojects.findAll { it.name in pluginProjects }
group = JavaBasePlugin.DOCUMENTATION_GROUP

dependsOn groovyDocProjects.groovydoc
source groovyDocProjects.groovydoc.source
destinationDir file("${buildDir}/docs/groovydoc")
classpath = files(groovyDocProjects.groovydoc.classpath)
groovyClasspath = files(groovyDocProjects.groovydoc.groovyClasspath)
}
Loading

0 comments on commit 8244976

Please sign in to comment.