Skip to content

Commit 0f6913f

Browse files
authored
Merge branch 'OpenAPITools:master' into feat/env-variables
2 parents 13dc7c0 + 2cbc67f commit 0f6913f

File tree

6 files changed

+450
-402
lines changed

6 files changed

+450
-402
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v5
21+
uses: actions/checkout@v6
2222

2323
- name: Use Node.js ${{matrix.node-version }}
2424
uses: actions/setup-node@v6
@@ -42,7 +42,7 @@ jobs:
4242
cd dist/apps/generator-cli
4343
yarn pack -f ../package.tgz
4444
45-
- uses: actions/upload-artifact@v4
45+
- uses: actions/upload-artifact@v6
4646
with:
4747
name: package.tgz
4848
path: dist/apps/package.tgz
@@ -58,14 +58,14 @@ jobs:
5858

5959
steps:
6060
- name: Checkout
61-
uses: actions/checkout@v5
61+
uses: actions/checkout@v6
6262

6363
- name: Use Node.js ${{matrix.node-version }}
6464
uses: actions/setup-node@v6
6565
with:
6666
node-version: ${{matrix.node-version }}
6767

68-
- uses: actions/download-artifact@v5
68+
- uses: actions/download-artifact@v7
6969
with:
7070
name: package.tgz
7171

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v5
17+
uses: actions/checkout@v6
1818

1919
- name: Use Node.js ${{matrix.node-version }}
2020
uses: actions/setup-node@v6

apps/generator-cli/src/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,3 +309,4 @@ Please leave a star.
309309

310310

311311

312+

apps/generator-cli/src/app/services/version-manager.service.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,23 @@ export class VersionManagerService {
287287
}
288288

289289
versions : Version[] = [
290+
{
291+
version: '7.18.0',
292+
versionTags: [ '7.18.0', 'stable', 'latest' ],
293+
releaseDate: new Date("2025-12-22T06:24:58.285Z"),
294+
installed: false,
295+
downloadLink: 'https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.18.0/openapi-generator-cli-7.18.0.jar'
296+
},
297+
{
298+
version: '7.17.0',
299+
versionTags: [ '7.17.0', 'stable' ],
300+
releaseDate: new Date("2025-10-28T06:24:58.285Z"),
301+
installed: false,
302+
downloadLink: 'https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.17.0/openapi-generator-cli-7.17.0.jar'
303+
},
290304
{
291305
version: '7.16.0',
292-
versionTags: [ '7.16.0', 'stable', 'latest' ],
306+
versionTags: [ '7.16.0', 'stable' ],
293307
releaseDate: new Date("2025-09-28T06:24:58.285Z"),
294308
installed: false,
295309
downloadLink: 'https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.16.0/openapi-generator-cli-7.16.0.jar'

package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
},
2525
"repository": {
2626
"type": "git",
27-
"url": "https://github.com/OpenAPITools/openapi-generator-cli.git"
27+
"url": "git+https://github.com/OpenAPITools/openapi-generator-cli.git"
2828
},
2929
"publishConfig": {
3030
"registry": "https://registry.npmjs.org"
@@ -90,8 +90,8 @@
9090
"compare-versions": "6.1.1",
9191
"concurrently": "^9.0.0",
9292
"console.table": "0.10.0",
93-
"fs-extra": "11.3.2",
94-
"glob": "11.x",
93+
"fs-extra": "11.3.3",
94+
"glob": "13.x",
9595
"inquirer": "8.2.7",
9696
"jsonpath": "1.1.1",
9797
"proxy-agent": "^6.4.0",
@@ -100,40 +100,40 @@
100100
"tslib": "^2.3.0"
101101
},
102102
"devDependencies": {
103-
"@commitlint/cli": "20.1.0",
104-
"@commitlint/config-conventional": "20.0.0",
103+
"@commitlint/cli": "20.2.0",
104+
"@commitlint/config-conventional": "20.2.0",
105105
"@nestjs/schematics": "11.0.9",
106106
"@nestjs/testing": "^11.0.16",
107-
"@nx/eslint": "22.0.1",
108-
"@nx/eslint-plugin": "22.0.1",
109-
"@nx/jest": "22.0.1",
110-
"@nx/js": "22.0.1",
111-
"@nx/nest": "22.0.1",
112-
"@nx/node": "22.0.1",
113-
"@nx/webpack": "22.0.1",
114-
"@nx/workspace": "22.0.1",
107+
"@nx/eslint": "22.3.3",
108+
"@nx/eslint-plugin": "22.3.3",
109+
"@nx/jest": "22.3.3",
110+
"@nx/js": "22.3.3",
111+
"@nx/nest": "22.3.3",
112+
"@nx/node": "22.3.3",
113+
"@nx/webpack": "22.3.3",
114+
"@nx/workspace": "22.3.3",
115115
"@semantic-release/changelog": "6.0.3",
116116
"@types/fs-extra": "11.0.4",
117117
"@types/inquirer": "8.2.12",
118118
"@types/jest": "30.0.0",
119119
"@types/jsonpath": "0.2.4",
120-
"@types/node": "20.19.23",
120+
"@types/node": "20.19.27",
121121
"@typescript-eslint/eslint-plugin": "7.18.0",
122122
"@typescript-eslint/parser": "7.18.0",
123123
"dotenv": "17.2.3",
124-
"eslint": "9.38.0",
124+
"eslint": "9.39.2",
125125
"eslint-config-prettier": "^10.0.0",
126126
"generate-package-json-webpack-plugin": "2.6.0",
127127
"husky": "9.1.7",
128128
"jest": "30.2.0",
129129
"jest-environment-jsdom": "30.2.0",
130130
"jest-environment-node": "^30.0.0",
131-
"nx": "22.0.1",
132-
"prettier": "3.6.2",
131+
"nx": "22.3.3",
132+
"prettier": "3.7.4",
133133
"semantic-release": "24.2.9",
134-
"ts-jest": "29.4.5",
134+
"ts-jest": "29.4.6",
135135
"ts-node": "10.9.2",
136-
"type-fest": "5.1.0",
136+
"type-fest": "5.3.1",
137137
"typescript": "5.9.3",
138138
"jest-util": "30.2.0"
139139
}

0 commit comments

Comments
 (0)