Skip to content

Commit a7fa97b

Browse files
authored
Merge branch 'master' into mixed-support
2 parents 40dc34f + 6af8825 commit a7fa97b

File tree

14 files changed

+31
-32
lines changed

14 files changed

+31
-32
lines changed

ROADMAP.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
This roadmap defines our current view on how we will continue with the development of JSON Forms on a very coarse-grained level and is subject to change at any time:
44

5-
H2/2024
5+
H1/2025
66

77
- Improve adopter experience
8-
- Release 3.4
98

10-
H1/2025
9+
H2/2025
1110

1211
- Improve adopter experience
1312
- Release 4.0

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "3.5.0-beta.2",
2+
"version": "3.5.1",
33
"npmClient": "pnpm",
44
"useWorkspaces": true
55
}

packages/angular-material/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@jsonforms/angular-material",
3-
"version": "3.5.0-beta.2",
3+
"version": "3.5.1",
44
"description": "Material Renderer Set for Angular module of JSON Forms",
55
"repository": "https://github.com/eclipsesource/jsonforms",
66
"bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -68,8 +68,8 @@
6868
"@angular/material": "^18.0.0 || ^19.0.0",
6969
"@angular/platform-browser": "^18.0.0 || ^19.0.0",
7070
"@angular/router": "^18.0.0 || ^19.0.0",
71-
"@jsonforms/angular": "v3.5.0-beta.2",
72-
"@jsonforms/core": "v3.5.0-beta.2",
71+
"@jsonforms/angular": "3.5.1",
72+
"@jsonforms/core": "3.5.1",
7373
"dayjs": "^1.11.10",
7474
"rxjs": "^6.6.0 || ^7.4.0"
7575
},

packages/angular/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@jsonforms/angular",
3-
"version": "3.5.0-beta.2",
3+
"version": "3.5.1",
44
"description": "Angular module of JSON Forms",
55
"repository": "https://github.com/eclipsesource/jsonforms",
66
"bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -67,9 +67,9 @@
6767
"lodash": "^4.17.21"
6868
},
6969
"peerDependencies": {
70-
"@angular/core": "^18.0.0 | ^19.0.0",
71-
"@angular/forms": "^18.0.0 | ^19.0.0",
72-
"@jsonforms/core": "v3.5.0-beta.2",
70+
"@angular/core": "^18.0.0 || ^19.0.0",
71+
"@angular/forms": "^18.0.0 || ^19.0.0",
72+
"@jsonforms/core": "3.5.1",
7373
"rxjs": "^6.6.0 || ^7.4.0"
7474
},
7575
"devDependencies": {

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@jsonforms/core",
3-
"version": "3.5.0-beta.2",
3+
"version": "3.5.1",
44
"description": "Core module of JSON Forms",
55
"repository": "https://github.com/eclipsesource/jsonforms",
66
"bugs": "https://github.com/eclipsesource/jsonforms/issues",

packages/examples-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@jsonforms/examples-app",
3-
"version": "3.5.0-beta.2",
3+
"version": "3.5.1",
44
"private": true,
55
"license": "MIT",
66
"type": "module",

packages/examples-react/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@jsonforms/examples-react",
3-
"version": "3.5.0-beta.2",
3+
"version": "3.5.1",
44
"private": true,
55
"dependencies": {
66
"@jsonforms/core": "workspace:*",

packages/examples/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@jsonforms/examples",
3-
"version": "3.5.0-beta.2",
3+
"version": "3.5.1",
44
"description": "JSON Forms Example Data",
55
"repository": "https://github.com/eclipsesource/jsonforms",
66
"bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -47,7 +47,7 @@
4747
"lodash": "^4.17.21"
4848
},
4949
"peerDependencies": {
50-
"@jsonforms/core": "v3.5.0-beta.2"
50+
"@jsonforms/core": "3.5.1"
5151
},
5252
"devDependencies": {
5353
"@jsonforms/core": "workspace:*",

packages/material-renderers/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@jsonforms/material-renderers",
3-
"version": "3.5.0-beta.2",
3+
"version": "3.5.1",
44
"description": "Material Renderer Set for JSON Forms",
55
"repository": "https://github.com/eclipsesource/jsonforms",
66
"bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -86,8 +86,8 @@
8686
"peerDependencies": {
8787
"@emotion/react": "^11.4.1",
8888
"@emotion/styled": "^11.3.0",
89-
"@jsonforms/core": "v3.5.0-beta.2",
90-
"@jsonforms/react": "v3.5.0-beta.2",
89+
"@jsonforms/core": "3.5.1",
90+
"@jsonforms/react": "3.5.1",
9191
"@mui/icons-material": "^5.11.16 || ^6.0.0",
9292
"@mui/material": "^5.13.0 || ^6.0.0",
9393
"@mui/x-date-pickers": "^6.0.0 || ^7.0.0",

packages/react/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@jsonforms/react",
3-
"version": "3.5.0-beta.2",
3+
"version": "3.5.1",
44
"description": "React module of JSON Forms",
55
"repository": "https://github.com/eclipsesource/jsonforms",
66
"bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -86,7 +86,7 @@
8686
"lodash": "^4.17.21"
8787
},
8888
"peerDependencies": {
89-
"@jsonforms/core": "v3.5.0-beta.2",
89+
"@jsonforms/core": "3.5.1",
9090
"react": "^16.12.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
9191
},
9292
"optionalPeerDependencies": {

0 commit comments

Comments
 (0)