datafu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mha...@apache.org
Subject datafu git commit: DATAFU-143 Update build to produce non-incubating artifacts
Date Mon, 19 Mar 2018 16:51:39 GMT
Repository: datafu
Updated Branches:
  refs/heads/master 16451421b -> 93e9fa50a


DATAFU-143 Update build to produce non-incubating artifacts


Project: http://git-wip-us.apache.org/repos/asf/datafu/repo
Commit: http://git-wip-us.apache.org/repos/asf/datafu/commit/93e9fa50
Tree: http://git-wip-us.apache.org/repos/asf/datafu/tree/93e9fa50
Diff: http://git-wip-us.apache.org/repos/asf/datafu/diff/93e9fa50

Branch: refs/heads/master
Commit: 93e9fa50a053d4f0e09fbbd16584c15d375355b0
Parents: 1645142
Author: Matthew Hayes <mhayes@apache.org>
Authored: Mon Mar 19 09:51:27 2018 -0700
Committer: Matthew Hayes <mhayes@apache.org>
Committed: Mon Mar 19 09:51:27 2018 -0700

----------------------------------------------------------------------
 build.gradle                  |  1 +
 datafu-hourglass/build.gradle | 15 ++++++++-------
 datafu-pig/build.gradle       | 35 ++++++++++++++++++-----------------
 gradle/release.gradle         | 12 ++++++------
 4 files changed, 33 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/datafu/blob/93e9fa50/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index a5a6fa0..4e227b4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,6 +62,7 @@ rat {
     'gradle/wrapper/**',
     '.reviewboardrc',
     'gradlew',
+    'gradlew.bat',
     '**/changes.md',
     '**/README.md',
     '**/.ruby-version',

http://git-wip-us.apache.org/repos/asf/datafu/blob/93e9fa50/datafu-hourglass/build.gradle
----------------------------------------------------------------------
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 @@ task testJar(type: Jar) {
 
 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) {

http://git-wip-us.apache.org/repos/asf/datafu/blob/93e9fa50/datafu-pig/build.gradle
----------------------------------------------------------------------
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 @@ plugins {
 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 @@ compileTestJava.doFirst {
 }
 
 // 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
+    }
   }
 }
 

http://git-wip-us.apache.org/repos/asf/datafu/blob/93e9fa50/gradle/release.gradle
----------------------------------------------------------------------
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 @@ task sourceRelease(type: Tar, dependsOn: prepare_release_config) {
   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 @@ subprojects {
 
   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 {


Mime
View raw message