Skip to content

Commit

Permalink
BB-17760: Release manager activities (#26098)
Browse files Browse the repository at this point in the history
* BB-17760: Release manager activities
 - updated Jenkinsfile to use 4.1.x version
* Updated oro packages version to 4.1
* Updated dev.locks
  • Loading branch information
anyt authored Dec 10, 2019
1 parent cf1dc2e commit dcd8595
Show file tree
Hide file tree
Showing 3 changed files with 113 additions and 107 deletions.
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
}
],
"require": {
"oro/platform": "4.0.*",
"oro/platform-serialised-fields": "4.0.*",
"oro/calendar-bundle": "4.0.*",
"oro/marketing": "4.0.*",
"oro/customer-portal": "4.0.*",
"oro/platform": "4.1.*",
"oro/platform-serialised-fields": "4.1.*",
"oro/calendar-bundle": "4.1.*",
"oro/marketing": "4.1.*",
"oro/customer-portal": "4.1.*",
"box/spout": "2.7.*",
"myclabs/deep-copy": "1.8.*",
"npm-asset/grapesjs": "0.15.3-RC.2",
Expand Down Expand Up @@ -59,7 +59,7 @@
"require": "4.4.*"
},
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"autoload": {
Expand Down
12 changes: 6 additions & 6 deletions dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
}
],
"require": {
"oro/platform": "4.0.x-dev",
"oro/platform-serialised-fields": "4.0.x-dev",
"oro/calendar-bundle": "4.0.x-dev",
"oro/marketing": "4.0.x-dev",
"oro/customer-portal": "4.0.x-dev",
"oro/platform": "4.1.x-dev",
"oro/platform-serialised-fields": "4.1.x-dev",
"oro/calendar-bundle": "4.1.x-dev",
"oro/marketing": "4.1.x-dev",
"oro/customer-portal": "4.1.x-dev",
"box/spout": "2.7.*",
"myclabs/deep-copy": "1.8.*",
"npm-asset/grapesjs": "0.15.3-RC.2",
Expand Down Expand Up @@ -63,7 +63,7 @@
"require": "4.4.*"
},
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"autoload": {
Expand Down
Loading

0 comments on commit dcd8595

Please sign in to comment.