This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 80cbd4c4a30c2db0190ec20e4bd5fd16d5776e60 Author: Gregory M. Foreman <gfore...@spinnerconsulting.com> AuthorDate: Tue Jan 4 08:04:19 2022 -0500 NIFI-9525 This closes #5626. modify lib packaging to use files from build directory Signed-off-by: Joe Witt <joew...@apache.org> --- nifi-assembly/pom.xml | 139 ++------------------------------------------------ 1 file changed, 5 insertions(+), 134 deletions(-) diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml index 6a6fc92..a1b16a3 100644 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -1175,140 +1175,11 @@ language governing permissions and limitations under the License. --> </mapping> <mapping> <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. --> - <mapping> - <directory>/opt/nifi/nifi-${project.version}/lib</directory> - <dependency> - <excludes> - <exclude>org.bouncycastle:bcprov-jdk15on</exclude> - <exclude>org.apache.commons:commons-configuration2</exclude> - <exclude>org.apache.commons:commons-lang3</exclude> - <exclude>org.apache.commons:commons-text</exclude> - <!-- must be in lib <exclude>org.slf4j:jul-to-slf4j</exclude> --> - <!-- must be in lib <exclude>ch.qos.logback:logback-classic</exclude> --> - <!-- must be in lib <exclude>javax.servlet:javax.servlet-api</exclude> --> - <!-- must be in lib <exclude>org.eclipse.jetty.toolchain:jetty-schemas<exclude> --> - <exclude>javax.mail:mail</exclude> - <!-- must be in lib <exclude>org.apache.nifi:nifi-api</exclude> --> - <exclude>org.apache.nifi:nifi-bootstrap</exclude> - <exclude>org.apache.nifi:nifi-bootstrap-utils</exclude> - <exclude>org.apache.nifi:nifi-expression-language</exclude> - <exclude>org.apache.nifi:nifi-parameter</exclude> - <exclude>org.apache.nifi:nifi-processor-utils</exclude> - <!-- must be in lib <exclude>org.apache.nifi:nifi-properties</exclude> --> - <exclude>org.apache.nifi:nifi-properties-loader</exclude> - <!-- must be in lib <exclude>org.slf4j:slf4j-api</exclude> --> - <exclude>javax.activation:activation</exclude> - <exclude>com.sun.activation:javax.activation</exclude> - <exclude>org.antlr:antlr-runtime</exclude> - <exclude>asm:asm</exclude> - <exclude>net.minidev:asm</exclude> - <exclude>org.ow2.asm:asm</exclude> - <exclude>net.minidev:accessors-smart</exclude> - <exclude>org.bouncycastle:bcpkix-jdk15on</exclude> - <exclude>commons-codec:commons-codec</exclude> - <exclude>commons-io:commons-io</exclude> - <exclude>commons-logging:commons-logging</exclude> - <exclude>com.fasterxml.jackson.core:jackson-annotations</exclude> - <exclude>com.fasterxml.jackson.core:jackson-core</exclude> - <exclude>com.fasterxml.jackson.core:jackson-databind</exclude> - <exclude>com.jayway.jsonpath:json-path</exclude> - <exclude>at.favre.lib:bcrypt</exclude> - <exclude>net.java.dev.jna:jna</exclude> - <exclude>net.java.dev.jna:jna-platform</exclude> - <exclude>net.minidev:json-smart</exclude> - <!-- must be in lib <exclude>ch.qos.logback:logback-core</exclude> --> - <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 --> - <exclude>org.apache.nifi:nifi-resources</exclude> - <exclude>org.apache.nifi:nifi-docs</exclude> - <exclude>com.squareup.okhttp3:okhttp</exclude> - <exclude>com.squareup.okio:okio</exclude> - <!-- exclude jaxb/activation/annotation libs from lib, they'll be included in the java11 subdir --> - <!-- TODO: remove these once minimum Java version is 11 --> - <exclude>org.glassfish.jaxb:jaxb-runtime</exclude> - <exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude> - <exclude>javax.annotation:javax.annotation-api</exclude> - <!-- exclude AspectJ library from lib, it'll be included in the aspectj subdir --> - <exclude>org.aspectj:aspectjweaver</exclude> - </excludes> - </dependency> - </mapping> - <mapping> - <directory>/opt/nifi/nifi-${project.version}/lib/bootstrap</directory> - <dependency> - <includes> - <include>org.bouncycastle:bcprov-jdk15on</include> - <include>org.apache.commons:commons-configuration2</include> - <include>org.apache.commons:commons-lang3</include> - <include>org.apache.commons:commons-text</include> - <!-- already in lib <include>org.slf4j:jul-to-slf4j</include> --> - <include>ch.qos.logback:logback-classic</include> - <include>javax.mail:mail</include> - <include>org.apache.nifi:nifi-api</include> - <include>org.apache.nifi:nifi-bootstrap</include> - <include>org.apache.nifi:nifi-bootstrap-utils</include> - <include>org.apache.nifi:nifi-expression-language</include> - <include>org.apache.nifi:nifi-parameter</include> - <include>org.apache.nifi:nifi-processor-utils</include> - <!-- already in lib <include>org.apache.nifi:nifi-properties</include> --> - <include>org.apache.nifi:nifi-properties-loader</include> - <include>org.slf4j:slf4j-api</include> - <include>javax.activation:activation</include> - <include>com.sun.activation:javax.activation</include> - <include>org.antlr:antlr-runtime</include> - <include>asm:asm</include> - <include>net.minidev:asm</include> - <include>org.ow2.asm:asm</include> - <include>net.minidev:accessors-smart</include> - <include>org.bouncycastle:bcpkix-jdk15on</include> - <include>commons-codec:commons-codec</include> - <include>commons-io:commons-io</include> - <include>commons-logging:commons-logging</include> - <include>com.fasterxml.jackson.core:jackson-annotations</include> - <include>com.fasterxml.jackson.core:jackson-core</include> - <include>com.fasterxml.jackson.core:jackson-databind</include> - <include>com.jayway.jsonpath:json-path</include> - <include>at.favre.lib:bcrypt</include> - <include>net.java.dev.jna:jna</include> - <include>net.java.dev.jna:jna-platform</include> - <include>net.minidev:json-smart</include> - <include>ch.qos.logback:logback-core</include> - <include>org.apache.nifi:nifi-security-utils</include> - <include>org.apache.nifi:nifi-utils</include> - <include>com.squareup.okhttp3:okhttp</include> - <include>com.squareup.okio:okio</include> - </includes> - </dependency> - </mapping> - <mapping> - <!-- TODO: remove this mapping once minimum Java version is 11 --> - <directory>/opt/nifi/nifi-${project.version}/lib/java11</directory> - <dependency> - <includes> - <include>org.glassfish.jaxb:jaxb-runtime</include> - <include>jakarta.xml.bind:jakarta.xml.bind-api</include> - <include>javax.annotation:javax.annotation-api</include> - </includes> - </dependency> - </mapping> - <mapping> - <!-- Write out the AspectJ library to its own dir --> - <!-- The AspectJ library needed by the Java Agent used for native library loading. It does not need to be on the classpath (see bootstrap.conf) --> - <directory>/opt/nifi/nifi-${project.version}/lib/aspectj</directory> - <dependency> - <includes> - <include>org.aspectj:aspectjweaver</include> - </includes> - </dependency> + <sources> + <source> + <location>${project.build.directory}/nifi-${project.version}-bin/nifi-${project.version}/lib</location> + </source> + </sources> </mapping> <mapping> <directory>/opt/nifi/nifi-${project.version}/docs</directory>