diff --git a/apache-nifi.yaml b/apache-nifi.yaml index 5beba65c55c..3e87a41a090 100644 --- a/apache-nifi.yaml +++ b/apache-nifi.yaml @@ -1,7 +1,7 @@ package: name: apache-nifi - version: "2.6.0" - epoch: 2 # GHSA-25qh-j22f-pwp8 + version: "2.7.1" + epoch: 0 # GHSA-25qh-j22f-pwp8 description: Apache NiFi is an easy to use, powerful, and reliable system to process and distribute data. copyright: - license: Apache-2.0 @@ -50,7 +50,7 @@ pipeline: with: repository: https://github.com/apache/nifi tag: rel/nifi-${{package.version}} - expected-commit: 27bdbfda4d8dec2006b8b279db790faf172e76fd + expected-commit: 034cf843c1e8d63d218871a1478e2eeaa3532dca - uses: maven/pombump with: @@ -90,7 +90,7 @@ pipeline: MAVEN_THREADS=1 # Build NiFi - ./mvnw -T${MAVEN_THREADS}C -q package \ + ./mvnw -T${MAVEN_THREADS} -q package \ --no-snapshot-updates \ --no-transfer-progress \ --fail-fast \ diff --git a/apache-nifi/pombump-deps.yaml b/apache-nifi/pombump-deps.yaml index 9ebef058256..af677ad5ecb 100644 --- a/apache-nifi/pombump-deps.yaml +++ b/apache-nifi/pombump-deps.yaml @@ -20,9 +20,12 @@ patches: - groupId: io.projectreactor.netty artifactId: reactor-netty-http version: 1.2.8 + - groupId: org.eclipse.jetty.ee11 + artifactId: jetty-ee11-bom + version: 12.1.5 - groupId: org.eclipse.jetty.http2 artifactId: jetty-http2-common - version: 12.0.25 + version: 12.1.5 - groupId: org.springframework.security artifactId: spring-security-core version: 6.5.4 diff --git a/apache-nifi/pombump-nifi-email-nar.yaml b/apache-nifi/pombump-nifi-email-nar.yaml index 50784d87f47..1e2ca34d480 100644 --- a/apache-nifi/pombump-nifi-email-nar.yaml +++ b/apache-nifi/pombump-nifi-email-nar.yaml @@ -4,4 +4,4 @@ patches: version: 2.0.4 - groupId: org.eclipse.jetty.http2 artifactId: jetty-http2-common - version: 12.0.25 + version: 12.1.5 diff --git a/apache-nifi/pombump-properties.yaml b/apache-nifi/pombump-properties.yaml index 11048d51843..32883e23757 100644 --- a/apache-nifi/pombump-properties.yaml +++ b/apache-nifi/pombump-properties.yaml @@ -1,6 +1,6 @@ properties: - property: jetty.version - value: 12.0.25 + value: 12.1.5 - property: netty.4.version value: 4.2.5.Final - property: spring.version