Skip to content

Commit

Permalink
Revert most changes, we can address in next version of blueprint
Browse files Browse the repository at this point in the history
  • Loading branch information
mraible committed Aug 17, 2023
1 parent 78b8985 commit 9946d70
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion generators/server/generator.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export default class extends extendGenerator(ServerGenerator) {
this.GRADLE_VERSION = mnConstants.GRADLE_VERSION;
this.DOCKER_REDIS = mnConstants.DOCKER_REDIS;
this.DOCKER_CONSUL_CONFIG_LOADER = 'jhipster/consul-config-loader:v0.4.1'; // overrides jhipster value until main generator is updated
this.JHIPSTER_DEPENDENCIES_VERSION = '7.9.3';
this.JHIPSTER_DEPENDENCIES_VERSION = '3.9.1';
},
};
}
Expand Down
4 changes: 2 additions & 2 deletions generators/server/templates/build.gradle.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -501,8 +501,8 @@ dependencies {
implementation "io.springfox:springfox-bean-validators"
<%_ } _%>
<%_ if (devDatabaseType === 'mysql' || prodDatabaseType === 'mysql') { _%>
implementation "com.mysql:mysql-connector-j"
liquibaseRuntime "com.mysql:mysql-connector-j"
implementation "mysql:mysql-connector-java"
liquibaseRuntime "mysql:mysql-connector-java"
<%_ } _%>
<%_ if (devDatabaseType === 'postgresql' || prodDatabaseType === 'postgresql') { _%>
implementation "org.postgresql:postgresql"
Expand Down
12 changes: 6 additions & 6 deletions generators/server/templates/pom.xml.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@ _%>
<%_
if (devDatabaseType === 'mysql' || prodDatabaseType === 'mysql') { _%>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<%_ } _%>
<%_ if (devDatabaseType === 'mariadb' || prodDatabaseType === 'mariadb') { _%>
Expand Down Expand Up @@ -1149,8 +1149,8 @@ if (devDatabaseType === 'postgresql' || prodDatabaseType === 'postgresql') { _%>
<%_
if (devDatabaseType === 'mysql') { _%>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<%_ } _%>
<%_
Expand Down Expand Up @@ -1259,8 +1259,8 @@ if (devDatabaseType === 'postgresql' || prodDatabaseType === 'postgresql') { _%>
<%_
if (prodDatabaseType === 'mysql') { _%>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<%_ } _%>
<%_
Expand Down

0 comments on commit 9946d70

Please sign in to comment.