Skip to content

Commit

Permalink
Merge pull request #518 from mshima/v7.2.0
Browse files Browse the repository at this point in the history
Sync with v7.2.0
  • Loading branch information
pascalgrimaud authored Sep 28, 2021
2 parents 83fef45 + 196479f commit 7245ed5
Show file tree
Hide file tree
Showing 48 changed files with 9,974 additions and 16,469 deletions.
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx --no-install lint-staged
5 changes: 0 additions & 5 deletions .huskyrc

This file was deleted.

2 changes: 1 addition & 1 deletion .lintstagedrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
'{,src/**/,webpack/}*.{md,json,yml,html,js,ts,tsx,css,scss,java}': ['prettier --write'],
'{,src/**/,webpack/}*.{md,json,yml,html,cjs,mjs,js,ts,tsx,css,scss,java}': ['prettier --write'],
};
2 changes: 1 addition & 1 deletion .mvn/wrapper/MavenWrapperDownloader.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

9 changes: 7 additions & 2 deletions .yo-rc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"generator-jhipster": {
"jhipsterVersion": "7.1.0",
"jhipsterVersion": "7.2.0",
"baseName": "JHipsterRegistry",
"dasherizedBaseName": "jhipster-registry",
"humanizedBaseName": "JHipster Registry",
"projectDescription": "JHipster service registry, made with Netflix Eureka and Spring Cloud Config",
"packageName": "tech.jhipster.registry",
"packageFolder": "tech/jhipster/registry",
"serverPort": "8761",
Expand Down Expand Up @@ -56,6 +59,8 @@
"nativeLanguage": "en",
"languages": ["en", "fr"],
"reactive": false,
"devServerPort": 4200
"devServerPort": 4200,
"enableGradleEnterprise": false,
"entities": []
}
}
40 changes: 40 additions & 0 deletions .yo-resolve
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
.gitignore
npmw.cmd
mvnw.cmd
package.json
pom.xml
README.md
src/main/docker/app.yml
src/main/docker/jhipster-registry.yml
src/main/docker/jib/entrypoint.sh
src/main/resources/banner.txt
src/main/resources/config/application.yml
src/main/resources/config/application-dev.yml
src/main/resources/config/application-prod.yml
src/main/resources/config/bootstrap.yml
src/main/resources/config/bootstrap-prod.yml
src/main/java/tech/jhipster/registry/ApplicationWebXml.java
src/test/java/tech/jhipster/registry/IntegrationTest.java
src/main/java/tech/jhipster/registry/JHipsterRegistryApp.java
src/main/java/tech/jhipster/registry/config/ApplicationProperties.java
src/main/java/tech/jhipster/registry/config/LoggingConfiguration.java
src/main/java/tech/jhipster/registry/config/SecurityConfiguration.java
src/main/java/tech/jhipster/registry/security/SecurityUtils.java
src/main/java/tech/jhipster/registry/config/WebConfigurer.java
src/main/java/tech/jhipster/registry/web/rest/AccountResource.java
src/main/webapp/app/app.module.ts
src/main/webapp/app/app-routing.module.ts
src/main/webapp/app/config/font-awesome-icons.ts
src/main/webapp/app/core/auth/state-storage.service.ts
src/main/webapp/app/entities/entity-routing.module.ts
src/main/webapp/app/layouts/profiles/**
src/main/webapp/app/layouts/footer/**
src/main/webapp/app/layouts/main/**
src/main/webapp/app/layouts/navbar/**
src/main/webapp/app/home/**
src/main/webapp/app/shared/shared.module.ts
src/main/webapp/content/scss/global.scss
src/test/java/tech/jhipster/registry/web/rest/errors/ExceptionTranslatorIT.java
src/test/resources/config/application.yml
src/test/resources/logback.xml
webpack/proxy.conf.js
38 changes: 38 additions & 0 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Synching with generator-jhipster

JHipster Registry is generated with generator-jhipster.
The following is a base workflow to regenerate JHisper Registry using a new generator-jhipster release.

Update JHipster:

```
npm install generator-jhipster@latest
```

Regenerate non-customized files using latest jhipster:

```
jhipster --prefer-local --skip-install
```

Regenerate customized files and check for required changes (eg: package.json, pom.xml):

```
jhipster --prefer-local --skip-yo-resolve --skip-install
```

Manually commit required change and then cleanup changes:

```
git reset --hard
git clean -fd
```

Regenerate dependencies:

```
rm -rf node_modules package-lock.json
./npmw install
git add package-lock.json
git commit -m "Regenerate dependencies"
```
1 change: 0 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
"builder": "@angular-builders/custom-webpack:dev-server",
"options": {
"browserTarget": "jhipster-registry:build:development",
"proxyConfig": "./webpack/proxy.conf.js",
"port": 4200
},
"configurations": {
Expand Down
2 changes: 1 addition & 1 deletion mvnw
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
Expand Down
2 changes: 1 addition & 1 deletion mvnw.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
@REM "License"); you may not use this file except in compliance
@REM with the License. You may obtain a copy of the License at
@REM
@REM http://www.apache.org/licenses/LICENSE-2.0
@REM https://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
Expand Down
Loading

0 comments on commit 7245ed5

Please sign in to comment.