DATAFU-143 Update build to produce non-incubating artifacts
diff --git a/build.gradle b/build.gradle
index a5a6fa0..4e227b4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,6 +62,7 @@
'gradle/wrapper/**',
'.reviewboardrc',
'gradlew',
+ 'gradlew.bat',
'**/changes.md',
'**/README.md',
'**/.ruby-version',
diff --git a/datafu-hourglass/build.gradle b/datafu-hourglass/build.gradle
index d3819ce..a9fc2ab 100644
--- a/datafu-hourglass/build.gradle
+++ b/datafu-hourglass/build.gradle
@@ -19,8 +19,7 @@
apply plugin: 'java'
-// append "-incubating" while still in the incubating process
-archivesBaseName = 'datafu-hourglass-incubating'
+archivesBaseName = 'datafu-hourglass'
import groovy.xml.MarkupBuilder
@@ -75,13 +74,15 @@
def demoDependenciesDir = new File("$buildDir/demo_dependencies")
-task replace_demo_dependencies_dir() << {
- println "Creating $demoDependenciesDir"
+task replace_demo_dependencies_dir() {
+ doLast {
+ println "Creating $demoDependenciesDir"
- if (demoDependenciesDir.exists()) {
- demoDependenciesDir.deleteDir()
+ if (demoDependenciesDir.exists()) {
+ demoDependenciesDir.deleteDir()
+ }
+ demoDependenciesDir.mkdirs()
}
- demoDependenciesDir.mkdirs()
}
task copyDemoDependencies(type: Copy, dependsOn: replace_demo_dependencies_dir) {
diff --git a/datafu-pig/build.gradle b/datafu-pig/build.gradle
index ce51f69..c0531b0 100644
--- a/datafu-pig/build.gradle
+++ b/datafu-pig/build.gradle
@@ -36,8 +36,7 @@
apply plugin: 'java'
apply plugin: 'gradle-autojar'
-// append "-incubating" while still in the incubating process
-archivesBaseName = 'datafu-pig-incubating'
+archivesBaseName = 'datafu-pig'
import groovy.xml.MarkupBuilder
@@ -213,21 +212,23 @@
}
// open NLP models used for testing. these are not shipped with datafu.
-task downloadOpenNlpModels << {
- download {
- src 'http://opennlp.sourceforge.net/models-1.5/en-pos-maxent.bin'
- dest file('data/en-pos-maxent.bin')
- onlyIfNewer true
- }
- download {
- src 'http://opennlp.sourceforge.net/models-1.5/en-sent.bin'
- dest file('data/en-sent.bin')
- onlyIfNewer true
- }
- download {
- src 'http://opennlp.sourceforge.net/models-1.5/en-token.bin'
- dest file('data/en-token.bin')
- onlyIfNewer true
+task downloadOpenNlpModels {
+ doLast {
+ download {
+ src 'http://opennlp.sourceforge.net/models-1.5/en-pos-maxent.bin'
+ dest file('data/en-pos-maxent.bin')
+ onlyIfNewer true
+ }
+ download {
+ src 'http://opennlp.sourceforge.net/models-1.5/en-sent.bin'
+ dest file('data/en-sent.bin')
+ onlyIfNewer true
+ }
+ download {
+ src 'http://opennlp.sourceforge.net/models-1.5/en-token.bin'
+ dest file('data/en-token.bin')
+ onlyIfNewer true
+ }
}
}
diff --git a/gradle/release.gradle b/gradle/release.gradle
index 35d1712..df32186 100644
--- a/gradle/release.gradle
+++ b/gradle/release.gradle
@@ -63,7 +63,7 @@
description = "Build a source release, specifically excluding the build directories and gradle wrapper files"
compression = Compression.GZIP
- baseName "apache-datafu-incubating-sources-${releaseVersion}"
+ baseName "apache-datafu-sources-${releaseVersion}"
from(project.rootDir) {
// don't include gradle.properties because we use a modified version
@@ -127,14 +127,14 @@
modifyPom {
project {
- name 'Apache DataFu (incubating)'
+ name 'Apache DataFu'
description 'Librares that make easier to solve data problems using Hadoop and higher level languages based on it.'
- url 'http://datafu.incubator.apache.org/'
+ url 'https://datafu.apache.org/'
scm {
- url 'https://git-wip-us.apache.org/repos/asf?p=incubator-datafu.git;a=tree'
- connection 'scm:http://git-wip-us.apache.org/repos/asf/incubator-datafu.git'
- developerConnection 'scm:https://git-wip-us.apache.org/repos/asf/incubator-datafu.git'
+ url 'https://git-wip-us.apache.org/repos/asf?p=datafu.git;a=tree'
+ connection 'scm:http://git-wip-us.apache.org/repos/asf/datafu.git'
+ developerConnection 'scm:https://git-wip-us.apache.org/repos/asf/datafu.git'
}
licenses {
