Repository: nifi-minifi Updated Branches: refs/heads/master 9bc5125f1 -> bf3f7c12f
MINIFI-404: Downloads Windows service binaries on build. This closes #92. 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/bf3f7c12 Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/bf3f7c12 Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/bf3f7c12 Branch: refs/heads/master Commit: bf3f7c12f1c8bf6a1b961ae66960e46d1f858fda Parents: 9bc5125 Author: jzonthemtn <[email protected]> Authored: Fri Oct 6 08:33:08 2017 -0400 Committer: Aldrin Piri <[email protected]> Committed: Fri Oct 6 13:36:49 2017 -0400 ---------------------------------------------------------------------- .gitignore | 1 + .../minifi-framework/minifi-resources/pom.xml | 52 +++++++++++++++++++ .../src/main/resources/bin/minifi.exe | Bin 103936 -> 0 bytes .../src/main/resources/bin/minifiw.exe | Bin 104448 -> 0 bytes 4 files changed, 53 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/bf3f7c12/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index a2e04fa..c485b2c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ nb-configuration.xml *.iml *.iws *~ +*.exe http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/bf3f7c12/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/pom.xml ---------------------------------------------------------------------- diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/pom.xml b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/pom.xml index 3d888ca..d481134 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/pom.xml +++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/pom.xml @@ -25,6 +25,58 @@ <description>holds common resources used to build installers</description> <build> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <dependencies> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>20020829</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>download-commons-daemon</id> + <phase>compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> + <if> + <available file="${basedir}/src/main/resources/bin/minifiw.exe" /> + <then> + <echo message="Skipping download of commons-daemon." /> + </then> + <else> + <echo message="Downloading Commons Daemon Windows binaries." /> + <get + src="http://www.apache.org/dist/commons/daemon/binaries/windows/commons-daemon-1.0.15-bin-windows.zip"; + dest="${java.io.tmpdir}/commons-daemon-1.0.15-bin-windows.zip" + skipexisting="true" /> + <local name="checksum.matches" /> + <property name="sha256sum" value="f46d87be0997b5c0f5c3a340ee8addca04cb2a32b2dc3e3a9e89a592ccf6abed" /> + <checksum file="${java.io.tmpdir}/commons-daemon-1.0.15-bin-windows.zip" algorithm="SHA-256" property="${sha256sum}" verifyProperty="checksum.matches"/> + <echo message="Checksum match = ${checksum.matches}"/> + <condition property="checksum.matches.fail"> + <equals arg1="${checksum.matches}" arg2="false"/> + </condition> + <fail if="checksum.matches.fail">Checksum error</fail> + <unzip + src="${java.io.tmpdir}/commons-daemon-1.0.15-bin-windows.zip" + dest="${java.io.tmpdir}" /> + <copy file="${java.io.tmpdir}/prunmgr.exe" + tofile="${basedir}/src/main/resources/bin/minifiw.exe" /> + <copy file="${java.io.tmpdir}/prunsrv.exe" tofile="${basedir}/src/main/resources/bin/minifi.exe" /> + </else> + </if> + </tasks> + </configuration> + </execution> + </executions> + </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/bf3f7c12/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/minifi.exe ---------------------------------------------------------------------- diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/minifi.exe b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/minifi.exe deleted file mode 100644 index dab7def..0000000 Binary files a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/minifi.exe and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/bf3f7c12/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/minifiw.exe ---------------------------------------------------------------------- diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/minifiw.exe b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/minifiw.exe deleted file mode 100644 index 7302404..0000000 Binary files a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/minifiw.exe and /dev/null differ
