Skip to content

Commit

Permalink
feat: full realignment with processor build structure
Browse files Browse the repository at this point in the history
  • Loading branch information
@bobeal
bobeal committed Oct 27, 2023
1 parent e701e3c commit a938451
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 111 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: Java CI with Maven
on:
push:
branches: [ "develop" ]
tags:
- "*.*.*"
pull_request:
branches: [ "develop" ]

Expand All @@ -21,3 +23,8 @@ jobs:
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml
- name: Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
files: nifi-file-identity-provider-nar/target/nifi-file-identity-provider-nar-*.*.*.nar
2 changes: 1 addition & 1 deletion .github/workflows/mvn-dependency-submission.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Java CI with Maven
name: Submit Maven dependency tree

on:
push:
Expand Down
20 changes: 0 additions & 20 deletions .github/workflows/publish.yml
View file

This file was deleted.

1 change: 1 addition & 0 deletions nifi-file-identity-provider-nar/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
</parent>

<artifactId>nifi-file-identity-provider-nar</artifactId>
<version>1.23.2</version>
<packaging>nar</packaging>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
Expand Down
24 changes: 9 additions & 15 deletions nifi-file-identity-provider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@

<artifactId>nifi-file-identity-provider</artifactId>
<packaging>jar</packaging>
<properties>
<nifi.version>1.23.2</nifi.version>
</properties>

<build>
<resources>
Expand Down Expand Up @@ -89,8 +92,8 @@
<profile>
<id>jigsaw</id>
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>
<build>
<plugins>
Expand Down Expand Up @@ -127,47 +130,38 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
<version>1.23.2</version>
<version>${nifi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-api</artifactId>
<version>1.23.2</version>
<version>${nifi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
<version>1.23.2</version>
<version>${nifi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
<version>1.23.2</version>
<version>${nifi.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.9</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>6.1.5</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
</dependency>
</dependencies>

Expand Down
86 changes: 11 additions & 75 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,101 +17,37 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
<version>1.23.2</version>
</parent>

<groupId>io.egm</groupId>
<artifactId>nifi-file-identity-provider-bundle</artifactId>
<version>1.23.2</version>
<packaging>pom</packaging>

<properties>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
</properties>

<modules>
<module>nifi-file-identity-provider</module>
<module>nifi-file-identity-provider-nar</module>
</modules>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<fork>true</fork>
<optimize>true</optimize>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version>
<configuration>
<includes>
<include>**/*Test.class</include>
<include>**/Test*.class</include>
<include>**/*Spec.class</include>
</includes>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<argLine combine.children="append">-Xmx1G -Djava.net.preferIPv4Stack=true</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>2.5.0</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-maven-plugin</artifactId>
<version>1.5.0</version>
<extensions>true</extensions>
</plugin>
</plugins>
</build>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.10.0</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

<distributionManagement>
<repository>
<id>github</id>
<name>GitHub Packages</name>
<url>https://maven.pkg.github.com/easy-global-market/nifi-file-identity-provider-bundle</url>
</repository>
</distributionManagement>

<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.10.0</version>
<scope>test</scope>
</dependency>
</dependencies>

</project>

0 comments on commit a938451

Please sign in to comment.