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

View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. The ASF licenses this file to information regarding copyright ownership. The ASF licenses this file to
You under the Apache License, Version 2.0 (the "License"); you may not use 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 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 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 by applicable law or agreed to in writing, software distributed under the
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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 OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. --> 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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
@ -491,11 +491,6 @@
<artifactId>nifi-gcp-nar</artifactId> <artifactId>nifi-gcp-nar</artifactId>
<type>nar</type> <type>nar</type>
</dependency> </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-grpc-nar</artifactId>
<type>nar</type>
</dependency>
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>
<artifactId>nifi-stateful-analysis-nar</artifactId> <artifactId>nifi-stateful-analysis-nar</artifactId>
@ -538,6 +533,22 @@
</dependency> </dependency>
</dependencies> </dependencies>
<profiles> <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> <profile>
<id>rpm</id> <id>rpm</id>
<activation> <activation>

View File

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