Merge pull request #342 from akhikhl/develop

release 1.4.2

README.md

@@ -2,8 +2,8 @@
 
 [![Build Status](http://img.shields.io/travis/akhikhl/gretty.svg)](https://travis-ci.org/akhikhl/gretty)
 ![Maintenance Status](http://img.shields.io/maintenance/yes/2017.svg)
-[![Latest release](http://img.shields.io/badge/release-1.4.1-47b31f.svg)](https://github.com/akhikhl/gretty/tags/v1.4.1)
-[![Snapshot](http://img.shields.io/badge/current-1.4.2--SNAPSHOT-47b31f.svg)](https://github.com/akhikhl/gretty/tree/master)
+[![Latest release](http://img.shields.io/badge/release-1.4.2-47b31f.svg)](https://github.com/akhikhl/gretty/tags/v1.4.2)
+[![Snapshot](http://img.shields.io/badge/current-1.4.3--SNAPSHOT-47b31f.svg)](https://github.com/akhikhl/gretty/tree/master)
 [![License](http://img.shields.io/badge/license-MIT-47b31f.svg)](#copyright-and-license)
 
 Gretty is a feature-rich gradle plugin for running web-apps on embedded servlet containers.
@@ -20,15 +20,13 @@ If you are new with Gretty, try [getting started](http://akhikhl.github.io/grett
 
 #### :star: What's new
 
-Feb 1, 2017, Gretty 1.4.1 is out immediately available at [Bintray](https://bintray.com/akhikhl/maven/gretty/view) and [Maven Central](http://search.maven.org/#search|ga|1|g%3A%22org.akhikhl.gretty%22).
+March 13, 2017, Gretty 1.4.2 is out and immediately available at [Bintray](https://bintray.com/akhikhl/maven/gretty/view) and [Maven Central](http://search.maven.org/#search|ga|1|g%3A%22org.akhikhl.gretty%22).
 
-Changes in this version:
+* Changes in this version:
 
-* The most significant change is compatibility with Gradle 3.3.
+* Compatibility with Gradle 3.4.1
 
-* Pull Requests #198, #205, #266, #293, #297 and #312 were merged into master.
-
-* Issues #296, #300, #307, #317, #320, #322, #323 were resolved.
+* Issues #326, #329 were resolved.
 
 See also: [complete list of changes](changes.md) for more information.
 

build.gradle

@@ -31,14 +31,14 @@ import org._10ne.gradle.rest.RestPlugin
 import org._10ne.gradle.rest.RestTask
 import groovyx.net.http.ContentType
 
-apply plugin: 'base' // import clean task
-apply plugin: 'maven-publish'
+plugins {
+  id 'base'
+  id 'maven-publish'
+}
+
 apply plugin: 'com.jfrog.artifactory'
 apply plugin: RestPlugin
 
-ext {
-}
-
 ext {
   project_website = "https://github.com/${developerId}/${projectId}"
   project_scm = "scm:[email protected]:${developerId}/${projectId}.git"

changes.md

@@ -2,6 +2,14 @@
 
 [![logo](http://akhikhl.github.io/gretty-doc/images/gretty_logo.png "gretty logo")](https://github.com/akhikhl/gretty)
 
+### Version 1.4.2
+
+* Now Gretty is compatible with Gradle versions from 2.14.1 to 3.4.1
+
+* resolved issue #326: Gradle 3.3 compatibility work breaks earlier versions of Gradle
+
+* resolved issue #329: Cannot call TaskInputs.property(String, Object) on task ':jettyStart' after task has started execution
+
 ### Version 1.4.1
 
 * The most significant change is compatibility with Gradle 3.3.

common.gradle

@@ -139,7 +139,7 @@ tasks.bintrayUpload.dependsOn assemble
 
 if(!bintrayDryRun) {
   tasks.bintrayUpload.finalizedBy rootProject.tasks.bintraySign
-  rootProject.tasks.bintraySign.onlyIf { !tasks.bintrayUpload.getStatus().getFailure() }
+  rootProject.tasks.bintraySign.onlyIf { !tasks.bintrayUpload.getState().getFailure() }
 }
 
 } // afterEvaluate

gradle.properties

@@ -1,12 +1,12 @@
 rootProjectName = gretty-root
 projectId=gretty
-description=Advanced gradle plugin for running web-apps on jetty
+description=Advanced gradle plugin for running web-apps on jetty and tomcat
 projectLabels=gretty,jetty,gradle,plugin,spring,spring-boot
 developerId=akhikhl
 developerName=Andrey Hihlovskiy
 license=The MIT License
 group=org.akhikhl.gretty
-version=1.4.2-SNAPSHOT
+version=1.4.2
 jetty7_version=7.6.16.v20140903
 jetty7_servlet_api_version=2.5
 # Cannot upgrade to Jetty 8.1.15 or newer until issue #159 is resolved.

libs/gretty/build.gradle

@@ -1,3 +1,7 @@
+plugins {
+  id 'com.gradle.plugin-publish' version '0.9.7'
+}
+
 apply from: rootProject.file('common.gradle')
 
 dependencies {
@@ -12,3 +16,17 @@ dependencies {
   compile "org.eclipse.jetty:jetty-util:$jetty8_version"
   compile gradleApi()
 }
+
+pluginBundle {
+  website = 'http://akhikhl.github.io/gretty-doc/'
+  vcsUrl = 'https://github.com/akhikhl/gretty'
+  description = 'Advanced gradle plugin for running web-apps on jetty and tomcat.'
+
+  plugins {
+    gretty {
+      id = 'org.akhikhl.gretty'
+      displayName = 'Gretty plugin'
+      tags = [ 'gretty', 'jetty', 'gradle', 'plugin', 'spring', 'spring-boot' ]
+    }
+  }
+}