Skip to content

Commit

Permalink
Merge branch 'main' into jent/codeql
Browse files Browse the repository at this point in the history
  • Loading branch information
@jentfoo
jentfoo authored Oct 22, 2024
2 parents 2e527a8 + fb3011a commit 8838c7a
Show file tree
Hide file tree
Showing 8 changed files with 278 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .release-please-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "0.5.0"
".": "0.6.0"
}
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [0.6.0](https://github.com/opentdf/nifi/compare/v0.5.0...v0.6.0) (2024-10-21)


### Bug Fixes

* Maven plugins and vulnerability fix ([#32](https://github.com/opentdf/nifi/issues/32)) ([fda54ff](https://github.com/opentdf/nifi/commit/fda54ff5f45b1fcf7ef56f949e6f4dfa9929bfbb))

## [0.5.0](https://github.com/opentdf/nifi/compare/v0.4.0...v0.5.0) (2024-10-18)


Expand Down
64 changes: 62 additions & 2 deletions nifi-tdf-controller-services-api-nar/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.opentdf.nifi</groupId>
<artifactId>nifi-pom</artifactId>
<version>0.6.0-SNAPSHOT</version><!-- {x-version-update:nifi:current} -->
<version>0.7.0-SNAPSHOT</version><!-- {x-version-update:nifi:current} -->
</parent>
<artifactId>nifi-tdf-controller-services-nar</artifactId>
<name>nifi-tdf-controller-services-nar</name>
Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>nifi-tdf-controller-services-api</artifactId>
<version>0.6.0-SNAPSHOT</version><!-- {x-version-update:nifi:current} -->
<version>0.7.0-SNAPSHOT</version><!-- {x-version-update:nifi:current} -->
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
Expand Down Expand Up @@ -52,6 +52,66 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-maven-plugin</artifactId>
</plugin>
<!-- Plugin to create source JAR -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Plugin to create Javadoc JAR -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.8.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Plugin to generate checksum files -->
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<version>1.11</version>
<executions>
<execution>
<id>create-checksums</id>
<phase>package</phase>
<goals>
<goal>files</goal>
</goals>
<configuration>
<algorithms>
<algorithm>MD5</algorithm>
<algorithm>SHA-1</algorithm>
<algorithm>SHA-256</algorithm>
<algorithm>SHA-512</algorithm>
</algorithms>
<failOnError>true</failOnError>
<fileSets>
<fileSet>
<directory>${project.build.directory}</directory>
<includes>
<include>*.nar</include>
</includes>
</fileSet>
</fileSets>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
66 changes: 65 additions & 1 deletion nifi-tdf-controller-services-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.opentdf.nifi</groupId>
<artifactId>nifi-pom</artifactId>
<version>0.6.0-SNAPSHOT</version><!-- {x-version-update:nifi:current} -->
<version>0.7.0-SNAPSHOT</version><!-- {x-version-update:nifi:current} -->
</parent>
<artifactId>nifi-tdf-controller-services-api</artifactId>
<name>nifi-tdf-controller-services-api</name>
Expand All @@ -31,4 +31,68 @@
<version>${nifi.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<!-- Plugin to create source JAR -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Plugin to create Javadoc JAR -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.8.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Plugin to generate checksum files -->
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<version>1.11</version>
<executions>
<execution>
<id>create-checksums</id>
<phase>package</phase>
<goals>
<goal>files</goal>
</goals>
<configuration>
<algorithms>
<algorithm>MD5</algorithm>
<algorithm>SHA-1</algorithm>
<algorithm>SHA-256</algorithm>
<algorithm>SHA-512</algorithm>
</algorithms>
<failOnError>true</failOnError>
<fileSets>
<fileSet>
<directory>${project.build.directory}</directory>
<includes>
<include>*.jar</include>
</includes>
</fileSet>
</fileSets>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
66 changes: 63 additions & 3 deletions nifi-tdf-nar/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.opentdf.nifi</groupId>
<artifactId>nifi-pom</artifactId>
<version>0.6.0-SNAPSHOT</version><!-- {x-version-update:nifi:current} -->
<version>0.7.0-SNAPSHOT</version><!-- {x-version-update:nifi:current} -->
</parent>
<artifactId>nifi-tdf-nar</artifactId>
<name>nifi-tdf-nar</name>
Expand All @@ -18,12 +18,12 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>nifi-tdf-processors</artifactId>
<version>0.6.0-SNAPSHOT</version><!-- {x-version-update:nifi:current} -->
<version>0.7.0-SNAPSHOT</version><!-- {x-version-update:nifi:current} -->
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>nifi-tdf-controller-services-nar</artifactId>
<version>0.6.0-SNAPSHOT</version><!-- {x-version-update:nifi:current} -->
<version>0.7.0-SNAPSHOT</version><!-- {x-version-update:nifi:current} -->
<type>nar</type>
</dependency>
</dependencies>
Expand All @@ -33,6 +33,66 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-maven-plugin</artifactId>
</plugin>
<!-- Plugin to create source JAR -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Plugin to create Javadoc JAR -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.8.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Plugin to generate checksum files -->
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<version>1.11</version>
<executions>
<execution>
<id>create-checksums</id>
<phase>package</phase>
<goals>
<goal>files</goal>
</goals>
<configuration>
<algorithms>
<algorithm>MD5</algorithm>
<algorithm>SHA-1</algorithm>
<algorithm>SHA-256</algorithm>
<algorithm>SHA-512</algorithm>
</algorithms>
<failOnError>true</failOnError>
<fileSets>
<fileSet>
<directory>${project.build.directory}</directory>
<includes>
<include>*.nar</include>
</includes>
</fileSet>
</fileSets>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
Expand Down
68 changes: 66 additions & 2 deletions nifi-tdf-processors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.opentdf.nifi</groupId>
<artifactId>nifi-pom</artifactId>
<version>0.6.0-SNAPSHOT</version><!-- {x-version-update:nifi:current} -->
<version>0.7.0-SNAPSHOT</version><!-- {x-version-update:nifi:current} -->
</parent>
<artifactId>nifi-tdf-processors</artifactId>
<name>nifi-tdf-processors</name>
Expand All @@ -19,7 +19,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>nifi-tdf-controller-services-api</artifactId>
<version>0.6.0-SNAPSHOT</version><!-- {x-version-update:nifi:current} -->
<version>0.7.0-SNAPSHOT</version><!-- {x-version-update:nifi:current} -->
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
Expand Down Expand Up @@ -97,4 +97,68 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<!-- Plugin to create source JAR -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Plugin to create Javadoc JAR -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.8.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Plugin to generate checksum files -->
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<version>1.11</version>
<executions>
<execution>
<id>create-checksums</id>
<phase>package</phase>
<goals>
<goal>files</goal>
</goals>
<configuration>
<algorithms>
<algorithm>MD5</algorithm>
<algorithm>SHA-1</algorithm>
<algorithm>SHA-256</algorithm>
<algorithm>SHA-512</algorithm>
</algorithms>
<failOnError>true</failOnError>
<fileSets>
<fileSet>
<directory>${project.build.directory}</directory>
<includes>
<include>*.jar</include>
</includes>
</fileSet>
</fileSets>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
15 changes: 13 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@

<groupId>io.opentdf.nifi</groupId>
<artifactId>nifi-pom</artifactId>
<version>0.6.0-SNAPSHOT</version><!-- {x-version-update:nifi:current} -->
<version>0.7.0-SNAPSHOT</version><!-- {x-version-update:nifi:current} -->
<name>nifi-pom</name>
<packaging>pom</packaging>
<description>NiFi processors for OpenTDF</description>
<url>https://github.com/opentdf/nifi</url>
<packaging>pom</packaging>
<licenses>
<license>
<name>Clear BSD License</name>
Expand Down Expand Up @@ -90,6 +91,16 @@
<version>5.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.25.5</version>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>2.9.0</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
Expand Down
2 changes: 1 addition & 1 deletion versions.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version

nifi:0.5.0:0.6.0-SNAPSHOT
nifi:0.6.0:0.7.0-SNAPSHOT

0 comments on commit 8838c7a

Please sign in to comment.