You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2021/06/03 10:22:28 UTC
[nifi] branch main updated: NIFI-8646 Aligned NiFi Registry
dependencies with NiFi root properties
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 40dd45b NIFI-8646 Aligned NiFi Registry dependencies with NiFi root properties
40dd45b is described below
commit 40dd45b71c6c8f33da1c5706dabcf0223db431d8
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Tue Jun 1 11:41:07 2021 -0500
NIFI-8646 Aligned NiFi Registry dependencies with NiFi root properties
Adjusted the following libraries to share dependency versions:
- Bouncy Castle
- Groovy
- Jackson
- Jetty
- Jersey
- SLF4J
- Maven Surefire Plugin
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #5112.
---
.../nifi-registry-core/nifi-registry-client/pom.xml | 10 +++++-----
.../nifi-registry-core/nifi-registry-framework/pom.xml | 4 ++--
.../nifi-registry-core/nifi-registry-properties/pom.xml | 4 ++--
.../nifi-registry-security-utils/pom.xml | 4 ++--
nifi-registry/nifi-registry-core/pom.xml | 2 +-
.../nifi-registry-ranger-plugin/pom.xml | 2 +-
nifi-registry/pom.xml | 17 +++++------------
7 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-client/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-client/pom.xml
index 973dea9..4ac382f 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-client/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-client/pom.xml
@@ -34,27 +34,27 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
- <version>${jersey.client.version}</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
- <version>${jersey.client.version}</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
- <version>${jersey.client.version}</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
- <version>${jersey.client.version}</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
- <version>${jersey.client.version}</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
index f1fcad6..7eb25c5 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
@@ -242,13 +242,13 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
+ <version>${org.bouncycastle.version}</version>
</dependency>
<!-- JGit depends on bcpg so declare a consistent version with our other bouncy castle deps -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
+ <version>${org.bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-properties/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-properties/pom.xml
index 32c5561..6458aec 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-properties/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-properties/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
+ <version>${org.bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.12</version>
+ <version>${org.slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-security-utils/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-security-utils/pom.xml
index aba0fbd..fbefb0e 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-security-utils/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-security-utils/pom.xml
@@ -26,12 +26,12 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
+ <version>${org.bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
+ <version>${org.bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/nifi-registry/nifi-registry-core/pom.xml b/nifi-registry/nifi-registry-core/pom.xml
index b15766c..a17ae5b 100644
--- a/nifi-registry/nifi-registry-core/pom.xml
+++ b/nifi-registry/nifi-registry-core/pom.xml
@@ -141,7 +141,7 @@
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
- <version>${jersey.server.version}</version>
+ <version>${jersey.version}</version>
</dependency>
<!-- open id connect - override transitive dependency version ranges -->
<dependency>
diff --git a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
index b96f1bf..864618f 100644
--- a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
+++ b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
@@ -208,7 +208,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.12</version>
+ <version>${org.slf4j.version}</version>
<scope>test</scope>
</dependency>
diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml
index e938f34..2a27126 100644
--- a/nifi-registry/pom.xml
+++ b/nifi-registry/pom.xml
@@ -90,24 +90,17 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<inceptionYear>2017</inceptionYear>
- <org.slf4j.version>1.7.30</org.slf4j.version>
- <jetty.version>9.4.38.v20210224</jetty.version>
<jax.rs.api.version>2.1</jax.rs.api.version>
- <jersey.server.version>2.29.1</jersey.server.version>
- <jersey.client.version>2.28</jersey.client.version>
- <jackson.version>2.12.2</jackson.version>
<spring.boot.version>2.2.6.RELEASE</spring.boot.version>
- <spring.security.version>5.1.9.RELEASE</spring.security.version>
+ <spring.security.version>5.4.6</spring.security.version>
<flyway.version>6.5.7</flyway.version>
<flyway.tests.version>6.4.0</flyway.tests.version>
<swagger.ui.version>3.12.0</swagger.ui.version>
<testcontainers.version>1.15.1</testcontainers.version>
<h2.version>1.4.199</h2.version>
- <groovy.version>2.5.4</groovy.version>
<groovy.eclipse.compiler.version>3.4.0-01</groovy.eclipse.compiler.version>
<jaxb.version>2.3.2</jaxb.version>
<jgit.version>5.8.1.202007141445-r</jgit.version>
- <bouncycastle.version>1.68</bouncycastle.version>
</properties>
<repositories>
@@ -351,7 +344,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-test</artifactId>
- <version>${groovy.version}</version>
+ <version>${nifi.groovy.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -403,7 +396,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.18</version>
+ <version>${surefire.version}</version>
<configuration>
<systemPropertyVariables>
<java.awt.headless>true</java.awt.headless>
@@ -423,7 +416,7 @@
<!-- Force surefire to use JUnit -->
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
- <version>2.18</version>
+ <version>${surefire.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -559,7 +552,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-batch</artifactId>
- <version>${groovy.version}-01</version>
+ <version>${nifi.groovy.version}-01</version>
</dependency>
</dependencies>
</plugin>