Skip to content

Commit bb20e53

Browse files
authored
Merge branch 'master' into renovate/major-typescript-eslint-monorepo
2 parents bf659bb + 80b5733 commit bb20e53

File tree

5 files changed

+182
-118
lines changed

5 files changed

+182
-118
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

apps/generator-cli/src/app/services/config.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export class ConfigService {
1111
public readonly configFile = path.resolve(this.cwd, 'openapitools.json')
1212

1313
private readonly defaultConfig = {
14-
$schema: 'node_modules/@openapitools/openapi-generator-cli/config.schema.json',
14+
$schema: './node_modules/@openapitools/openapi-generator-cli/config.schema.json',
1515
spaces: 2,
1616
'generator-cli': {
1717
version: undefined,

package.json

Lines changed: 2 additions & 7 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",
@@ -103,8 +98,8 @@
10398
"rxjs": "7.5.2"
10499
},
105100
"devDependencies": {
106-
"@commitlint/cli": "13.2.1",
107-
"@commitlint/config-conventional": "13.2.0",
101+
"@commitlint/cli": "16.2.3",
102+
"@commitlint/config-conventional": "16.2.1",
108103
"@nestjs/schematics": "8.0.5",
109104
"@nestjs/testing": "8.2.6",
110105
"@nrwl/eslint-plugin-nx": "12.10.1",

0 commit comments

Comments
 (0)