Repository: nifi-minifi Updated Branches: refs/heads/master c3abec583 -> c1f33d5bb
MINIFI-120 Fixing 'class not found' issues when using the Rest Change Notifier. Also added all the jetty and javax modules that NiFi lists as 'provided' in its pom to the minifi-assembly pom in order to ensure NAR reusability. This closes #42. Signed-off-by: Aldrin Piri <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/c1f33d5b Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/c1f33d5b Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/c1f33d5b Branch: refs/heads/master Commit: c1f33d5bb6fcf5519030f273879de42a2bf631c1 Parents: c3abec5 Author: Joseph Percivall <[email protected]> Authored: Wed Oct 12 17:08:49 2016 -0400 Committer: Aldrin Piri <[email protected]> Committed: Mon Oct 17 15:47:04 2016 -0400 ---------------------------------------------------------------------- minifi-assembly/pom.xml | 59 +++++++++++++++++--- .../src/main/assembly/dependencies.xml | 5 ++ minifi-bootstrap/pom.xml | 4 +- pom.xml | 52 ++++++++++++++++- 4 files changed, 110 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/c1f33d5b/minifi-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/minifi-assembly/pom.xml b/minifi-assembly/pom.xml index af054ee..dbe9849 100644 --- a/minifi-assembly/pom.xml +++ b/minifi-assembly/pom.xml @@ -167,21 +167,64 @@ limitations under the License. <artifactId>nifi-utils</artifactId> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-expression-language</artifactId> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-persistent-provenance-repository</artifactId> </dependency> + + <!-- Provided in NiFi so must include here too --> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> + <artifactId>jetty-servlet</artifactId> + <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-expression-language</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-persistent-provenance-repository</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jsp</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>javax.servlet.jsp-api</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>javax.el-api</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp.jstl</groupId> + <artifactId>javax.servlet.jsp.jstl-api</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.toolchain</groupId> + <artifactId>jetty-jsp-jdt</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <scope>compile</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/c1f33d5b/minifi-assembly/src/main/assembly/dependencies.xml ---------------------------------------------------------------------- diff --git a/minifi-assembly/src/main/assembly/dependencies.xml b/minifi-assembly/src/main/assembly/dependencies.xml index 6a3d33c..551c8af 100644 --- a/minifi-assembly/src/main/assembly/dependencies.xml +++ b/minifi-assembly/src/main/assembly/dependencies.xml @@ -68,6 +68,11 @@ <include>logback-classic</include> <include>nifi-api</include> <include>nifi-utils</include> + <include>jetty-server</include> + <include>jetty-util</include> + <include>jetty-http</include> + <include>jetty-io</include> + <include>javax.servlet-api</include> </includes> </dependencySet> http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/c1f33d5b/minifi-bootstrap/pom.xml ---------------------------------------------------------------------- diff --git a/minifi-bootstrap/pom.xml b/minifi-bootstrap/pom.xml index e3dbd41..433c352 100644 --- a/minifi-bootstrap/pom.xml +++ b/minifi-bootstrap/pom.xml @@ -61,17 +61,19 @@ limitations under the License. <artifactId>minifi-commons-schema</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> <version>${jetty.version}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> <version>${jetty.version}</version> + <scope>compile</scope> </dependency> + <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-standard-prioritizers</artifactId> http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/c1f33d5b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 16cc30c..aebe315 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ limitations under the License. <inceptionYear>2016</inceptionYear> <org.slf4j.version>1.7.12</org.slf4j.version> <org.apache.nifi.version>0.6.1</org.apache.nifi.version> - <jetty.version>9.3.8.v20160314</jetty.version> + <jetty.version>9.2.11.v20150529</jetty.version> </properties> <dependencies> @@ -250,11 +250,61 @@ limitations under the License. <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> <version>${jetty.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> <version>${jetty.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <version>${jetty.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <version>${jetty.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jsp</artifactId> + <version>${jetty.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>javax.servlet.jsp-api</artifactId> + <version>2.3.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>javax.el-api</artifactId> + <version>3.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp.jstl</groupId> + <artifactId>javax.servlet.jsp.jstl-api</artifactId> + <version>1.2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.toolchain</groupId> + <artifactId>jetty-jsp-jdt</artifactId> + <version>2.3.3</version> + <scope>provided</scope> </dependency> <!-- NiFi Modules -->
