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

Commit 2881e29

Browse files
thenatogthenatog
committed
NIFIREG-387 - Upgraded spring boot and some additional depedencies required to allow this upgrade.
NIFIREG-387 - Updated spring-security-ldap, the com.fasterxml.jackson versions. Updated NOTICE file. Signed-off-by: Nathan Gough <thenatog@gmail.com> This closes #277.
1 parent 6674e17 commit 2881e29

6 files changed

Lines changed: 24 additions & 24 deletions

File tree

  • nifi-registry-core
    • nifi-registry-client
    • nifi-registry-framework
    • nifi-registry-revision/nifi-registry-revision-spring-jdbc
    • nifi-registry-web-api/src/main/resources/META-INF
    • pom.xml
  • pom.xml

‎nifi-registry-core/nifi-registry-client/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,27 @@
3434
<dependency>
3535
<groupId>org.glassfish.jersey.core</groupId>
3636
<artifactId>jersey-client</artifactId>
37-
<version>${jersey.version}</version>
37+
<version>${jersey.client.version}</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>org.glassfish.jersey.media</groupId>
4141
<artifactId>jersey-media-json-jackson</artifactId>
42-
<version>${jersey.version}</version>
42+
<version>${jersey.client.version}</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>org.glassfish.jersey.inject</groupId>
4646
<artifactId>jersey-hk2</artifactId>
47-
<version>${jersey.version}</version>
47+
<version>${jersey.client.version}</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>org.glassfish.jersey.core</groupId>
5151
<artifactId>jersey-common</artifactId>
52-
<version>${jersey.version}</version>
52+
<version>${jersey.client.version}</version>
5353
</dependency>
5454
<dependency>
5555
<groupId>org.glassfish.jersey.media</groupId>
5656
<artifactId>jersey-media-multipart</artifactId>
57-
<version>${jersey.version}</version>
57+
<version>${jersey.client.version}</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>org.slf4j</groupId>

‎nifi-registry-core/nifi-registry-framework/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@
320320
<dependency>
321321
<groupId>com.fasterxml.jackson.core</groupId>
322322
<artifactId>jackson-databind</artifactId>
323-
<version>${jackson.databind.version}</version>
323+
<version>${jackson.version}</version>
324324
</dependency>
325325
<dependency>
326326
<groupId>com.fasterxml.jackson.core</groupId>

‎nifi-registry-core/nifi-registry-revision/nifi-registry-revision-spring-jdbc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>org.springframework</groupId>
3434
<artifactId>spring-jdbc</artifactId>
35-
<version>5.1.9.RELEASE</version>
35+
<version>5.2.5.RELEASE</version>
3636
</dependency>
3737
<!-- Test Deps -->
3838
<dependency>

