Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop

This commit is contained in:
Mark Payne 2014-12-19 10:03:28 -05:00
parent cbb1746587 732cb7071e
commit ea17562dd3
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml
View File

@ -28,7 +28,7 @@
<profile> <profile>
<id>docs</id> <id>docs</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <jdk>1.7</jdk>
</activation> </activation>
<build> <build>
<resources> <resources>

2
nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
View File

@ -21,7 +21,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>NiFi Documentation</title> <title>NiFi Documentation</title>
<script type="text/javascript" src="../nifi/js/jquery/jquery-1.7.min.js"></script> <script type="text/javascript" src="../nifi/js/jquery/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/application.js"></script> <script type="text/javascript" src="js/application.js"></script>
<link href="css/main.css" rel="stylesheet" type="text/css" /> <link href="css/main.css" rel="stylesheet" type="text/css" />
<link href="css/component-usage.css" rel="stylesheet" type="text/css" /> <link href="css/component-usage.css" rel="stylesheet" type="text/css" />

3
nar-bundles/pom.xml
View File

@ -58,16 +58,19 @@
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>
<artifactId>distributed-cache-client-service-api</artifactId> <artifactId>distributed-cache-client-service-api</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>
<artifactId>ssl-context-service-api</artifactId> <artifactId>ssl-context-service-api</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>
<artifactId>load-distribution-service-api</artifactId> <artifactId>load-distribution-service-api</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>