Skip to content

Commit 349344c

Browse files
authored
NIFI-15858 Bump Spring to 7.0.7, Maven to 3.9.15, MySQL Binlog to 0.40.7, and others (#11161)
- Apache Maven from 3.9.14 to 3.9.15 - https://github.com/apache/maven/releases/tag/maven-3.9.15 - Box SDK from 5.6.0 to 5.7.0 - https://github.com/box/box-java-sdk/releases/tag/v5.7.0 - MySQL Binlog from 0.40.6 to 0.40.7 - https://github.com/debezium/mysql-binlog-connector-java/releases/tag/v0.40.7 - Spring Data Redis from 4.0.4 to 4.0.5 - https://github.com/spring-projects/spring-data-redis/releases/tag/4.0.5 - Spring LDAP Core from 4.0.2 to 4.0.3 - https://github.com/spring-projects/spring-ldap/releases/tag/4.0.3 - Spring Framework from 7.0.6 to 7.0.7 - https://github.com/spring-projects/spring-framework/releases/tag/v7.0.7 - Camel Salesforce from 4.18.1 to 4.19.0 - https://github.com/apache/camel/releases/tag/camel-4.19.0 - Javassist from 3.30.2-GA to 3.31.0-GA - https://github.com/jboss-javassist/javassist/releases/tag/rel_3_31_0_ga - AWS SDK from 2.42.34 to 2.42.36 - https://github.com/aws/aws-sdk-java-v2/blob/master/CHANGELOG.md - Jsoup from 1.22.1 to 1.22.2 - https://jsoup.org/news/release-1.22.2 Signed-off-by: David Handermann <exceptionfactory@apache.org>
1 parent bc098b0 commit 349344c

File tree

10 files changed

+14
-14
lines changed
  • .mvn/wrapper
  • nifi-extension-bundles
    • nifi-box-bundle
    • nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors
    • nifi-elasticsearch-bundle/nifi-elasticsearch-client-service
    • nifi-redis-bundle
    • nifi-salesforce-bundle/nifi-salesforce-processors
    • nifi-windows-event-log-bundle/nifi-windows-event-log-processors
  • nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/util
  • nifi-registry/nifi-registry-core/nifi-registry-framework

10 files changed

+14
-14
lines changed

.mvn/wrapper/maven-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.14/apache-maven-3.9.14-bin.zip
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip
1818
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar

nifi-extension-bundles/nifi-box-bundle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>com.box</groupId>
4141
<artifactId>box-java-sdk</artifactId>
42-
<version>5.6.0</version>
42+
<version>5.7.0</version>
4343
</dependency>
4444
</dependencies>
4545
</dependencyManagement>

nifi-extension-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ language governing permissions and limitations under the License. -->
3636
<dependency>
3737
<groupId>io.debezium</groupId>
3838
<artifactId>mysql-binlog-connector-java</artifactId>
39-
<version>0.40.6</version>
39+
<version>0.40.7</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>org.apache.commons</groupId>

nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
<dependency>
152152
<groupId>org.apache.maven</groupId>
153153
<artifactId>maven-artifact</artifactId>
154-
<version>3.9.14</version>
154+
<version>3.9.15</version>
155155
<scope>test</scope>
156156
</dependency>
157157
</dependencies>

nifi-extension-bundles/nifi-redis-bundle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<packaging>pom</packaging>
2626

2727
<properties>
28-
<spring.data.redis.version>4.0.4</spring.data.redis.version>
28+
<spring.data.redis.version>4.0.5</spring.data.redis.version>
2929
<jedis.version>7.4.1</jedis.version>
3030
</properties>
3131

nifi-extension-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>org.apache.camel</groupId>
4444
<artifactId>camel-salesforce</artifactId>
45-
<version>4.18.1</version>
45+
<version>4.19.0</version>
4646
<exclusions>
4747
<exclusion>
4848
<groupId>*</groupId>

nifi-extension-bundles/nifi-windows-event-log-bundle/nifi-windows-event-log-processors/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ language governing permissions and limitations under the License. -->
2222

2323
<properties>
2424
<jna.version>5.18.1</jna.version>
25-
<javassist.version>3.30.2-GA</javassist.version>
25+
<javassist.version>3.31.0-GA</javassist.version>
2626
</properties>
2727

2828
<build>

nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/util/ResponseBuilderUtilsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ class ResponseBuilderUtilsTest {
2626

2727
private static final String FILENAME_ASCII = "image.jpg";
2828

29-
private static final String DISPOSITION_ASCII = "attachment; filename=\"=?UTF-8?Q?%s?=\"; filename*=UTF-8''%s".formatted(FILENAME_ASCII, FILENAME_ASCII);
29+
private static final String DISPOSITION_ASCII = "attachment; filename=\"%s\"; filename*=UTF-8''%s".formatted(FILENAME_ASCII, FILENAME_ASCII);
3030

3131
private static final String FILENAME_SPACED = "image label.jpg";
3232

33-
private static final String DISPOSITION_ENCODED = "attachment; filename=\"=?UTF-8?Q?image_label.jpg?=\"; filename*=UTF-8''image%20label.jpg";
33+
private static final String DISPOSITION_ENCODED = "attachment; filename=\"image label.jpg\"; filename*=UTF-8''image%20label.jpg";
3434

3535
@Test
3636
void testSetContentDisposition() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
<dependency>
245245
<groupId>org.springframework.ldap</groupId>
246246
<artifactId>spring-ldap-core</artifactId>
247-
<version>4.0.2</version>
247+
<version>4.0.3</version>
248248
</dependency>
249249
<dependency>
250250
<groupId>org.springframework.security</groupId>

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<nifi.nar.maven.plugin.version>2.3.0</nifi.nar.maven.plugin.version>
123123

124124
<!-- CSPs SDK -->
125-
<software.amazon.awssdk.version>2.42.34</software.amazon.awssdk.version>
125+
<software.amazon.awssdk.version>2.42.36</software.amazon.awssdk.version>
126126
<software.amazon.encryption.s3.version>4.0.1</software.amazon.encryption.s3.version>
127127
<azure.sdk.bom.version>1.3.6</azure.sdk.bom.version> <!-- when changing this version, also update msal4j to the version that is required by azure-identity -->
128128

@@ -201,7 +201,7 @@
201201
<jetty.version>12.1.8</jetty.version>
202202
<servlet-api.version>6.1.0</servlet-api.version>
203203
<spring.security.version>7.0.4</spring.security.version>
204-
<spring.version>7.0.6</spring.version>
204+
<spring.version>7.0.7</spring.version>
205205
<swagger.annotations.version>2.2.48</swagger.annotations.version>
206206

207207
<!-- Testing and quality -->
@@ -605,7 +605,7 @@
605605
<dependency>
606606
<groupId>org.jsoup</groupId>
607607
<artifactId>jsoup</artifactId>
608-
<version>1.22.1</version>
608+
<version>1.22.2</version>
609609
</dependency>
610610
<dependency>
611611
<groupId>com.github.ben-manes.caffeine</groupId>
@@ -913,7 +913,7 @@
913913
</plugins>
914914
</requireSameVersions>
915915
<requireMavenVersion>
916-
<version>3.9.14</version>
916+
<version>3.9.15</version>
917917
</requireMavenVersion>
918918
<requireReleaseDeps>
919919
<message>Dependencies outside of Apache NiFi must not use SNAPSHOT versions</message>

0 commit comments

Comments
 (0)