You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2016/02/26 16:26:42 UTC
nifi git commit: 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
Repository: nifi
Updated Branches:
refs/heads/master 28c2a3e5a -> 58e50ae39
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 <ma...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/58e50ae3
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/58e50ae3
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/58e50ae3
Branch: refs/heads/master
Commit: 58e50ae39d5565592ae7b8368889209afab86e7c
Parents: 28c2a3e
Author: Aldrin Piri <al...@apache.org>
Authored: Sat Feb 13 19:00:05 2016 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Feb 26 10:25:45 2016 -0500
----------------------------------------------------------------------
.travis.yml | 2 +-
.../nifi-scripting-processors/pom.xml | 1 -
nifi-nar-bundles/nifi-scripting-bundle/pom.xml | 11 ++
pom.xml | 131 +++++++------------
4 files changed, 57 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/58e50ae3/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 7f65703..b5c02d0 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
http://git-wip-us.apache.org/repos/asf/nifi/blob/58e50ae3/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
----------------------------------------------------------------------
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 2e7863e..0f5247d 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>
http://git-wip-us.apache.org/repos/asf/nifi/blob/58e50ae3/nifi-nar-bundles/nifi-scripting-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/pom.xml b/nifi-nar-bundles/nifi-scripting-bundle/pom.xml
index 139a359..061338a 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>
http://git-wip-us.apache.org/repos/asf/nifi/blob/58e50ae3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 61367f9..ac29b01 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>
@@ -1166,6 +1177,12 @@ language governing permissions and limitations under the License. -->
</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>
<version>2.5</version>
@@ -1292,6 +1309,34 @@ language governing permissions and limitations under the License. -->
</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>
<version>1.1.0</version>
@@ -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>