Move dev back to main

Update copyright as well. Fixes #24
iamthechad · Apr 30, 2018 · 0452301 · 0452301
1 parent c9e1e53
commit 0452301
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 22 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -20,10 +20,9 @@ Some invaluable guides regarding contributions:
 
 ## When Submitting
 
-* Be sure to submit pull requests against the appropriate branch. **Do not submit requests against `master`. They will be rejected.**
 * Follow good practices for Git commit messages (See http://chris.beams.io/posts/git-commit/ for tips on writing good commit messages.)
     * Use the present tense ("Add feature" not "Added feature")
     * Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
     * Limit the first line to 72 characters or less
     * Make sure that commits have descriptive text that clearly explains the change 
-* Reference appropriate issues or pull requests if needed. (Use `refs XXX` instead of `fixes XXX` or `closes XXX`)
+* Reference appropriate issues or pull requests if needed.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,5 +1,5 @@
 /**
- * Copyright 2010-2017 Megatome Technologies
+ * Copyright 2010-2018 Megatome Technologies
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![Download](https://api.bintray.com/packages/iamthechad/plugins/recaptcha/images/download.svg?version=3.1.0) ](https://bintray.com/iamthechad/plugins/recaptcha/3.1.0/link)
-[![Build Status](https://travis-ci.org/iamthechad/grails3-recaptcha.svg?branch=v3.x)](https://travis-ci.org/iamthechad/grails3-recaptcha)
-[![Coverage Status](https://coveralls.io/repos/iamthechad/grails3-recaptcha/badge.svg?branch=v3.x&service=github)](https://coveralls.io/github/iamthechad/grails3-recaptcha?branch=v3.x)
+[![Build Status](https://travis-ci.org/iamthechad/grails3-recaptcha.svg)](https://travis-ci.org/iamthechad/grails3-recaptcha)
+[![Coverage Status](https://coveralls.io/repos/iamthechad/grails3-recaptcha/badge.svg?service=github)](https://coveralls.io/github/iamthechad/grails3-recaptcha)
 [![Stories in Ready](https://badge.waffle.io/iamthechad/grails3-recaptcha.png?label=ready&title=Ready)](http://waffle.io/iamthechad/grails3-recaptcha)
 [![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
 [![Badges](http://img.shields.io/:badges-6/6-ff6799.svg)](https://github.com/badges/badgerbadgerbadger)

diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ plugins {
     id 'com.jfrog.artifactory' version '4.4.0'
 }
 
-version "3.X"
+version "3.2.0-SNAPSHOT"
 group "org.grails.plugins"
 
 apply plugin: 'eclipse'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jan 20 09:37:50 MST 2017
+#Sun Apr 29 19:52:42 MDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip
diff --git a/grails-app/services/com/megatome/grails/RecaptchaService.groovy b/grails-app/services/com/megatome/grails/RecaptchaService.groovy
@@ -6,7 +6,7 @@ import com.megatome.grails.util.ConfigHelper
 import grails.util.Environment
 
 /**
- * Copyright 2010-2017 Megatome Technologies
+ * Copyright 2010-2018 Megatome Technologies
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/grails-app/taglib/com/megatome/grails/RecaptchaTagLib.groovy b/grails-app/taglib/com/megatome/grails/RecaptchaTagLib.groovy
@@ -1,7 +1,7 @@
 package com.megatome.grails
 
 /**
- * Copyright 2010-2017 Megatome Technologies
+ * Copyright 2010-2018 Megatome Technologies
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/groovy/com/megatome/grails/recaptcha/ReCaptcha.groovy b/src/main/groovy/com/megatome/grails/recaptcha/ReCaptcha.groovy
@@ -5,7 +5,7 @@ import com.megatome.grails.recaptcha.net.Post
 import com.megatome.grails.recaptcha.net.QueryParams
 
 /**
- * Copyright 2010-2017 Megatome Technologies
+ * Copyright 2010-2018 Megatome Technologies
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/groovy/com/megatome/grails/recaptcha/net/AuthenticatorProxy.groovy b/src/main/groovy/com/megatome/grails/recaptcha/net/AuthenticatorProxy.groovy
@@ -3,7 +3,7 @@ package com.megatome.grails.recaptcha.net
 import static java.net.Authenticator.RequestorType.PROXY
 
 /**
- * Copyright 2010-2017 Megatome Technologies
+ * Copyright 2010-2018 Megatome Technologies
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/groovy/com/megatome/grails/recaptcha/net/Post.groovy b/src/main/groovy/com/megatome/grails/recaptcha/net/Post.groovy
@@ -4,7 +4,7 @@ import grails.plugins.rest.client.RestBuilder
 import org.apache.commons.logging.LogFactory
 
 /**
- * Copyright 2010-2017 Megatome Technologies
+ * Copyright 2010-2018 Megatome Technologies
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/groovy/com/megatome/grails/recaptcha/net/QueryParams.groovy b/src/main/groovy/com/megatome/grails/recaptcha/net/QueryParams.groovy
@@ -1,7 +1,7 @@
 package com.megatome.grails.recaptcha.net
 
 /**
- * Copyright 2010-2017 Megatome Technologies
+ * Copyright 2010-2018 Megatome Technologies
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/groovy/com/megatome/grails/util/ConfigHelper.groovy b/src/main/groovy/com/megatome/grails/util/ConfigHelper.groovy
@@ -1,7 +1,7 @@
 package com.megatome.grails.util
 
 /**
- * Copyright 2010-2017 Megatome Technologies
+ * Copyright 2010-2018 Megatome Technologies
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/groovy/com/megatome/grails/RecaptchaServiceTests.groovy b/src/test/groovy/com/megatome/grails/RecaptchaServiceTests.groovy
@@ -1,7 +1,7 @@
 package com.megatome.grails
 
 /**
- * Copyright 2010-2017 Megatome Technologies
+ * Copyright 2010-2018 Megatome Technologies
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/groovy/com/megatome/grails/RecaptchaTagLibTests.groovy b/src/test/groovy/com/megatome/grails/RecaptchaTagLibTests.groovy
@@ -1,7 +1,7 @@
 package com.megatome.grails
 
 /**
- * Copyright 2010-2017 Megatome Technologies
+ * Copyright 2010-2018 Megatome Technologies
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/groovy/com/megatome/grails/recaptcha/ReCaptchaTests.groovy b/src/test/groovy/com/megatome/grails/recaptcha/ReCaptchaTests.groovy
@@ -7,7 +7,7 @@ import groovy.mock.interceptor.StubFor
 import spock.lang.Specification
 
 /**
- * Copyright 2010-2017 Megatome Technologies
+ * Copyright 2010-2018 Megatome Technologies
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/groovy/com/megatome/grails/recaptcha/net/AuthenticatorProxyTests.groovy b/src/test/groovy/com/megatome/grails/recaptcha/net/AuthenticatorProxyTests.groovy
@@ -3,7 +3,7 @@ package com.megatome.grails.recaptcha.net
 import spock.lang.Specification
 
 /**
- * Copyright 2010-2017 Megatome Technologies
+ * Copyright 2010-2018 Megatome Technologies
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/groovy/com/megatome/grails/recaptcha/net/PostTests.groovy b/src/test/groovy/com/megatome/grails/recaptcha/net/PostTests.groovy
@@ -9,7 +9,7 @@ import org.springframework.test.web.client.response.MockRestResponseCreators
 import spock.lang.Specification
 
 /**
- * Copyright 2010-2017 Megatome Technologies
+ * Copyright 2010-2018 Megatome Technologies
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/groovy/com/megatome/grails/recaptcha/net/QueryParamsTests.groovy b/src/test/groovy/com/megatome/grails/recaptcha/net/QueryParamsTests.groovy
@@ -3,7 +3,7 @@ package com.megatome.grails.recaptcha.net
 import spock.lang.Specification
 
 /**
- * Copyright 2010-2017 Megatome Technologies
+ * Copyright 2010-2018 Megatome Technologies
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/groovy/com/megatome/grails/util/ConfigHelperTests.groovy b/src/test/groovy/com/megatome/grails/util/ConfigHelperTests.groovy
@@ -1,7 +1,7 @@
 package com.megatome.grails.util
 
 /**
- * Copyright 2010-2017 Megatome Technologies
+ * Copyright 2010-2018 Megatome Technologies
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.