Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master into 7.x.x 2024-09-10 #1051

Merged
merged 13 commits into from
Sep 11, 2024
Merged

Merge master into 7.x.x 2024-09-10 #1051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
735d1bc
WW-5461 Extends UploadedFile with inputName field
lukaszlenart Sep 3, 2024
b04ad6b
Merge pull request #1040 from apache/fix/WW-5461-input-name
lukaszlenart Sep 6, 2024
0c69993
Bump maven-surefire-plugin.version from 3.4.0 to 3.5.0
dependabot[bot] Sep 9, 2024
efab3fc
Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
dependabot[bot] Sep 9, 2024
3111c4b
Bump org.apache.maven.plugins:maven-dependency-plugin
dependabot[bot] Sep 9, 2024
4c95983
Bump org.jfree:jfreechart from 1.5.4 to 1.5.5
dependabot[bot] Sep 9, 2024
280c3e4
Bump org.awaitility:awaitility from 4.2.1 to 4.2.2
dependabot[bot] Sep 9, 2024
9a06e7c
Merge pull request #1049 from apache/dependabot/maven/org.jfree-jfree…
lukaszlenart Sep 10, 2024
3d15504
Merge pull request #1046 from apache/dependabot/maven/maven-surefire-…
lukaszlenart Sep 10, 2024
c352fb5
Merge pull request #1047 from apache/dependabot/maven/org.assertj-ass…
lukaszlenart Sep 10, 2024
0f83b83
Merge pull request #1048 from apache/dependabot/maven/org.apache.mave…
lukaszlenart Sep 10, 2024
90f984c
Merge pull request #1050 from apache/dependabot/maven/org.awaitility-…
lukaszlenart Sep 10, 2024
514c52b
Merge branch 'master' into merge/master-to-7xx-2024-09-10
lukaszlenart Sep 10, 2024
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
2 changes: 1 addition & 1 deletion plugins/jfreechart/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<dependency>
<groupId>org.jfree</groupId>
<artifactId>jfreechart</artifactId>
<version>1.5.4</version>
<version>1.5.5</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
<jackson.version>2.17.2</jackson.version>
<log4j2.version>2.23.1</log4j2.version>
<maven-surefire-plugin.version>3.4.0</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
<mockito.version>5.8.0</mockito.version>
<ognl.version>3.3.5</ognl.version>
<sitemesh.version>2.5.0</sitemesh.version>
Expand Down Expand Up @@ -282,7 +282,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.1</version>
<version>3.8.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -722,7 +722,7 @@
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.2.1</version>
<version>4.2.2</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -910,7 +910,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.25.3</version>
<version>3.26.3</version>
<scope>test</scope>
</dependency>

Expand Down
Loading