Skip to content
This repository has been archived by the owner on Jul 22, 2021. It is now read-only.

NIFIREG-387 - Upgraded spring boot and some additional depedencies re… #277

Closed
wants to merge 2 commits into from
Closed

NIFIREG-387 - Upgraded spring boot and some additional depedencies re… #277

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f7f1c1
NIFIREG-387 - Upgraded spring boot and some additional depedencies re…
thenatog Apr 17, 2020
7ef558c
NIFIREG-387 - Updated spring-security-ldap, the com.fasterxml.jackson…
thenatog Apr 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions nifi-registry-core/nifi-registry-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,27 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
<version>${jersey.client.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
<version>${jersey.client.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey.version}</version>
<version>${jersey.client.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<version>${jersey.version}</version>
<version>${jersey.client.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey.version}</version>
<version>${jersey.client.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
2 changes: 1 addition & 1 deletion nifi-registry-core/nifi-registry-revision/nifi-registry-revision-spring-jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>5.1.9.RELEASE</version>
<version>5.2.5.RELEASE</version>
</dependency>
<!-- Test Deps -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion nifi-registry-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey.version}</version>
<version>${jersey.server.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
5 changes: 3 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,11 @@
<org.slf4j.version>1.7.12</org.slf4j.version>
<jetty.version>9.4.19.v20190610</jetty.version>
<jax.rs.api.version>2.1</jax.rs.api.version>
<jersey.version>2.27</jersey.version>
<jersey.server.version>2.29.1</jersey.server.version>
<jersey.client.version>2.27</jersey.client.version>
<jackson.version>2.9.9</jackson.version>
<jackson.databind.version>2.9.10.3</jackson.databind.version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like jackson can go to 2.10.3. also not sure why we are at separate versions for jackson and jackson databank

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to 2.10.3 and removed the jackson.databind.version parameter and changed all dependencies to use only jackson.version.

<spring.boot.version>2.1.12.RELEASE</spring.boot.version>
<spring.boot.version>2.2.6.RELEASE</spring.boot.version>
<spring.security.version>5.1.8.RELEASE</spring.security.version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems like spring security can be bumped to along with the new version of spring-framework, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to 5.1.9.RELEASE.

<flyway.version>5.2.4</flyway.version>
<flyway.tests.version>5.1.0</flyway.tests.version>
Expand Down