From 58e50ae39d5565592ae7b8368889209afab86e7c Mon Sep 17 00:00:00 2001
From: Aldrin Piri <aldrin@apache.org>
Date: Sat, 13 Feb 2016 19:00:05 -0500
Subject: [PATCH] NIFI-1511 Incorporating Groovy unit tests as part of the main
 build and providing explicit compile scope on the Groovy dependency for the
 scripting bundle. This closes #220

Signed-off-by: Matt Gilman <matt.c.gilman@gmail.com>
---
 .travis.yml                                   |   2 +-
 .../nifi-scripting-processors/pom.xml         |   1 -
 .../nifi-scripting-bundle/pom.xml             |  11 ++
 pom.xml                                       | 131 ++++++------------
 4 files changed, 57 insertions(+), 88 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7f65703a9a..b5c02d0ed4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,4 +16,4 @@ before_install:
   - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts | sudo tee /etc/hosts
   - sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g' ~/.m2/settings.xml
 
-script: mvn clean install -Pcontrib-check,groovy-unit-test
+script: mvn clean install -Pcontrib-check
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
index 2e7863e37f..0f5247db6e 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
@@ -41,7 +41,6 @@
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
-            <version>2.4.5</version>
         </dependency>
         <dependency>
             <groupId>org.python</groupId>
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/pom.xml b/nifi-nar-bundles/nifi-scripting-bundle/pom.xml
index 139a3590cc..061338acac 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-scripting-bundle/pom.xml
@@ -37,6 +37,17 @@
                 <artifactId>nifi-scripting-processors</artifactId>
                 <version>0.6.0-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-all</artifactId>
+                <version>2.4.5</version>
+                <!--
+                    Groovy is provided, by default, in a 'test' scope for use with unit tests
+                    Explicitly provide this as 'compile' to provide Groovy support in the
+                    scripting processors
+                -->
+                <scope>compile</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/pom.xml b/pom.xml
index 61367f99ae..ac29b01e59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1132,6 +1132,13 @@ language governing permissions and limitations under the License. -->
                 <artifactId>aws-java-sdk</artifactId>
                 <version>1.10.32</version>
             </dependency>
+            <!-- Groovy support is primarily as a test dependency -->
+            <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-all</artifactId>
+                <version>2.4.5</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
@@ -1150,6 +1157,10 @@ language governing permissions and limitations under the License. -->
             <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <pluginManagement>
@@ -1165,6 +1176,12 @@ language governing permissions and limitations under the License. -->
                         <showWarnings>true</showWarnings>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.groovy</groupId>
+                    <artifactId>groovy-eclipse-compiler</artifactId>
+                    <version>2.9.2-01</version>
+                    <extensions>true</extensions>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
@@ -1291,6 +1308,34 @@ language governing permissions and limitations under the License. -->
             </plugins>
         </pluginManagement>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <!-- Only run for tests -->
+                    <execution>
+                        <id>groovy-tests</id>
+                        <phase>test</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <compilerId>groovy-eclipse-compiler</compilerId>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.codehaus.groovy</groupId>
+                        <artifactId>groovy-eclipse-compiler</artifactId>
+                        <version>2.9.2-01</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.codehaus.groovy</groupId>
+                        <artifactId>groovy-eclipse-batch</artifactId>
+                        <version>2.4.3-01</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
             <plugin>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-nar-maven-plugin</artifactId>
@@ -1532,91 +1577,5 @@ language governing permissions and limitations under the License. -->
                 </pluginManagement>
             </build>
         </profile>
-        <profile>
-            <!-- Custom profile for Groovy tests -->
-            <id>groovy-unit-test</id>
-            <activation>
-                <property>
-                    <name>groovy</name>
-                    <value>test</value>
-                </property>
-            </activation>
-
-            <dependencies>
-                <dependency>
-                    <groupId>org.codehaus.groovy</groupId>
-                    <artifactId>groovy-all</artifactId>
-                    <version>2.4.5</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>1.8</version>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/main/groovy</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-test-source</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/groovy</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.2</version>
-                        <configuration>
-                            <compilerId>groovy-eclipse-compiler</compilerId>
-                            <source>1.7</source>
-                            <target>1.7</target>
-                            <includes>
-                                <include>**/*.java</include>
-                                <include>**/*.groovy</include>
-                            </includes>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.codehaus.groovy</groupId>
-                                <artifactId>groovy-eclipse-compiler</artifactId>
-                                <version>2.9.2-01</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.codehaus.groovy</groupId>
-                                <artifactId>groovy-eclipse-batch</artifactId>
-                                <version>2.4.3-01</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.groovy</groupId>
-                        <artifactId>groovy-eclipse-compiler</artifactId>
-                        <version>2.9.2-01</version>
-                        <extensions>true</extensions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>