Merge pull request #3 from jhipster/master

Update fork

generators/ci-cd/templates/.gitlab-ci.yml.ejs

@@ -116,6 +116,7 @@ gradle-package:
     artifacts:
         paths:
             - build/libs/*.jar
+            - build/classes
         expire_in: 1 day
 
 # Uncomment the following line to use gitlabs container registry. You need to adapt the REGISTRY_URL in case you are not using gitlab.com
@@ -208,6 +209,7 @@ maven-package:
     artifacts:
         paths:
             - target/*.jar
+            - target/classes
         expire_in: 1 day
 
 # Uncomment the following line to use gitlabs container registry. You need to adapt the REGISTRY_URL in case you are not using gitlab.com

generators/entity-server/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.ejs

@@ -178,7 +178,7 @@
                     loadColumnType = 'string';
                 } else if (columnType === 'blob' || columnType === 'longblob') {
                     loadColumnType = 'blob';
-                } else if (columnType === 'clob') {
+                } else if (columnType === '${clobType}') {
                     loadColumnType = 'clob';
                 }
                 _%>

generators/entity-server/templates/src/main/resources/config/liquibase/data/table.csv.ejs

@@ -63,7 +63,6 @@ for (lineNb = 1; lineNb <= numberOfRows; lineNb++) {
     for (idx in fields) {
         let data = '';
         let columnType = fields[idx].columnType;
-        let fieldType = fields[idx].fieldType;
         if (columnType === 'integer'
             || columnType === 'bigint'
             || columnType === 'double'
@@ -135,9 +134,9 @@ for (lineNb = 1; lineNb <= numberOfRows; lineNb++) {
                 data = '';
             }
         }
-        if (fieldType === 'byte[]' && fields[idx].fieldTypeBlobContent !== 'text') {
+        if (columnType === 'blob' || columnType === 'longblob') {
             data = '../data/blob/hipster.png'
-        } else if (fieldType === 'byte[]' && fields[idx].fieldTypeBlobContent === 'text'){
+        } else if (columnType === '${clobType}'){
             data = '../data/blob/hipster.txt'
         }
 
@@ -184,7 +183,7 @@ for (lineNb = 1; lineNb <= numberOfRows; lineNb++) {
         }
 
         line.push(data);
-        if (fieldType === 'byte[]' && fields[idx].fieldTypeBlobContent !== 'text') {
+        if (columnType === 'blob' || columnType === 'longblob') {
             line.push('image/png');
         }
     }

generators/generator-constants.js

@@ -18,7 +18,7 @@
  */
 
 // version of docker images
-const DOCKER_JHIPSTER_REGISTRY = 'jhipster/jhipster-registry:v5.0.0';
+const DOCKER_JHIPSTER_REGISTRY = 'jhipster/jhipster-registry:v5.0.1';
 const DOCKER_JAVA_JRE = 'adoptopenjdk/openjdk11:alpine-jre';
 const DOCKER_MYSQL = 'mysql:8.0.16';
 const DOCKER_MARIADB = 'mariadb:10.4.4';

generators/server/templates/gradle/sonar.gradle.ejs

