Repository: nifi Updated Branches: refs/heads/master 9736cb9d3 -> a0f568b69
NIFI-4661 no longer building and including the gprc elements by default. This closes #2318 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a0f568b6 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a0f568b6 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a0f568b6 Branch: refs/heads/master Commit: a0f568b69c96b6b0559100e6a48f237034b8e70b Parents: 9736cb9 Author: joewitt <[email protected]> Authored: Tue Dec 5 12:41:16 2017 -0500 Committer: Matt Gilman <[email protected]> Committed: Tue Dec 5 14:26:05 2017 -0500 ---------------------------------------------------------------------- nifi-assembly/pom.xml | 9 +++++---- nifi-nar-bundles/pom.xml | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/a0f568b6/nifi-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml index ddcd6e8..49e562d 100755 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -544,11 +544,12 @@ language governing permissions and limitations under the License. --> </dependencies> <profiles> <profile> - <id>includeifnotppc</id> + <id>include-grpc</id> + <!-- This profile handles the inclusion of grpc artifacts. They are notoriously + environment specific in terms of build such as not working in os/arch=ppc64le + or in Centos6 due to requiring a newer version of GLIBC. --> <activation> - <os> - <arch>!ppc64le</arch> - </os> + <activeByDefault>false</activeByDefault> </activation> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/nifi/blob/a0f568b6/nifi-nar-bundles/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/pom.xml b/nifi-nar-bundles/pom.xml index 30c31da..0462e72 100755 --- a/nifi-nar-bundles/pom.xml +++ b/nifi-nar-bundles/pom.xml @@ -135,11 +135,12 @@ </properties> </profile> <profile> - <id>includeifnotppc</id> + <id>include-grpc</id> + <!-- This profile handles the inclusion of grpc artifacts. They are notoriously + environment specific in terms of build such as not working in os/arch=ppc64le + or in Centos6 due to requiring a newer version of GLIBC. --> <activation> - <os> - <arch>!ppc64le</arch> - </os> + <activeByDefault>false</activeByDefault> </activation> <modules> <module>nifi-grpc-bundle</module>
