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

chore: update swing-kit 2.1.0 (#4351) #4353

Merged
merged 3 commits into from
Jul 24, 2023
Merged

chore: update swing-kit 2.1.0 (#4351) #4353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf98a47
chore: update swing-kit 2.1.0 (#4351)
ZheSun88 Jul 21, 2023
78ce664
Update pom.xml
ZheSun88 Jul 21, 2023
ae4e25c
Merge branch '24.1' into swing-vaadin-2.1.0-24.1
ZheSun88 Jul 24, 2023
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: 8 additions & 2 deletions scripts/generateAndCheckSBOM.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,20 @@ const licenseWhiteList = [
VAADIN_LICENSE,
'https://www.highcharts.com/license',
'http://www.gnu.org/licenses/lgpl-3.0.html',
'CC-BY-3.0'
'CC-BY-3.0',
'http://oss.sgi.com/projects/FreeB',
'Apache-1.1',
'http://font.ubuntu.com/ufl/ubuntu-font-licence-1.0.txt',
'http://www.spdx.org/licenses/BSD-4-Clause'
];

const cveWhiteList = {
// Check fix in vaadin-testbench/pom.xml, and update when Selenium is fixed
// 'pkg:maven/com.google.guava/[email protected]': ['CVE-2020-8908', 'CVE-2023-2976']
// exclude jackson-databind:2.15.2, as https://github.com/jeremylong/DependencyCheck/issues/5779
'pkg:maven/com.fasterxml.jackson.core/[email protected]': ['CVE-2023-35116']
'pkg:maven/com.fasterxml.jackson.core/[email protected]': ['CVE-2023-35116'],
// false report from owasp, the CVEs are regarding flow-server and vaadin-text-field-flow with bad version range
'pkg:maven/com.vaadin/[email protected]': ['CVE-2021-31411', 'CVE-2020-36321', 'CVE-2021-31405', 'CVE-2021-31407', 'CVE-2021-31412', 'CVE-2021-31404', 'CVE-2021-33604']
}

const STYLE = `<style>
Expand Down
32 changes: 13 additions & 19 deletions vaadin-platform-sbom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,26 +61,20 @@
<groupId>com.vaadin</groupId>
<artifactId>observability-kit-starter</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-swing-kit-flow</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-swing-kit-client</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-swing-kit-client-api</artifactId>
</dependency>
</dependencies>
<profiles>
<profile>
<!-- temporary excluding these dependencies since spring and text-field deps are wrong -->
<id>swing</id>
<dependencies>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-swing-kit-flow</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-swing-kit-client</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-swing-kit-client-api</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<id>production</id>
<build>
Expand Down Expand Up @@ -112,4 +106,4 @@
</dependencies>
</profile>
</profiles>
</project>
</project>
2 changes: 1 addition & 1 deletion versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@
"jsVersion": "2.1.0"
},
"swing-kit": {
"javaVersion": "2.0.0"
"javaVersion": "2.1.0"
},
"vaadin-collaboration-engine": {
"javaVersion": "6.0.0"
Expand Down