Make gradle and plugin files line up with default version from Grails…

… 3.1.5.

README.md

@@ -1,6 +1,5 @@
-[![Build Status](https://travis-ci.org/olliefreeman/grails-rabbitmq-native.svg?branch=grails-3.1.x)](https://travis-ci
-.org/olliefreeman/grails-rabbitmq-native)
+[![Build Status](https://travis-ci.org/budjb/grails-rabbitmq-native.svg?branch=grails-3.x)](https://travis-ci.org/budjb/grails-rabbitmq-native)
 
 RabbitMQ Native plugin for Grails
 ---------------------------------
-See the documentation at http:https://budjb.github.io/grails-rabbitmq-native/doc/manual/index.html.
+See the documentation at http:https://budjb.github.io/grails-rabbitmq-native/3.x/latest/.

build.gradle

@@ -8,27 +8,25 @@ buildscript {
  }
  dependencies {
  classpath "org.grails:grails-gradle-plugin:$grailsVersion"
- classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
  }
 }
 
-version "3.2.4"
+version "3.1.3"
 group "org.grails.plugins"
 
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply plugin: "org.grails.grails-plugin"
-//apply plugin: "org.grails.grails-plugin-publish"
-apply plugin: 'maven'
-apply plugin: 'com.jfrog.bintray'
+apply plugin: "org.grails.grails-plugin-publish"
+apply plugin:"org.grails.grails-gsp"
 
 ext {
  grailsVersion = project.grailsVersion
  gradleWrapperVersion = project.gradleWrapperVersion
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
 
 repositories {
  mavenLocal()
@@ -43,96 +41,40 @@ dependencyManagement {
 }
 
 dependencies {
-
- // Grails Plugin Deps
  compile "org.springframework.boot:spring-boot-starter-logging"
  compile "org.springframework.boot:spring-boot-autoconfigure"
  compile "org.grails:grails-core"
+ compile "org.springframework.boot:spring-boot-starter-actuator"
+ compile "org.springframework.boot:spring-boot-starter-tomcat"
+ compile "org.grails:grails-dependencies"
+ compile "org.grails:grails-web-boot"
+ compile "org.grails.plugins:cache"
+ compile "org.grails.plugins:scaffolding"
  console "org.grails:grails-console"
- profile "org.grails.profiles:plugin:$grailsVersion"
+ profile "org.grails.profiles:web-plugin:3.1.5"
  provided "org.grails:grails-plugin-services"
  provided "org.grails:grails-plugin-domain-class"
  testCompile "org.grails:grails-plugin-testing"
+ testCompile "org.grails.plugins:geb"
+ testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1"
+ testRuntime "net.sourceforge.htmlunit:htmlunit:2.18"
 
- // Extra grails deps
- compile "org.springframework.boot:spring-boot-starter-actuator"
- compile "org.springframework.boot:spring-boot-starter-tomcat"
- compile "org.grails:grails-web-mvc"
-
- // Extra plugin deps
- compile 'org.codehaus.groovy:groovy-all:2.4.6'
- compile "commons-lang:commons-lang:2.0"
  compile 'com.rabbitmq:amqp-client:3.6.1'
- provided 'javax.servlet:javax.servlet-api:3.1.0'
 }
 
 task wrapper(type: Wrapper) {
  gradleVersion = gradleWrapperVersion
 }
 
-bintray {
- user = System.getenv('BINTRAY_USER')
- key = System.getenv('BINTRAY_KEY')
- pkg {
- repo = 'maven'
- name = project.name
- userOrg = 'olliefreeman'
- licenses = ['Apache-2.0']
- websiteUrl = 'https://github.com/olliefreeman/grails-rabbitmq-native'
- vcsUrl = 'https://github.com/olliefreeman/grails-rabbitmq-native.git'
- githubRepo = 'olliefreeman/grails-rabbitmq-native'
- githubReleaseNotesFile = 'README.md'
- version {
- name = project.version
- desc = "Grails RabbitMq Native Plugin For Grails 3.1.x - ${project.name} ${project.version}"
- released = new Date()
- vcsTag = "v${project.version}-rabbitmq-native3"
- }
- }
- configurations = ['archives']
- dryRun = false //Whether to run this as dry-run, without deploying
- publish = true //If version should be auto published after an upload
-}
-//
-//grailsPublish {
-// // TODO: Provide values here
-// user = 'user'
-// key = 'key'
-// githubSlug = 'foo/bar'
-// license {
-// name = 'Apache-2.0'
-// }
-// title = "My Plugin"
-// desc = "Full plugin description"
-// developers = [johndoe:"John Doe"]
-// portalUser = ""
-// portalPassword = ""
-//}
-
-List excludedFiles = [
- "**/application.groovy",
- "**/com/budjb/rabbitmq/test/**"
-]
-
-jar {
- excludedFiles.each {
- exclude it
+// TODO: fill all this in
+grailsPublish {
+ githubSlug = 'budjb/grails-rabbitmq-native'
+ license {
+ name = 'Apache-2.0'
  }
-}
-
-sourcesJar {
- excludedFiles.each {
- exclude it
- }
-}
-
-javadocJar {
- excludedFiles.each {
- exclude it
- }
-}
-
-artifacts {
- archives sourcesJar
- archives javadocJar
+ title = "My Plugin"
+ desc = "Full plugin description"
+ developers = [johndoe:"John Doe"]
+ portalUser = ""
+ portalPassword = ""
 }

gradle.properties

@@ -1,3 +1,2 @@
 grailsVersion=3.1.5
-gradleWrapperVersion=2.11
-org.gradle.daemon=true
+gradleWrapperVersion=2.9

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Feb 15 16:59:18 GMT 2016
+#Mon Apr 18 10:32:44 CDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-2.11-bin.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-2.11-all.zip

grails-app/conf/application.yml

@@ -1,20 +1,13 @@
 ---
 grails:
  profile: plugin
- codegen:
- defaultPackage: com.budjb.rabbitmq
- spring:
- transactionManagement:
- proxies: false
+
 info:
  app:
  name: '@info.app.name@'
  version: '@info.app.version@'
  grailsVersion: '@info.app.grailsVersion@'
-spring:
- groovy:
- template:
- check-template-location: false
+
 ---
 rabbitmq:
  connections:

settings.gradle

@@ -1,2 +1,2 @@
-rootProject.name = 'rabbitmq-native3'
+rootProject.name = 'rabbitmq-native'