Merge branch 'DATAFU-130'
diff --git a/.gitignore b/.gitignore
index 09885f6..e219be2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@
gradle/wrapper/gradle-wrapper.jar
gradle/wrapper/gradle-wrapper.properties
gradlew*
+.java-version
\ No newline at end of file
diff --git a/changes.md b/changes.md
index 7bad5b1..079691c 100644
--- a/changes.md
+++ b/changes.md
@@ -1,3 +1,19 @@
+# 1.5.0
+
+Additions:
+
+* dedup macro (DATAFU-129)
+* sample_by_keys macro (DATAFU-127)
+
+Improvements:
+
+* Update Ruby gem for site generation (DATAFU-147)
+* Make DataFu compile with Java 8 (DATAFU-132)
+
+Changes:
+
+* Upgrade to Gradle v4.8.1 (DATAFU-146)
+
# 1.4.0
Changes:
diff --git a/gradle.properties b/gradle.properties
index aa953be..4d40c7e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@
# under the License.
group=org.apache.datafu
-version=1.4.0
+version=1.5.0
gradleVersion=4.8.1
org.gradle.jvmargs="-XX:MaxPermSize=512m"
-release=false
\ No newline at end of file
+release=false
diff --git a/gradle/release.gradle b/gradle/release.gradle
index df32186..b24c709 100644
--- a/gradle/release.gradle
+++ b/gradle/release.gradle
@@ -67,10 +67,12 @@
from(project.rootDir) {
// don't include gradle.properties because we use a modified version
+ exclude '.java-version'
exclude "gradle.properties"
- exclude '**/build'
exclude 'build'
+ exclude '**/build'
exclude '.gradle'
+ exclude '**/.gradle'
exclude 'gradlew'
exclude 'gradlew.bat'
exclude 'gradle/wrapper/gradle-wrapper.jar'
