You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2015/01/06 20:00:21 UTC
incubator-nifi git commit: NIFI-228 fixed build to always create
assembly non-attached and to use curren maven approaches
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 23dcdeb61 -> 33ad7934e
NIFI-228 fixed build to always create assembly non-attached and to use curren maven approaches
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/33ad7934
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/33ad7934
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/33ad7934
Branch: refs/heads/develop
Commit: 33ad7934eaaf257190c3e96f6ecf46b378808912
Parents: 23dcdeb
Author: joewitt <jo...@apache.org>
Authored: Tue Jan 6 13:43:54 2015 -0500
Committer: joewitt <jo...@apache.org>
Committed: Tue Jan 6 13:43:54 2015 -0500
----------------------------------------------------------------------
assembly/pom.xml | 114 ++++++++++-----------
assembly/src/main/assembly/dependencies.xml | 121 ++++++++++++-----------
2 files changed, 116 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/33ad7934/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 0d00da3..e785c45 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -28,68 +28,26 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-shared-resources</id>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <phase>generate-resources</phase>
- <configuration>
- <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
- <includeArtifactIds>nifi-resources</includeArtifactIds>
- <includeGroupIds>org.apache.nifi</includeGroupIds>
- <excludeTransitive>false</excludeTransitive>
- </configuration>
- </execution>
- <execution>
- <id>unpack-docs</id>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <phase>generate-resources</phase>
- <configuration>
- <outputDirectory>${project.build.directory}/generated-docs</outputDirectory>
- <includeArtifactIds>nifi-docs</includeArtifactIds>
- <includeGroupIds>org.apache.nifi</includeGroupIds>
- <excludeTransitive>false</excludeTransitive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <descriptors>
- <descriptor>src/main/assembly/dependencies.xml</descriptor>
- </descriptors>
+ <attach>true</attach>
</configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
+ <id>make shared resource</id>
<goals>
- <goal>exec</goal>
+ <goal>single</goal>
</goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/dependencies.xml</descriptor>
+ </descriptors>
+ </configuration>
</execution>
- </executions>
- <configuration>
- <executable>${project.build.directory}/${project.artifactId}-${project.version}-${nifi.assembly.id}.dir/${nifi.executable}</executable>
- </configuration>
+ </executions>
</plugin>
</plugins>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- <resource>
- <directory>${project.build.directory}/generated-resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
</build>
<dependencies>
<dependency>
@@ -133,14 +91,14 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-resources</artifactId>
<classifier>resources</classifier>
- <scope>provided</scope> <!-- Provided - we don't want the zip in the libs -->
+ <scope>runtime</scope>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-docs</artifactId>
<classifier>resources</classifier>
- <scope>provided</scope> <!-- Provided - we don't want the zip in the libs -->
+ <scope>runtime</scope>
<type>zip</type>
</dependency>
<dependency>
@@ -203,11 +161,11 @@
<artifactId>hadoop-nar</artifactId>
<type>nar</type>
</dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>kafka-nar</artifactId>
- <type>nar</type>
- </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>kafka-nar</artifactId>
+ <type>nar</type>
+ </dependency>
</dependencies>
<properties>
@@ -360,6 +318,37 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
+ <includeArtifactIds>nifi-resources</includeArtifactIds>
+ <includeGroupIds>org.apache.nifi</includeGroupIds>
+ <excludeTransitive>false</excludeTransitive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-docs</id>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/generated-docs</outputDirectory>
+ <includeArtifactIds>nifi-docs</includeArtifactIds>
+ <includeGroupIds>org.apache.nifi</includeGroupIds>
+ <excludeTransitive>false</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
<configuration>
@@ -402,6 +391,9 @@
<location>../NOTICE</location>
</source>
<source>
+ <location>../DISCLAIMER</location>
+ </source>
+ <source>
<location>../README.md</location>
<destination>README</destination>
</source>
@@ -433,6 +425,8 @@
<dependency>
<excludes>
<exclude>org.apache.nifi:nifi-bootstrap</exclude>
+ <exclude>org.apache.nifi:nifi-resources</exclude>
+ <exclude>org.apache.nifi:nifi-docs</exclude>
</excludes>
</dependency>
</mapping>
@@ -440,7 +434,7 @@
<directory>/opt/nifi/nifi-${project.version}/lib/bootstrap</directory>
<dependency>
<includes>
- <include>org.apache.nifi:nifi-bootstrap</include>
+ <include>org.apache.nifi:nifi-bootstrap</include>
</includes>
</dependency>
</mapping>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/33ad7934/assembly/src/main/assembly/dependencies.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/assembly/dependencies.xml b/assembly/src/main/assembly/dependencies.xml
index 4b77a32..3481b0a 100644
--- a/assembly/src/main/assembly/dependencies.xml
+++ b/assembly/src/main/assembly/dependencies.xml
@@ -17,94 +17,97 @@
<id>bin</id>
<formats>
<format>dir</format>
+ <format>zip</format>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>${project.artifactId}-${project.version}</baseDirectory>
<dependencySets>
+ <!-- Write out all dependency artifacts to lib directory -->
<dependencySet>
<scope>runtime</scope>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
+ <directoryMode>0750</directoryMode>
+ <fileMode>0640</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>nifi-bootstrap</exclude>
+ <exclude>nifi-resources</exclude>
+ <exclude>nifi-docs</exclude>
</excludes>
</dependencySet>
+ <!-- Write out the bootstrap lib component to its own dir -->
<dependencySet>
<scope>runtime</scope>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib/bootstrap</outputDirectory>
+ <directoryMode>0750</directoryMode>
+ <fileMode>0640</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>nifi-bootstrap</include>
</includes>
</dependencySet>
- </dependencySets>
-
- <fileSets>
- <fileSet>
- <directory>${project.build.directory}/generated-resources/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <directoryMode>0750</directoryMode>
- <fileMode>0750</fileMode>
- <filtered>false</filtered>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/generated-resources/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <excludes>
- <exclude>nifi.properties</exclude>
- </excludes>
- <directoryMode>0750</directoryMode>
- <fileMode>0640</fileMode>
- <filtered>true</filtered>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/generated-resources/lib</directory>
- <outputDirectory>lib</outputDirectory>
- <directoryMode>0750</directoryMode>
- <fileMode>0640</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/generated-resources/logs</directory>
- <outputDirectory>logs</outputDirectory>
- <directoryMode>0750</directoryMode>
- <fileMode>0640</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/generated-resources/docs</directory>
- <outputDirectory>docs</outputDirectory>
- <directoryMode>0750</directoryMode>
- <fileMode>0640</fileMode>
- <filtered>false</filtered>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/generated-docs/</directory>
- <outputDirectory>docs</outputDirectory>
+
+ <!-- Write out the conf directory contents -->
+ <dependencySet>
+ <scope>runtime</scope>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>./</outputDirectory>
<directoryMode>0750</directoryMode>
<fileMode>0640</fileMode>
- <filtered>false</filtered>
- </fileSet>
- </fileSets>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <includes>
+ <include>nifi-resources</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <filtered>true</filtered>
+ <includes>
+ <include>conf/*</include>
+ </includes>
+ </unpackOptions>
+ </dependencySet>
- <files>
- <file>
- <source>${project.build.directory}/generated-resources/conf/nifi.properties</source>
- <outputDirectory>conf</outputDirectory>
- <destName>${project.artifactId}.properties</destName>
- <fileMode>0640</fileMode>
- <filtered>true</filtered>
- </file>
- <file>
- <source>${project.build.directory}/generated-resources/bin/nifi.sh</source>
- <outputDirectory>bin</outputDirectory>
- <destName>nifi.sh</destName>
+ <!-- Write out the bin directory contents -->
+ <dependencySet>
+ <scope>runtime</scope>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>./</outputDirectory>
+ <directoryMode>0750</directoryMode>
<fileMode>0750</fileMode>
- <filtered>true</filtered>
- </file>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <includes>
+ <include>nifi-resources</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <filtered>true</filtered>
+ <includes>
+ <include>bin/*</include>
+ </includes>
+ </unpackOptions>
+ </dependencySet>
+
+ <!-- Writes out the docs directory contents -->
+ <dependencySet>
+ <scope>runtime</scope>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>docs/</outputDirectory>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <includes>
+ <include>nifi-docs</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <filtered>false</filtered>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
+ <files>
<file>
<source>../README.md</source>
<outputDirectory>./</outputDirectory>