Skip to content

Commit ac58dda

Browse files
committed
automatic project update
1 parent 49778af commit ac58dda

24 files changed

+849
-795
lines changed

.huskyrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"hooks": {
3-
"pre-commit": "lint-staged"
3+
"pre-commit": "lint-staged"
44
}
55
}

.prettierignore

+4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
node_modules
22
target
3+
build
34
package-lock.json
45
.git
6+
.mvn
7+
gradle
8+
.gradle

.yo-rc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"testFrameworks": ["gatling", "protractor"],
1919
"languages": ["en"],
2020
"serverPort": 8080,
21-
"jhipsterVersion": "6.9.0",
21+
"jhipsterVersion": "6.9.1",
2222
"enableSocialSignIn": false,
2323
"useSass": true,
2424
"jhiPrefix": "jhi",

README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# jhipsterSampleApplicationReact
22

3-
This application was generated using JHipster 6.9.0, you can find documentation and help at [https://www.jhipster.tech/documentation-archive/v6.9.0](https://www.jhipster.tech/documentation-archive/v6.9.0).
3+
This application was generated using JHipster 6.9.1, you can find documentation and help at [https://www.jhipster.tech/documentation-archive/v6.9.1](https://www.jhipster.tech/documentation-archive/v6.9.1).
44

55
## Development
66

@@ -152,13 +152,13 @@ For more information refer to [Using Docker and Docker-Compose][], this page als
152152
To configure CI for your project, run the ci-cd sub-generator (`jhipster ci-cd`), this will let you generate configuration files for a number of Continuous Integration systems. Consult the [Setting up Continuous Integration][] page for more information.
153153

154154
[jhipster homepage and latest documentation]: https://www.jhipster.tech
155-
[jhipster 6.9.0 archive]: https://www.jhipster.tech/documentation-archive/v6.9.0
156-
[using jhipster in development]: https://www.jhipster.tech/documentation-archive/v6.9.0/development/
157-
[using docker and docker-compose]: https://www.jhipster.tech/documentation-archive/v6.9.0/docker-compose
158-
[using jhipster in production]: https://www.jhipster.tech/documentation-archive/v6.9.0/production/
159-
[running tests page]: https://www.jhipster.tech/documentation-archive/v6.9.0/running-tests/
160-
[code quality page]: https://www.jhipster.tech/documentation-archive/v6.9.0/code-quality/
161-
[setting up continuous integration]: https://www.jhipster.tech/documentation-archive/v6.9.0/setting-up-ci/
155+
[jhipster 6.9.1 archive]: https://www.jhipster.tech/documentation-archive/v6.9.1
156+
[using jhipster in development]: https://www.jhipster.tech/documentation-archive/v6.9.1/development/
157+
[using docker and docker-compose]: https://www.jhipster.tech/documentation-archive/v6.9.1/docker-compose
158+
[using jhipster in production]: https://www.jhipster.tech/documentation-archive/v6.9.1/production/
159+
[running tests page]: https://www.jhipster.tech/documentation-archive/v6.9.1/running-tests/
160+
[code quality page]: https://www.jhipster.tech/documentation-archive/v6.9.1/code-quality/
161+
[setting up continuous integration]: https://www.jhipster.tech/documentation-archive/v6.9.1/setting-up-ci/
162162
[node.js]: https://nodejs.org/
163163
[yarn]: https://yarnpkg.org/
164164
[webpack]: https://webpack.github.io/

package-lock.json

+821-739
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"uuid": "7.0.3"
3939
},
4040
"devDependencies": {
41+
"@openapitools/openapi-generator-cli": "1.0.13-4.3.1",
4142
"@types/chai": "4.2.11",
4243
"@types/enzyme": "3.10.5",
4344
"@types/jest": "25.2.1",
@@ -76,7 +77,7 @@
7677
"file-loader": "6.0.0",
7778
"fork-ts-checker-webpack-plugin": "4.1.3",
7879
"friendly-errors-webpack-plugin": "1.7.0",
79-
"generator-jhipster": "6.9.0",
80+
"generator-jhipster": "6.9.1",
8081
"html-webpack-plugin": "3.2.0",
8182
"husky": "4.2.5",
8283
"identity-obj-proxy": "3.0.0",
@@ -113,7 +114,6 @@
113114
"ts-node": "8.9.1",
114115
"typescript": "3.8.3",
115116
"webdriver-manager": "12.1.7",
116-
"@openapitools/openapi-generator-cli": "1.0.12-4.3.0",
117117
"webpack": "4.43.0",
118118
"webpack-cli": "3.3.11",
119119
"webpack-dev-server": "3.10.3",

pom.xml

+4-16
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<profile.tls />
4141

4242
<!-- Dependency versions -->
43-
<jhipster-dependencies.version>3.7.1</jhipster-dependencies.version>
43+
<jhipster-dependencies.version>3.8.0</jhipster-dependencies.version>
4444
<!-- The spring-boot version should match the one managed by
4545
https://mvnrepository.com/artifact/io.github.jhipster/jhipster-dependencies/${jhipster-dependencies.version} -->
4646
<spring-boot.version>2.2.7.RELEASE</spring-boot.version>
@@ -55,8 +55,8 @@
5555
<liquibase.version>3.9.0</liquibase.version>
5656
<liquibase-hibernate5.version>3.8</liquibase-hibernate5.version>
5757
<validation-api.version>2.0.1.Final</validation-api.version>
58-
<jaxb-runtime.version>2.3.2</jaxb-runtime.version>
59-
<archunit-junit5.version>0.13.1</archunit-junit5.version>
58+
<jaxb-runtime.version>2.3.3</jaxb-runtime.version>
59+
<archunit-junit5.version>0.14.1</archunit-junit5.version>
6060
<mapstruct.version>1.3.1.Final</mapstruct.version>
6161
<!-- Plugin versions -->
6262
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
@@ -75,7 +75,7 @@
7575
<frontend-maven-plugin.version>1.10.0</frontend-maven-plugin.version>
7676
<git-commit-id-plugin.version>4.0.0</git-commit-id-plugin.version>
7777
<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
78-
<jib-maven-plugin.version>2.2.0</jib-maven-plugin.version>
78+
<jib-maven-plugin.version>2.3.0</jib-maven-plugin.version>
7979
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
8080
<properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
8181
<sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
@@ -131,10 +131,6 @@
131131
<groupId>com.fasterxml.jackson.datatype</groupId>
132132
<artifactId>jackson-datatype-jsr310</artifactId>
133133
</dependency>
134-
<dependency>
135-
<groupId>com.fasterxml.jackson.module</groupId>
136-
<artifactId>jackson-module-afterburner</artifactId>
137-
</dependency>
138134
<dependency>
139135
<groupId>com.h2database</groupId>
140136
<artifactId>h2</artifactId>
@@ -152,14 +148,6 @@
152148
<groupId>com.zaxxer</groupId>
153149
<artifactId>HikariCP</artifactId>
154150
</dependency>
155-
<dependency>
156-
<groupId>commons-io</groupId>
157-
<artifactId>commons-io</artifactId>
158-
</dependency>
159-
<dependency>
160-
<groupId>org.apache.commons</groupId>
161-
<artifactId>commons-lang3</artifactId>
162-
</dependency>
163151
<dependency>
164152
<groupId>org.testcontainers</groupId>
165153
<artifactId>mysql</artifactId>

src/main/docker/monitoring.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
# grafana/provisioning/datasources/datasource.yml
1313
network_mode: 'host' # to test locally running service
1414
jhipstersampleapplicationreact-grafana:
15-
image: grafana/grafana:6.7.3
15+
image: grafana/grafana:7.0.1
1616
volumes:
1717
- ./grafana/provisioning/:/etc/grafana/provisioning/
1818
environment:

src/main/java/io/github/jhipster/sample/config/JacksonConfiguration.java

-9
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module;
44
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
55
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
6-
import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
76

87
import org.springframework.context.annotation.Bean;
98
import org.springframework.context.annotation.Configuration;
@@ -35,14 +34,6 @@ public Hibernate5Module hibernate5Module() {
3534
return new Hibernate5Module();
3635
}
3736

38-
/*
39-
* Jackson Afterburner module to speed up serialization/deserialization.
40-
*/
41-
@Bean
42-
public AfterburnerModule afterburnerModule() {
43-
return new AfterburnerModule();
44-
}
45-
4637
/*
4738
* Module for serialization/deserialization of RFC7807 Problem.
4839
*/

src/main/java/io/github/jhipster/sample/web/rest/BankAccountResource.java

-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ public ResponseEntity<BankAccountDTO> getBankAccount(@PathVariable Long id) {
124124
@DeleteMapping("/bank-accounts/{id}")
125125
public ResponseEntity<Void> deleteBankAccount(@PathVariable Long id) {
126126
log.debug("REST request to delete BankAccount : {}", id);
127-
128127
bankAccountRepository.deleteById(id);
129128
return ResponseEntity.noContent().headers(HeaderUtil.createEntityDeletionAlert(applicationName, true, ENTITY_NAME, id.toString())).build();
130129
}

src/main/java/io/github/jhipster/sample/web/rest/LabelResource.java

-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ public ResponseEntity<LabelDTO> getLabel(@PathVariable Long id) {
124124
@DeleteMapping("/labels/{id}")
125125
public ResponseEntity<Void> deleteLabel(@PathVariable Long id) {
126126
log.debug("REST request to delete Label : {}", id);
127-
128127
labelRepository.deleteById(id);
129128
return ResponseEntity.noContent().headers(HeaderUtil.createEntityDeletionAlert(applicationName, true, ENTITY_NAME, id.toString())).build();
130129
}

src/main/java/io/github/jhipster/sample/web/rest/OperationResource.java

-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ public ResponseEntity<OperationDTO> getOperation(@PathVariable Long id) {
138138
@DeleteMapping("/operations/{id}")
139139
public ResponseEntity<Void> deleteOperation(@PathVariable Long id) {
140140
log.debug("REST request to delete Operation : {}", id);
141-
142141
operationRepository.deleteById(id);
143142
return ResponseEntity.noContent().headers(HeaderUtil.createEntityDeletionAlert(applicationName, true, ENTITY_NAME, id.toString())).build();
144143
}

src/main/resources/config/application.yml

-3
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,6 @@ spring:
9595
basename: i18n/messages
9696
main:
9797
allow-bean-definition-overriding: true
98-
mvc:
99-
favicon:
100-
enabled: false
10198
task:
10299
execution:
103100
thread-name-prefix: jhipster-sample-application-react-task-

src/main/resources/config/liquibase/master.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.9.xsd">
66

77
<property name="now" value="now()" dbms="h2"/>
8-
<property name="now" value="now()" dbms="mysql"/>
8+
<property name="now" value="now()" dbms="mysql, mariadb"/>
99

1010
<property name="floatType" value="float4" dbms="postgresql, h2"/>
1111
<property name="floatType" value="float" dbms="mysql, oracle, mssql, mariadb"/>
0 Bytes
Binary file not shown.

src/main/resources/templates/error.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xsi:schemaLocation="http://www.thymeleaf.org" th:lang="${#locale.language}" lang="en">
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
6-
<link rel="shortcut icon" href="${baseUrl}/favicon.ico" />
6+
<link rel="icon" href="${baseUrl}/favicon.ico" />
77
<title>Your request cannot be processed</title>
88
<style>
99
::-moz-selection {

src/main/resources/templates/mail/activationEmail.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title th:text="#{email.activation.title}">JHipster activation</title>
55
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
6-
<link rel="shortcut icon" th:href="@{|${baseUrl}/favicon.ico|}" />
6+
<link rel="icon" th:href="@{|${baseUrl}/favicon.ico|}" />
77
</head>
88
<body>
99
<p th:text="#{email.activation.greeting(${user.login})}">

src/main/resources/templates/mail/creationEmail.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title th:text="#{email.activation.title}">JHipster creation</title>
55
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
6-
<link rel="shortcut icon" th:href="@{|${baseUrl}/favicon.ico|}" />
6+
<link rel="icon" th:href="@{|${baseUrl}/favicon.ico|}" />
77
</head>
88
<body>
99
<p th:text="#{email.activation.greeting(${user.login})}">

src/main/resources/templates/mail/passwordResetEmail.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title th:text="#{email.reset.title}">JHipster password reset</title>
55
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
6-
<link rel="shortcut icon" th:href="@{|${baseUrl}/favicon.ico|}" />
6+
<link rel="icon" th:href="@{|${baseUrl}/favicon.ico|}" />
77
</head>
88
<body>
99
<p th:text="#{email.reset.greeting(${user.login})}">

src/main/webapp/404.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>Page Not Found</title>
66
<meta name="viewport" content="width=device-width, initial-scale=1">
7-
<link rel="shortcut icon" href="favicon.ico" />
7+
<link rel="icon" href="favicon.ico" />
88
<style>
99

1010
* {

src/main/webapp/app/entities/bank-account/bank-account-update.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ export const BankAccountUpdate = (props: IBankAccountUpdateProps) => {
4848
...bankAccountEntity,
4949
...values,
5050
};
51-
entity.user = values.user;
5251

5352
if (isNew) {
5453
props.createEntity(entity);

src/main/webapp/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<meta name="google" content="notranslate">
1010
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
1111
<meta name="theme-color" content="#000000">
12-
<link rel="shortcut icon" href="favicon.ico" />
12+
<link rel="icon" href="favicon.ico" />
1313
<link rel="manifest" href="manifest.webapp" />
1414
<link rel="stylesheet" href="content/css/loading.css">
1515
<!-- jhipster-needle-add-resources-to-root - JHipster will add new resources here -->

src/test/java/io/github/jhipster/sample/web/rest/AccountResourceIT.java

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import io.github.jhipster.sample.web.rest.vm.KeyAndPasswordVM;
1313
import io.github.jhipster.sample.web.rest.vm.ManagedUserVM;
1414
import org.apache.commons.lang3.RandomStringUtils;
15-
1615
import org.junit.jupiter.api.BeforeEach;
1716
import org.junit.jupiter.api.Test;
1817
import org.springframework.beans.factory.annotation.Autowired;

src/test/resources/config/application.yml

-3
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ spring:
5555
allow-bean-definition-overriding: true
5656
messages:
5757
basename: i18n/messages
58-
mvc:
59-
favicon:
60-
enabled: false
6158
task:
6259
execution:
6360
thread-name-prefix: jhipster-sample-application-react-task-

0 commit comments

Comments
 (0)