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

NIFI-4645 make sure the grpc bundle is only built and nar included IF not building on powerpc arch. This closes #2305

This commit is contained in:
joewitt 2017-11-28 15:48:20 -05:00 committed by Matt Gilman
parent 73fa0429f0
commit 9ea9996b36
No known key found for this signature in database
GPG Key ID: DF61EC19432AEE37
2 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
nifi-assembly/pom.xml
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. The ASF licenses this file to
You under the Apache License, Version 2.0 (the "License"); you may not use
this file except in compliance with the License. You may obtain a copy of
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
by applicable law or agreed to in writing, software distributed under the
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. The ASF licenses this file to
You under the Apache License, Version 2.0 (the "License"); you may not use
this file except in compliance with the License. You may obtain a copy of
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
by applicable law or agreed to in writing, software distributed under the
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@ -491,11 +491,6 @@
<artifactId>nifi-gcp-nar</artifactId>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-grpc-nar</artifactId>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-stateful-analysis-nar</artifactId>
@ -538,6 +533,22 @@
</dependency>
</dependencies>
<profiles>
<profile>
<id>supportpowerpc</id>
<activation>
<os>
<family>unix</family>
<arch>ppc</arch>
</os>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-grpc-nar</artifactId>
<type>nar</type>
</dependency>
</dependencies>
</profile>
<profile>
<id>rpm</id>
<activation>

13
nifi-nar-bundles/pom.xml
View File

@ -87,7 +87,6 @@
<module>nifi-cybersecurity-bundle</module>
<module>nifi-parquet-bundle</module>
<module>nifi-extension-utils</module>
<module>nifi-grpc-bundle</module>
<module>nifi-redis-bundle</module>
<module>nifi-metrics-reporting-bundle</module>
</modules>
@ -135,6 +134,18 @@
<buildBranch />
</properties>
</profile>
<profile>
<id>supportpowerpc</id>
<activation>
<os>
<family>unix</family>
<arch>ppc</arch>
</os>
</activation>
<modules>
<module>nifi-grpc-bundle</module>
</modules>
</profile>
</profiles>
<dependencyManagement>