@@ -21,6 +21,9 @@ jacoco {
 }
 
 jacocoTestReport {
+    executionData tasks.withType(Test)
+    classDirectories = files(sourceSets.main.output.classesDirs)
+    sourceDirectories = files(sourceSets.main.java.srcDirs)
     reports {
         xml.enabled true
     }

generators/server/templates/src/main/java/package/config/ElasticsearchConfiguration.java.ejs

@@ -64,16 +64,22 @@ public class ElasticsearchConfiguration {
     @Primary
     public ElasticsearchOperations elasticsearchTemplate(final JestClient jestClient,
                                                          final ElasticsearchConverter elasticsearchConverter,
+        <%_ if (databaseType !== 'mongodb') { _%>
                                                          final SimpleElasticsearchMappingContext simpleElasticsearchMappingContext,
+        <%_ } _%>
                                                          EntityMapper mapper) {
+        <%_ if (databaseType === 'mongodb') { _%>
+        CustomElasticsearchMappingContext mappingContext = new CustomElasticsearchMappingContext();
+        <%_ } _%>
         return new JestElasticsearchTemplate(
             jestClient,
             <%_ if (databaseType === 'mongodb') { _%>
-            new MappingElasticsearchConverter(new CustomElasticsearchMappingContext()),
+            new MappingElasticsearchConverter(mappingContext),
+            new DefaultJestResultsMapper(mappingContext, mapper));
             <%_ } else { _%>
             elasticsearchConverter,
-            <%_ } _%>
             new DefaultJestResultsMapper(simpleElasticsearchMappingContext, mapper));
+            <%_ } _%>
     }
 
     public class CustomEntityMapper implements EntityMapper {

generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs

@@ -254,6 +254,10 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
             .antMatchers("/management/prometheus").permitAll()
             .antMatchers("/management/**").hasAuthority(AuthoritiesConstants.ADMIN)<%_ if (authenticationType === 'session') { %>;<% } %>
         <%_ if (authenticationType === 'jwt') { _%>
+            <%_ if (applicationType === 'monolith') { _%>
+        .and()
+            .httpBasic()
+            <%_ } _%>
         .and()
             .apply(securityConfigurerAdapter());
         <%_ } else if (authenticationType === 'oauth2') { _%>

generators/server/templates/src/main/resources/swagger/api.yml.ejs

@@ -22,6 +22,11 @@ openapi: "3.0.1"
 info:
     title: "<%= baseName %>"
     version: 0.0.1
+servers:
+    - url: http://localhost:<%= serverPort %>
+      description: Developpement server
+    - url: https://localhost:<%= serverPort %>
+      description: Developpement server with TLS Profile
 paths: {}
 <% if(authenticationType === 'jwt') { %>
 components:

test-integration/scripts/21-tests-backend.sh

@@ -8,7 +8,7 @@ source $(dirname $0)/00-init-env.sh
 #-------------------------------------------------------------------------------
 cd "$JHI_FOLDER_APP"
 if [ -f "mvnw" ]; then
-    ./mvnw enforcer:display-info
+    ./mvnw -ntp enforcer:display-info
 elif [ -f "gradlew" ]; then
     ./gradlew -v
 fi
@@ -17,7 +17,7 @@ fi
 # Check Javadoc generation
 #-------------------------------------------------------------------------------
 if [ -f "mvnw" ]; then
-    ./mvnw javadoc:javadoc
+    ./mvnw -ntp javadoc:javadoc
 elif [ -f "gradlew" ]; then
     ./gradlew javadoc
 fi
@@ -27,15 +27,15 @@ fi
 #-------------------------------------------------------------------------------
 if [[ "$JHI_APP" == *"uaa"* ]]; then
     cd "$JHI_FOLDER_UAA"
-    ./mvnw verify
+    ./mvnw -ntp verify
 fi
 
 #-------------------------------------------------------------------------------
 # Launch tests
 #-------------------------------------------------------------------------------
 cd "$JHI_FOLDER_APP"
 if [ -f "mvnw" ]; then
-    ./mvnw verify \
+    ./mvnw -ntp verify \
         -Dlogging.level.ROOT=OFF \
         -Dlogging.level.org.zalando=OFF \
         -Dlogging.level.io.github.jhipster=OFF \

test-integration/scripts/23-package.sh

@@ -8,7 +8,7 @@ source $(dirname $0)/00-init-env.sh
 #-------------------------------------------------------------------------------
 if [[ "$JHI_APP" == *"uaa"* ]]; then
     cd "$JHI_FOLDER_UAA"
-    ./mvnw verify -DskipTests -Pdev
+    ./mvnw -ntp verify -DskipTests -Pdev
     mv target/*.jar app.jar
 fi
 
@@ -26,7 +26,7 @@ fi
 # Package the application
 #-------------------------------------------------------------------------------
 if [ -f "mvnw" ]; then
-    ./mvnw verify -DskipTests -P"$JHI_PROFILE"
+    ./mvnw -ntp verify -DskipTests -P"$JHI_PROFILE"
     mv target/*.jar app.jar
 elif [ -f "gradlew" ]; then
     ./gradlew bootJar -P"$JHI_PROFILE" -x test
@@ -45,7 +45,7 @@ fi
 #-------------------------------------------------------------------------------
 if [ "$JHI_WAR" == 1 ]; then
     if [ -f "mvnw" ]; then
-        ./mvnw verify -DskipTests -P"$JHI_PROFILE",war
+        ./mvnw -ntp verify -DskipTests -P"$JHI_PROFILE",war
         mv target/*.war app.war
     elif [ -f "gradlew" ]; then
         ./gradlew bootWar -P"$JHI_PROFILE" -Pwar -x test

test-integration/scripts/25-sonar-analyze.sh

@@ -9,14 +9,14 @@ cd "$JHI_FOLDER_APP"
 
 if [[ "$JHI_APP" = "ngx-default" && "$TRAVIS_REPO_SLUG" = "jhipster/generator-jhipster" && "$TRAVIS_BRANCH" = "master" && "$TRAVIS_PULL_REQUEST" = "false" ]]; then
     echo "*** Sonar analyze for master branch"
-    ./mvnw initialize org.jacoco:jacoco-maven-plugin:prepare-agent sonar:sonar \
+    ./mvnw -ntp initialize org.jacoco:jacoco-maven-plugin:prepare-agent sonar:sonar \
         -Dsonar.host.url=https://sonarcloud.io \
         -Dsonar.projectKey=io.github.jhipster.sample:jhipster-sample-application \
         -Dsonar.login=$SONAR_TOKEN
 
 elif [[ $JHI_SONAR = 1 ]]; then
     echo "*** Sonar analyze locally"
-    ./mvnw initialize org.jacoco:jacoco-maven-plugin:prepare-agent sonar:sonar \
+    ./mvnw -ntp initialize org.jacoco:jacoco-maven-plugin:prepare-agent sonar:sonar \
         -Dsonar.host.url=http://localhost:9001 \
         -Dsonar.projectKey=JHipsterSonar