Skip to content

Commit ee73ee8

Browse files
authored
Merge branch 'master' into fix/workspace-config-schema
2 parents eba54a7 + 8e84902 commit ee73ee8

File tree

4 files changed

+1329
-556
lines changed

4 files changed

+1329
-556
lines changed

.husky/commit-msg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
yarn commitlint --edit $1

apps/generator-cli/src/README.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,26 @@ Further it is also possible to configure generators, for example:
158158
If `openapi-generator-cli generate` is called without further arguments, then the configuration
159159
is automatically used to generate your code. 🎉
160160

161+
### Using custom / private maven registry
162+
163+
If you're using a private maven registry you can configure the `downloadUrl` and `queryUrl` like this:
164+
165+
```json
166+
{
167+
"$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
168+
"spaces": 2,
169+
"generator-cli": {
170+
"version": "5.3.0",
171+
"repository": {
172+
"queryUrl": "https://private.maven.intern/solrsearch/select?q=g:${group.id}+AND+a:${artifact.id}&core=gav&start=0&rows=200",
173+
"downloadUrl": "https://private.maven.intern/maven2/${groupId}/${artifactId}/${versionName}/${artifactId}-${versionName}.jar"
174+
}
175+
}
176+
}
177+
```
178+
179+
If the `version` property param is set it is not necessary to configure the `queryUrl`.
180+
161181

162182
##### Available placeholders
163183

package.json

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@
2929
"publishConfig": {
3030
"registry": "https://registry.npmjs.org"
3131
},
32-
"husky": {
33-
"hooks": {
34-
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
35-
}
36-
},
3732
"keywords": [
3833
"rest-api",
3934
"rest-client",
@@ -86,54 +81,54 @@
8681
}
8782
},
8883
"dependencies": {
89-
"@nestjs/common": "8.0.9",
90-
"@nestjs/core": "8.0.9",
91-
"@nestjs/platform-express": "8.0.9",
84+
"@nestjs/common": "8.2.6",
85+
"@nestjs/core": "8.2.6",
86+
"@nestjs/platform-express": "8.2.6",
9287
"@nuxtjs/opencollective": "0.3.2",
9388
"chalk": "4.1.2",
94-
"commander": "8.2.0",
89+
"commander": "8.3.0",
9590
"compare-versions": "3.6.0",
96-
"concurrently": "6.3.0",
91+
"concurrently": "6.5.1",
9792
"console.table": "0.10.0",
9893
"fs-extra": "10.0.0",
9994
"inquirer": "8.2.0",
10095
"jsonpath": "1.1.1",
10196
"lodash": "4.17.21",
10297
"reflect-metadata": "0.1.13",
103-
"rxjs": "7.4.0"
98+
"rxjs": "7.5.2"
10499
},
105100
"devDependencies": {
106-
"@commitlint/cli": "13.2.1",
107-
"@commitlint/config-conventional": "13.2.0",
108-
"@nestjs/schematics": "8.0.3",
109-
"@nestjs/testing": "8.0.9",
110-
"@nrwl/eslint-plugin-nx": "12.10.0",
111-
"@nrwl/jest": "12.10.0",
112-
"@nrwl/nest": "12.10.0",
113-
"@nrwl/node": "12.10.0",
114-
"@nrwl/workspace": "12.10.0",
101+
"@commitlint/cli": "16.2.3",
102+
"@commitlint/config-conventional": "16.2.1",
103+
"@nestjs/schematics": "8.0.5",
104+
"@nestjs/testing": "8.2.6",
105+
"@nrwl/eslint-plugin-nx": "12.10.1",
106+
"@nrwl/jest": "12.10.1",
107+
"@nrwl/nest": "12.10.1",
108+
"@nrwl/node": "12.10.1",
109+
"@nrwl/workspace": "12.10.1",
115110
"@semantic-release/changelog": "5.0.1",
116-
"@types/concurrently": "6.3.0",
111+
"@types/concurrently": "6.4.0",
117112
"@types/fs-extra": "9.0.13",
118-
"@types/inquirer": "8.1.3",
119-
"@types/jest": "27.0.2",
113+
"@types/inquirer": "8.2.0",
114+
"@types/jest": "27.4.0",
120115
"@types/jsonpath": "0.2.0",
121-
"@types/lodash": "4.14.175",
122-
"@types/node": "14.17.26",
116+
"@types/lodash": "4.14.178",
117+
"@types/node": "14.18.10",
123118
"@typescript-eslint/eslint-plugin": "4.33.0",
124119
"@typescript-eslint/parser": "4.33.0",
125-
"dotenv": "10.0.0",
120+
"dotenv": "16.0.0",
126121
"eslint": "7.32.0",
127122
"eslint-config-prettier": "8.3.0",
128-
"generate-package-json-webpack-plugin": "2.4.0",
129-
"husky": "7.0.2",
130-
"jest": "27.2.5",
131-
"prettier": "2.4.1",
123+
"generate-package-json-webpack-plugin": "2.6.0",
124+
"husky": "7.0.4",
125+
"jest": "27.4.7",
126+
"prettier": "2.5.1",
132127
"semantic-release": "17.4.7",
133-
"ts-jest": "27.0.5",
134-
"ts-node": "10.3.0",
128+
"ts-jest": "27.1.3",
129+
"ts-node": "10.4.0",
135130
"tslint": "6.1.3",
136-
"type-fest": "2.5.0",
137-
"typescript": "4.4.4"
131+
"type-fest": "2.11.1",
132+
"typescript": "4.5.5"
138133
}
139134
}

0 commit comments

Comments
 (0)