This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new fe2f49d9ca NIFI-14939 Bump github-api to 1.330 and Remove Jackson
version override (#10274)
fe2f49d9ca is described below
commit fe2f49d9caa99959aafba585fbbd98da588714a1
Author: Pierre Villard <[email protected]>
AuthorDate: Thu Sep 4 21:11:02 2025 +0200
NIFI-14939 Bump github-api to 1.330 and Remove Jackson version override
(#10274)
Signed-off-by: David Handermann <[email protected]>
---
.../nifi-github-bundle/nifi-github-extensions/pom.xml | 5 -----
.../org/apache/nifi/github/GitHubFlowRegistryClientTest.java | 9 +++++++++
.../nifi-github-bundle/nifi-github-nar/pom.xml | 3 +--
nifi-extension-bundles/nifi-github-bundle/pom.xml | 7 +++----
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/pom.xml
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/pom.xml
index 4f7470ed86..554ce341f5 100644
--- a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/pom.xml
+++ b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/pom.xml
@@ -28,7 +28,6 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>2.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -40,10 +39,6 @@
<artifactId>github-api</artifactId>
<version>${github-api.version}</version>
</dependency>
- <dependency>
- <groupId>com.github.ben-manes.caffeine</groupId>
- <artifactId>caffeine</artifactId>
- </dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId>
diff --git
a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/test/java/org/apache/nifi/github/GitHubFlowRegistryClientTest.java
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/test/java/org/apache/nifi/github/GitHubFlowRegistryClientTest.java
index 0d50d59acd..ef8cb9e5a2 100644
---
a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/test/java/org/apache/nifi/github/GitHubFlowRegistryClientTest.java
+++
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/test/java/org/apache/nifi/github/GitHubFlowRegistryClientTest.java
@@ -34,6 +34,7 @@ import
org.apache.nifi.registry.flow.git.client.GitCreateContentRequest;
import org.apache.nifi.registry.flow.git.serialize.FlowSnapshotSerializer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.kohsuke.github.GitHubBuilder;
import org.mockito.ArgumentCaptor;
import java.io.ByteArrayInputStream;
@@ -45,6 +46,7 @@ import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -84,6 +86,13 @@ public class GitHubFlowRegistryClientTest {
when(repositoryClient.getTopLevelDirectoryNames(anyString())).thenReturn(Set.of("existing-bucket",
".github"));
}
+ @Test
+ public void testGitHubClientInitializationFailsWithIncompatibleJackson() {
+ assertDoesNotThrow(() -> new GitHubBuilder()
+ .withEndpoint("https://api.github.com";)
+ .build());
+ }
+
@Test
public void testDirExclusion() throws IOException, FlowRegistryException {
setupClientConfigurationContextWithDefaults();
diff --git a/nifi-extension-bundles/nifi-github-bundle/nifi-github-nar/pom.xml
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-nar/pom.xml
index dec9f0ed73..6b00635b2a 100644
--- a/nifi-extension-bundles/nifi-github-bundle/nifi-github-nar/pom.xml
+++ b/nifi-extension-bundles/nifi-github-bundle/nifi-github-nar/pom.xml
@@ -33,10 +33,9 @@
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
- <artifactId>nifi-standard-services-api-nar</artifactId>
+ <artifactId>nifi-standard-shared-nar</artifactId>
<version>2.6.0-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
</project>
-
diff --git a/nifi-extension-bundles/nifi-github-bundle/pom.xml
b/nifi-extension-bundles/nifi-github-bundle/pom.xml
index 5a151cc10b..492b6d658c 100644
--- a/nifi-extension-bundles/nifi-github-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-github-bundle/pom.xml
@@ -16,18 +16,17 @@
<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>
- <artifactId>nifi-extension-bundles</artifactId>
+ <artifactId>nifi-standard-shared-bom</artifactId>
<groupId>org.apache.nifi</groupId>
<version>2.6.0-SNAPSHOT</version>
+
<relativePath>../nifi-standard-shared-bundle/nifi-standard-shared-bom</relativePath>
</parent>
<artifactId>nifi-github-bundle</artifactId>
<packaging>pom</packaging>
<properties>
- <github-api.version>1.329</github-api.version>
- <!-- Override Jackson to 2.19.0 pending GitHub client upgrade to
support Jackson 2.20.0 -->
- <jackson.bom.version>2.19.0</jackson.bom.version>
+ <github-api.version>1.330</github-api.version>
</properties>
<modules>
