Skip to content

Commit 082b203

Browse files
committed
fix dep version refs #4831
1 parent bdffdaa commit 082b203

File tree

4 files changed

+4
-20
lines changed

4 files changed

+4
-20
lines changed

.github/ISSUE_TEMPLATE/release-plan.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ assignees: 'Guite, craigh'
2121
- [ ] Review whether there are changes required for install and/or upgrade docs
2222
- [ ] Update version in Kernel class and `/system` extensions: `bin/console rt:up 3.0 3.0.2-dev 3.0.2` (creates a pull request)
2323
- [ ] Update dependency versions for all `/system` and `/Zikula` subpackages to version of current release
24-
- `bin/console rt:set-deps 3.1 dev-main 3.1.0` (`dev-main` is current value, `3.1.0` is desired value)
24+
- `bin/console rt:set-deps 3.1 dev-3.1 3.1.0` (`dev-3.1` is current value, `3.1.0` is desired value)
2525
- [ ] Create/update vendor changelog
2626
- [ ] Ensure the `CHANGELOG-VENDORS-<branch>.md` file contains a `###PLACEHOLDER_FOR_VENDOR_UPDATES###` line below the `- Vendor updates:` line
2727
- [ ] Run `bin/console rt:vendor 3.0.1 3.0` whereby `3.0.1` is the last release tag and `3.0` the desired target branch (creates a pull request).
@@ -77,6 +77,6 @@ assignees: 'Guite, craigh'
7777
- [ ] increment version in Kernel class and `/system` extensions: `bin/console rt:up 3.0 3.0.2 3.0.3-dev` (creates a pull request)
7878
- [ ] increment version in VA extensions
7979
- [ ] Add new section to both changelogs (normal + vendor)
80-
- [ ] Reset zikula dependencies to `dev-main`
81-
- `bin/console rt:set-deps main 3.1.0 dev-main` (`3.1.0` is current value, `dev-main` is desired value)
80+
- [ ] Reset zikula dependencies to `dev-x.y`
81+
- `bin/console rt:set-deps main 3.1.0 dev-3.1` (`3.1.0` is current value, `dev-3.1` is desired value)
8282
- [ ] Merge to `main` branch

CHANGELOG-3.1.md

-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
# CHANGELOG - ZIKULA 3.1.x
22

3-
## 3.1.1 (unreleased)
4-
5-
- BC Breaks:
6-
- _there should be none_
7-
8-
- Fixes:
9-
- none yet
10-
11-
- Features:
12-
- _there should be none_
13-
143
## 3.1.0 (2021-12-21)
154

165
- BC Breaks:

CHANGELOG-VENDORS-3.1.md

-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
# CHANGELOG-VENDORS - ZIKULA 3.1.x
22

3-
## 3.1.1 VENDOR CHANGES (unreleased)
4-
5-
- Vendor updates:
6-
###PLACEHOLDER_FOR_VENDOR_UPDATES###
7-
83
## 3.1.0 VENDOR CHANGES (2021-12-21)
94

105
- Vendor updates:

src/system/SettingsModule/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"symfony/string": "^5.4",
3030
"symfony/validator": "^5.4",
3131
"php-translation/extractor": "2.*",
32-
"php-translation/symfony-bundle": "dev-extractor-service-definitions",
32+
"php-translation/symfony-bundle": "0.*",
3333
"php-translation/symfony-storage": "2.*",
3434

3535
"zikula/core-bundle": "3.1.0",

0 commit comments

Comments
 (0)