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 8309288 commit 0e12eaf
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 96 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: [ "main" ]
tags:
- "*.*.*"
pull_request:
branches: [ "main" ]

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-concession-transform-nar/target/nifi-concession-transform-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.

6 changes: 0 additions & 6 deletions nifi-ngsild-postgresql-nar/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@
</properties>

<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
<version>1.23.2</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>egm.io</groupId>
<artifactId>nifi-ngsild-postgresql-processors</artifactId>
Expand Down
8 changes: 1 addition & 7 deletions nifi-ngsild-postgresql-processors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,14 @@
<packaging>jar</packaging>
<properties>
<nifi.version>1.23.2</nifi.version>
<mockito.version>4.11.0</mockito.version>
<junit.version>5.10.0</junit.version>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
<version>${nifi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
Expand Down Expand Up @@ -78,31 +77,26 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
</dependency>
</dependencies>
</project>
75 changes: 13 additions & 62 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,76 +16,27 @@
<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 https://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>egm.io</groupId>
<artifactId>nifi-ngsild-postgresql</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 org.json is banned by NiFi but used in this processor -->
<enforcer.skip>true</enforcer.skip>
</properties>

<modules>
<module>nifi-ngsild-postgresql-processors</module>
<module>nifi-ngsild-postgresql-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>
</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.0</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-ngsild-postgresql</url>
</repository>
</distributionManagement>

</project>

0 comments on commit 0e12eaf

Please sign in to comment.