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 a3d6356 commit 4617a9f
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 108 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: [ "master", "develop" ]
tags:
- "*.*.*"
pull_request:
branches: [ "master", "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-provenance-reporting-nar/target/nifi-provenance-reporting-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-provenance-reporting-nar/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
</parent>

<artifactId>nifi-provenance-reporting-nar</artifactId>
<version>1.23.2</version>
<packaging>nar</packaging>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
Expand Down
12 changes: 7 additions & 5 deletions nifi-provenance-reporting-tasks/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,25 @@

<artifactId>nifi-provenance-reporting-tasks</artifactId>
<packaging>jar</packaging>
<properties>
<nifi.version>1.23.2</nifi.version>
</properties>

<dependencies>
<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-utils</artifactId>
<version>1.23.2</version>
<version>${nifi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-reporting-utils</artifactId>
<version>1.23.2</version>
<version>${nifi.version}</version>
</dependency>
<dependency>
<groupId>co.elastic.clients</groupId>
Expand All @@ -54,13 +57,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
<version>1.23.2</version>
<version>${nifi.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
95 changes: 13 additions & 82 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,96 +17,27 @@
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.nifi</groupId>
<artifactId>nifi-provenance-reporting-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>
<!-- Skip enforcer as commons-logging (ES dependency) is banned by NiFi but used in this processor -->
<enforcer.skip>true</enforcer.skip>
</properties>

<modules>
<module>nifi-provenance-reporting-tasks</module>
<module>nifi-provenance-reporting-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>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.1</version>
<executions>
<execution>
<id>enforce-java</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireJavaVersion>
<version>[17,)</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
<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>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-maven-plugin</artifactId>
<version>1.5.1</version>
<extensions>true</extensions>
</plugin>
</plugins>
</build>

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

</project>

0 comments on commit 4617a9f

Please sign in to comment.