Release: 0.5.1

using gradle 2.12 compileOnly
xmlking · Mar 16, 2016 · 9dcfeb4 · 9dcfeb4
1 parent 1156ebf
commit 9dcfeb4
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 36 deletions.
diff --git a/build.gradle b/build.gradle
@@ -27,28 +27,14 @@ allprojects {
         mavenCentral()
         mavenLocal()
     }
-
-    // to add provided scope
-    configurations {
-        provided
-        testCompile.extendsFrom(provided)
-    }
-    sourceSets {
-        main {
-            compileClasspath += configurations.provided
-        }
-    }
 }
 
 def narProjects = subprojects - project(':nifi-sumo-common')
-def narLangProjects = project(':nifi-lang-groovy')
-def narProcessorProjects = narProjects - narLangProjects
 
 configure(narProjects) {
+
     apply plugin: 'de.fanero.gradle.plugin.nar'
-}
 
-configure(narProcessorProjects) {
     dependencies {
         compile project(':nifi-sumo-common')
         compile "org.apache.nifi:nifi-api:${nifiVersion}"

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=0.4.1-SNAPSHOT
-nifiVersion=0.4.1
+version=0.5.1-SNAPSHOT
+nifiVersion=0.5.1
 groovyVersion=2.4.5
-gradleWrapperVersion=2.9
+gradleWrapperVersion=2.12
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Dec 20 14:46:41 PST 2015
+#Tue Mar 15 18:19:40 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
diff --git a/gradlew.bat b/gradlew.bat
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args

diff --git a/nifi-execute-groovy-processors/build.gradle b/nifi-execute-groovy-processors/build.gradle
@@ -3,7 +3,9 @@ description = 'NiFi Groovy Script Executor Processor'
 apply plugin: 'groovy'
 
 dependencies {
-    provided project(':nifi-lang-groovy')
+    compileOnly "org.codehaus.groovy:groovy-all:${groovyVersion}"
+//    compile "org.codehaus.groovy:groovy-all:${groovyVersion}"
+
+    nar "org.apache.nifi:nifi-scripting-bundle:${nifiVersion}"
 
-    nar "org.apache.nifi:nifi-lang-groovy:${version}"
 }
diff --git a/nifi-execute-ldap-processors/build.gradle b/nifi-execute-ldap-processors/build.gradle
@@ -3,12 +3,11 @@ description = 'NiFi Execute LDAP Script Processor'
 apply plugin: 'groovy'
 
 dependencies {
-    provided project(':nifi-lang-groovy')
+    compileOnly "org.codehaus.groovy:groovy-all:${groovyVersion}"
 
 //    compile "org.apache.directory:groovyldap:latest.integration"
 //    compile "org.apache.directory.api:api-all:1.0.0-M32"
     compile fileTree(dir: 'lib', include: '*.jar')
 
-
-    nar "org.apache.nifi:nifi-lang-groovy:${version}"
+    nar "org.apache.nifi:nifi-scripting-bundle:${nifiVersion}"
 }
diff --git a/nifi-execute-ldap-processors/src/test/resources/TestScript1.groovy b/nifi-execute-ldap-processors/src/test/resources/TestScript1.groovy
@@ -7,6 +7,8 @@ params.base = 'ou=sumo,ou=demo,dc=cc,dc=com'
 params.scope = ldap.ONE
 params.filter = '(objectclass=*)'
 
+attbs = [:]
+
 ldap.eachEntry (params) { entry ->
     println "${entry.cn}   (${entry.dn})"
     attbs['cn'] = entry.cn

diff --git a/nifi-execute-remote-processors/build.gradle b/nifi-execute-remote-processors/build.gradle
@@ -3,10 +3,11 @@ description = 'NiFi Execute Remote Processor'
 apply plugin: 'groovy'
 
 dependencies {
-    provided project(':nifi-lang-groovy')
+    compileOnly "org.codehaus.groovy:groovy-all:${groovyVersion}"
+
     compile ("org.hidetake:groovy-ssh:1.1.8") {
         exclude(group: 'org.codehaus.groovy', module: 'groovy-all')
     }
 
-    nar "org.apache.nifi:nifi-lang-groovy:${version}"
+    nar "org.apache.nifi:nifi-scripting-bundle:${nifiVersion}"
 }
diff --git a/...cessors/src/test/groovy/com/crossbusiness/nifi/processors/TestExecuteRemoteProcess.groovy b/...cessors/src/test/groovy/com/crossbusiness/nifi/processors/TestExecuteRemoteProcess.groovy
@@ -4,6 +4,7 @@ import org.apache.nifi.util.MockFlowFile
 import org.apache.nifi.util.TestRunner
 import org.apache.nifi.util.TestRunners
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Test
 
 import static org.junit.Assert.assertTrue
@@ -23,6 +24,7 @@ public class TestExecuteRemoteProcess {
         runDsl = this.getClass().getResource( '/runDsl.groovy' ).text
     }
 
+    @Ignore
     @Test
     public void testThing() throws IOException {
 

diff --git a/nifi-lang-groovy/build.gradle b/nifi-lang-groovy/build.gradle
diff --git a/settings.gradle b/settings.gradle
@@ -1,6 +1,5 @@
 rootProject.name = 'nifi-scripting'
 include 'nifi-sumo-common',
-        'nifi-lang-groovy',
         'nifi-execute-groovy-processors',
         'nifi-execute-remote-processors',
         'nifi-execute-ldap-processors',