Updated the copyrights and did the 2.0.3 release

CHANGELOG.md

@@ -1,3 +1,10 @@
+Changes for 2.0.3
+=================
+- Fixed a problem caused by changes in Gradle 6.4 (Issue #70), with thanks to
+  Patrick Haun (@bomgar). 
+
+- Fixed a deprecation warning that started showing up in Gradle 6.0.
+
 Changes for 2.0.2
 =================
 - Fixed the way the plugin handles System properties.  Liquibase will now 

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright 2011-2018 Tim Berglund and Steven C. Saliman
+Copyright 2011-2020 Tim Berglund and Steven C. Saliman
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -2,11 +2,16 @@ Liquibase Gradle Plugin
 -----------------------
 A plugin for [Gradle](http://gradle.org) that allows you to use 
 [Liquibase](http://liquibase.org) to manage your database upgrades.  This 
-project was created by Tim Berglund, and is currently maintained by Steve 
-Saliman.
+project was originally created by Tim Berglund, and is currently maintained by
+Steve Saliman.
 
 News
 ----
+### May 24, 2020
+Release 2.0.3 is a minor release that fixes an issue caused by changes made in
+Gradle 6.4.  These changes were tested with Gradle 5.4, and are backwards 
+compatible at least that far back.
+
 ### November 24, 2019
 Release 2.0.2 of the plugin fixes an issue with some command parameters like the
 `snapshotFormat` parameter of the `snapshot` command, though it should be noted
@@ -168,7 +173,7 @@ build.gradle file:
 
 ```groovy
 plugins {
-  id 'org.liquibase.gradle' version '2.0.2'
+  id 'org.liquibase.gradle' version '2.0.3'
 }
 ```
 
@@ -180,7 +185,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.liquibase:liquibase-gradle-plugin:2.0.2"
+        classpath "org.liquibase:liquibase-gradle-plugin:2.0.3"
     }
 }
 apply plugin: 'org.liquibase.gradle'
@@ -200,7 +205,7 @@ An example of `liquibaseRuntime` entries is below:
 ```groovy
 dependencies {
   liquibaseRuntime 'org.liquibase:liquibase-core:3.8.1'
-  liquibaseRuntime 'org.liquibase:liquibase-groovy-dsl:2.0.1'
+  liquibaseRuntime 'org.liquibase:liquibase-groovy-dsl:2.1.1'
   liquibaseRuntime 'mysql:mysql-connector-java:5.1.34'
 }
 ```

build.gradle

@@ -27,7 +27,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 // Release version that won't conflict with the bintray plugin
-def releaseVersion = '2.0.3-SNAPSHOT'
+def releaseVersion = '2.0.3'
 
 group = 'org.liquibase'
 archivesBaseName = 'liquibase-gradle-plugin'

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

plugin.gradle

@@ -9,7 +9,7 @@ buildscript {
     mavenLocal()
   }
   dependencies {
-    classpath 'org.liquibase:liquibase-gradle-plugin:2.0.2-SNAPSHOT'
+    classpath 'org.liquibase:liquibase-gradle-plugin:2.0.3-SNAPSHOT'
     classpath 'com.h2database:h2:1.3.159'
   }
 }

src/main/groovy/org/liquibase/gradle/Activity.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 Tim Berglund and Steven C. Saliman
+ * Copyright 2011-2020 Tim Berglund and Steven C. Saliman
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,4 +58,4 @@ class Activity {
 		arguments[name] = args[0]
 	}
 
-}
+}

src/main/groovy/org/liquibase/gradle/LiquibaseExtension.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 Tim Berglund and Steven C. Saliman
+ * Copyright 2011-2020 Tim Berglund and Steven C. Saliman
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ class LiquibaseExtension {
 	final NamedDomainObjectContainer<Activity> activities
 
 	/**
-	 * Define the name of the Main class in Liquibase that the plucin should
+	 * Define the name of the Main class in Liquibase that the plugin should
 	 * call to run Liquibase itself.
 	 */
 	def mainClassName = 'liquibase.integration.commandline.Main'

src/main/groovy/org/liquibase/gradle/LiquibasePlugin.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 Tim Berglund and Steven C. Saliman
+ * Copyright 2011-2020 Tim Berglund and Steven C. Saliman
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/groovy/org/liquibase/gradle/LiquibaseTask.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 Tim Berglund and Steven C. Saliman
+ * Copyright 2011-2020 Tim Berglund and Steven C. Saliman
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -135,12 +135,10 @@ class LiquibaseTask extends JavaExec {
 			throw new RuntimeException("No liquibaseRuntime dependencies were defined.  You must at least add Liquibase itself as a liquibaseRuntime dependency.")
 		}
 		setClasspath(classpath)
-//		configureLogging(classpath, project.liquibase.mainClassName)
-//		setSystemProperties(["mainClass": project.liquibase.mainClassName])
-//		setMain("org.liquibase.gradle.LiquibaseRunner")
 		// "inherit" the system properties from the Gradle JVM.
 		systemProperties System.properties
 		println "liquibase-plugin: Running the '${activity.name}' activity..."
+		project.logger.debug("liquibase-plugin: The ${getMain()} class will be used to run Liquibase")
 		project.logger.debug("liquibase-plugin: Running 'liquibase ${args.join(" ")}'")
 		super.exec()
 	}