Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
fangjian0423 authored Nov 14, 2024
2 parents a466e72 + 4fb8cda commit 0700981
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jhipster/jhipster:v8.7.1
FROM jhipster/jhipster:v8.7.3
USER jhipster
COPY --chown=jhipster:jhipster . /home/jhipster/jhipster-online/
RUN \
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jhonline",
"version": "2.33.1",
"version": "2.33.3",
"description": "JHipster Online is the best place to generate JHipster applications, with no installation required!",
"license": "Apache-2.0",
"keywords": [
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>io.github.jhipster.online</groupId>
<artifactId>jhonline</artifactId>
<version>2.33.1</version>
<version>2.33.3</version>
<packaging>war</packaging>
<name>Jhonline</name>

Expand Down Expand Up @@ -105,7 +105,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>1.17.3</version>
<version>1.20.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/config/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ spring:
name: jhonline
datasource:
type: com.zaxxer.hikari.HikariDataSource
url: jdbc:tc:mysql:8://localhost:3306/jhipster-online?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true
username: root
url: jdbc:tc:mysql:8.2.0:///jhipster-online?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true
username: test
password:
hikari:
poolName: Hikari
Expand Down

0 comments on commit 0700981

Please sign in to comment.