‎nifi-registry-core/nifi-registry-web-api/src/main/resources/META-INF/NOTICE‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,16 +160,16 @@ The following binary components are provided under the Common Development and Di
160160
(CDDL 1.1) (GPL2 w/ CPE) javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:javax.inject:jar:2.4.0-b25 - https://hk2.java.net/external/javax.inject)
161161
(CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:jar:2.1 - https://jax-rs-spec.java.net)
162162
(CDDL 1.1) (GPL2 w/ CPE) javax.el (org.glassfish:javax.el:jar:3.0.1-b08 - https://github.com/javaee/el-spec)
163-
(CDDL 1.1) (GPL2 w/ CPE) jersey-bean-validation (org.glassfish.jersey.ext:jersey-bean-validation:jar:2.26 - https://jersey.github.io/)
164-
(CDDL 1.1) (GPL2 w/ CPE) jersey-client (org.glassfish.jersey.core:jersey-client:jar:2.26 - https://jersey.github.io/)
165-
(CDDL 1.1) (GPL2 w/ CPE) jersey-common (org.glassfish.jersey.core:jersey-common:jar:2.26 - https://jersey.github.io/)
166-
(CDDL 1.1) (GPL2 w/ CPE) jersey-container-servlet-core (org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.26 - https://jersey.github.io/)
167-
(CDDL 1.1) (GPL2 w/ CPE) jersey-entity-filtering (org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.26 - https://jersey.github.io/)
168-
(CDDL 1.1) (GPL2 w/ CPE) jersey-hk2 (org.glassfish.jersey.inject:jersey-hk2:jar:2.26 - https://jersey.github.io/)
169-
(CDDL 1.1) (GPL2 w/ CPE) jersey-media-jaxb (org.glassfish.jersey.media:jersey-media-jaxb:jar:2.26 - https://jersey.github.io/)
170-
(CDDL 1.1) (GPL2 w/ CPE) jersey-media-json-jackson (org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.26 - https://jersey.github.io/)
171-
(CDDL 1.1) (GPL2 w/ CPE) jersey-server (org.glassfish.jersey.core:jersey-server:jar:2.26 - https://jersey.github.io/)
172-
(CDDL 1.1) (GPL2 w/ CPE) jersey-spring4 (org.glassfish.jersey.ext:jersey-spring4:jar:2.26 - https://jersey.github.io/)
163+
(CDDL 1.1) (GPL2 w/ CPE) jersey-bean-validation (org.glassfish.jersey.ext:jersey-bean-validation:jar:2.29.1 - https://jersey.github.io/)
164+
(CDDL 1.1) (GPL2 w/ CPE) jersey-client (org.glassfish.jersey.core:jersey-client:jar:2.27 - https://jersey.github.io/)
165+
(CDDL 1.1) (GPL2 w/ CPE) jersey-common (org.glassfish.jersey.core:jersey-common:jar:2.29.1 - https://jersey.github.io/)
166+
(CDDL 1.1) (GPL2 w/ CPE) jersey-container-servlet-core (org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.29.1 - https://jersey.github.io/)
167+
(CDDL 1.1) (GPL2 w/ CPE) jersey-entity-filtering (org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.29.1 - https://jersey.github.io/)
168+
(CDDL 1.1) (GPL2 w/ CPE) jersey-hk2 (org.glassfish.jersey.inject:jersey-hk2:jar:2.27 - https://jersey.github.io/)
169+
(CDDL 1.1) (GPL2 w/ CPE) jersey-media-jaxb (org.glassfish.jersey.media:jersey-media-jaxb:jar:2.29.1 - https://jersey.github.io/)
170+
(CDDL 1.1) (GPL2 w/ CPE) jersey-media-json-jackson (org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.29.1 - https://jersey.github.io/)
171+
(CDDL 1.1) (GPL2 w/ CPE) jersey-server (org.glassfish.jersey.core:jersey-server:jar:2.29.1 - https://jersey.github.io/)
172+
(CDDL 1.1) (GPL2 w/ CPE) jersey-spring4 (org.glassfish.jersey.ext:jersey-spring4:jar:2.27 - https://jersey.github.io/)
173173
(CDDL 1.1) (GPL2 w/ CPE) OSGi resource locator bundle (org.glassfish.hk2:osgi-resource-locator:jar:1.0.1 - https://glassfish.org/osgi-resource-locator)
174174

175175
************************

‎nifi-registry-core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<dependency>
122122
<groupId>com.fasterxml.jackson.core</groupId>
123123
<artifactId>jackson-databind</artifactId>
124-
<version>${jackson.databind.version}</version>
124+
<version>${jackson.version}</version>
125125
</dependency>
126126
<dependency>
127127
<groupId>com.fasterxml.jackson.core</groupId>
@@ -141,7 +141,7 @@
141141
<dependency>
142142
<groupId>org.glassfish.jersey.media</groupId>
143143
<artifactId>jersey-media-multipart</artifactId>
144-
<version>${jersey.version}</version>
144+
<version>${jersey.server.version}</version>
145145
</dependency>
146146
</dependencies>
147147
</dependencyManagement>

‎pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@
9494
<org.slf4j.version>1.7.12</org.slf4j.version>
9595
<jetty.version>9.4.19.v20190610</jetty.version>
9696
<jax.rs.api.version>2.1</jax.rs.api.version>
97-
<jersey.version>2.27</jersey.version>
98-
<jackson.version>2.9.9</jackson.version>
99-
<jackson.databind.version>2.9.10.3</jackson.databind.version>
100-
<spring.boot.version>2.1.12.RELEASE</spring.boot.version>
101-
<spring.security.version>5.1.8.RELEASE</spring.security.version>
97+
<jersey.server.version>2.29.1</jersey.server.version>
98+
<jersey.client.version>2.27</jersey.client.version>
99+
<jackson.version>2.10.3</jackson.version>
100+
<spring.boot.version>2.2.6.RELEASE</spring.boot.version>
101+
<spring.security.version>5.1.9.RELEASE</spring.security.version>
102102
<flyway.version>5.2.4</flyway.version>
103103
<flyway.tests.version>5.1.0</flyway.tests.version>
104104
<swagger.ui.version>3.12.0</swagger.ui.version>

0 commit comments

Comments
 (0)
⚡