mirror of https://github.com/apache/nifi.git
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
Matt Gilman
parent
73fa0429f0
commit
9ea9996b36
|
|
@ -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>
|
||||
|
|
@ -250,12 +250,12 @@
|
|||
<groupId>org.apache.nifi</groupId>
|
||||
<artifactId>nifi-mongodb-nar</artifactId>
|
||||
<type>nar</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.nifi</groupId>
|
||||
<artifactId>nifi-mongodb-services-nar</artifactId>
|
||||
<type>nar</type>
|
||||
</dependency>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.nifi</groupId>
|
||||
<artifactId>nifi-mongodb-services-nar</artifactId>
|
||||
<type>nar</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.nifi</groupId>
|
||||
<artifactId>nifi-solr-nar</artifactId>
|
||||
|
|
@ -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>
|
||||
|
|
@ -674,11 +685,11 @@
|
|||
<directory>/opt/nifi/nifi-${project.version}/lib</directory>
|
||||
</mapping>
|
||||
<!-- The lib excludes and lib/bootstrap
|
||||
includes are computed by looking at the desired contents of lib vs the desired
|
||||
contents of bootstrap directories. The bootstrap directory should be comprised
|
||||
of explicitly included items as found from the lib/bootstrap of a non rpm
|
||||
build and the lib folder should be specific excludes being those which we
|
||||
want in bootstrap and NOT in lib. -->
|
||||
includes are computed by looking at the desired contents of lib vs the desired
|
||||
contents of bootstrap directories. The bootstrap directory should be comprised
|
||||
of explicitly included items as found from the lib/bootstrap of a non rpm
|
||||
build and the lib folder should be specific excludes being those which we
|
||||
want in bootstrap and NOT in lib. -->
|
||||
<mapping>
|
||||
<directory>/opt/nifi/nifi-${project.version}/lib</directory>
|
||||
<dependency>
|
||||
|
|
@ -712,7 +723,7 @@
|
|||
<exclude>org.apache.nifi:nifi-security-utils</exclude>
|
||||
<exclude>org.apache.nifi:nifi-utils</exclude>
|
||||
<!-- Items to not include
|
||||
which are also not in bootstrap -->
|
||||
which are also not in bootstrap -->
|
||||
<exclude>org.apache.nifi:nifi-resources</exclude>
|
||||
<exclude>org.apache.nifi:nifi-docs</exclude>
|
||||
</excludes>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue