generator-jhipster 7.6.0 → 7.8.1

package/generators/java/index.cjs

@@ -19,6 +19,7 @@
 /* eslint-disable consistent-return */
 const chalk = require('chalk');
 const { generateMixedChain } = require('../../lib/support/mixin.cjs');
+const GeneratorBaseEntity = require('../generator-base-entities.cjs');
 const {
   INITIALIZING_PRIORITY,
   PROMPTING_PRIORITY,
@@ -26,10 +27,15 @@ const {
   COMPOSING_PRIORITY,
   LOADING_PRIORITY,
   PREPARING_PRIORITY,
+  CONFIGURING_EACH_ENTITY_PRIORITY,
+  PREPARING_EACH_ENTITY_PRIORITY,
+  PREPARING_EACH_ENTITY_FIELD_PRIORITY,
+  PREPARING_EACH_ENTITY_RELATIONSHIP_PRIORITY,
   WRITING_PRIORITY,
+  WRITING_ENTITIES_PRIORITY,
 } = require('../../lib/constants/priorities.cjs');
 
-const { GENERATOR_JAVA } = require('../generator-list');
+const { GENERATOR_JAVA, GENERATOR_BOOTSTRAP_APPLICATION } = require('../generator-list');
 const {
   PACKAGE_NAME,
   PACKAGE_NAME_DEFAULT_VALUE,
@@ -42,7 +48,7 @@ const {
 const { files } = require('./files.cjs');
 const { dependencyChain } = require('./mixin.cjs');
 
-const MixedChain = generateMixedChain(GENERATOR_JAVA);
+const MixedChain = generateMixedChain(GeneratorBaseEntity, GENERATOR_JAVA);
 
 module.exports = class extends MixedChain {
   constructor(args, options, features) {
@@ -64,6 +70,11 @@ module.exports = class extends MixedChain {
     }
   }
 
+  async _postConstruct() {
+    this.loadStoredAppOptions();
+    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+  }
+
   async _beforeQueue() {
     if (!this.fromBlueprint) {
       const configure = this.options.configure || !this.shouldComposeModular();
@@ -194,6 +205,42 @@ module.exports = class extends MixedChain {
     return this.preparing;
   }
 
+  get configuringEachEntity() {
+    return {};
+  }
+
+  get [CONFIGURING_EACH_ENTITY_PRIORITY]() {
+    if (this.delegateToBlueprint) return {};
+    return this.configuringEachEntity;
+  }
+
+  get preparingEachEntity() {
+    return {};
+  }
+
+  get [PREPARING_EACH_ENTITY_PRIORITY]() {
+    if (this.delegateToBlueprint) return {};
+    return this.preparingEachEntity;
+  }
+
+  get preparingEachEntityField() {
+    return {};
+  }
+
+  get [PREPARING_EACH_ENTITY_FIELD_PRIORITY]() {
+    if (this.delegateToBlueprint) return {};
+    return this.preparingEachEntityField;
+  }
+
+  get preparingEachEntityRelationship() {
+    return {};
+  }
+
+  get [PREPARING_EACH_ENTITY_RELATIONSHIP_PRIORITY]() {
+    if (this.delegateToBlueprint) return {};
+    return this.preparingEachEntityRelationship;
+  }
+
   get writing() {
     return {
       async writeFiles() {
@@ -208,6 +255,15 @@ module.exports = class extends MixedChain {
     return this.writing;
   }
 
+  get writingEntities() {
+    return {};
+  }
+
+  get [WRITING_ENTITIES_PRIORITY]() {
+    if (this.delegateToBlueprint) return {};
+    return this.writingEntities;
+  }
+
   /*
    * Start of local public API, blueprints may override to customize the generator behavior.
    */

package/generators/kubernetes/esm.mjs

@@ -16,6 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
-
-export default generator;
+export { default } from './index.js';

package/generators/kubernetes-helm/esm.mjs

@@ -16,6 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
-
-export default generator;
+export { default } from './index.js';

package/generators/kubernetes-knative/esm.mjs

@@ -16,6 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
-
-export default generator;
+export { default } from './index.js';

package/generators/languages/esm.mjs

@@ -16,6 +16,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
-
-export default generator;
+export { default } from './index.js';
+export { clientI18nFiles as files } from './files.js';

package/generators/languages/templates/src/test/resources/i18n/messages_fr.properties.ejs

@@ -1 +1,4 @@
-email.test.title=Activation de votre compte <%= baseName %>
+email.test.title=test title
+# Value used for English locale unit test in MailServiceIT
+# as this file is loaded instead of real file
+email.activation.title=Activation de votre compte <%= baseName %>

package/generators/maven/esm.mjs

@@ -0,0 +1,19 @@
+/**
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      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,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { default } from './index.cjs';

package/generators/maven/files.cjs

@@ -28,7 +28,6 @@ module.exports.files = {
         { file: 'mvnw.cmd', method: 'copy', noEjs: true },
         { file: '.mvn/wrapper/maven-wrapper.jar', method: 'copy', noEjs: true },
         { file: '.mvn/wrapper/maven-wrapper.properties', method: 'copy', noEjs: true },
-        { file: '.mvn/wrapper/MavenWrapperDownloader.java', method: 'copy', noEjs: true },
         'pom.xml.jhi',
       ],
     },

package/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,18 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

package/generators/maven/templates/mvnw

@@ -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
 #
-#    https://www.apache.org/licenses/LICENSE-2.0
+#    http://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
@@ -36,6 +36,10 @@
 
 if [ -z "$MAVEN_SKIP_RC" ] ; then
 
+  if [ -f /usr/local/etc/mavenrc ] ; then
+    . /usr/local/etc/mavenrc
+  fi
+
   if [ -f /etc/mavenrc ] ; then
     . /etc/mavenrc
   fi
@@ -145,7 +149,7 @@ if [ -z "$JAVACMD" ] ; then
       JAVACMD="$JAVA_HOME/bin/java"
     fi
   else
-    JAVACMD="`which java`"
+    JAVACMD="`\\unset -f command; \\command -v java`"
   fi
 fi
 
@@ -212,9 +216,9 @@ else
       echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
     fi
     if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+      jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
     else
-      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+      jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
     fi
     while IFS="=" read key value; do
       case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
@@ -233,9 +237,9 @@ else
           echo "Found wget ... using wget"
         fi
         if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget "$jarUrl" -O "$wrapperJarPath"
+            wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
         else
-            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
         fi
     elif command -v curl > /dev/null; then
         if [ "$MVNW_VERBOSE" = true ]; then
@@ -305,6 +309,8 @@ WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
 exec "$JAVACMD" \
   $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
   -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  "-Dmaven.home=${M2_HOME}" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
   ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

package/generators/maven/templates/mvnw.cmd

@@ -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    https://www.apache.org/licenses/LICENSE-2.0
+@REM    http://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
@@ -46,8 +46,8 @@ if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
 @REM Execute a user defined script before this one
 if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
 @REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
 :skipRcPre
 
 @setlocal
@@ -120,9 +120,9 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
 
-FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
     IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
 )
 
@@ -134,7 +134,7 @@ if exist %WRAPPER_JAR% (
     )
 ) else (
     if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
     )
     if "%MVNW_VERBOSE%" == "true" (
         echo Couldn't find %WRAPPER_JAR%, downloading it ...
@@ -158,7 +158,13 @@ if exist %WRAPPER_JAR% (
 @REM work with both Windows and non-Windows executions.
 set MAVEN_CMD_LINE_ARGS=%*
 
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+%MAVEN_JAVA_EXE% ^
+  %JVM_CONFIG_MAVEN_PROPS% ^
+  %MAVEN_OPTS% ^
+  %MAVEN_DEBUG_OPTS% ^
+  -classpath %WRAPPER_JAR% ^
+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
 if ERRORLEVEL 1 goto error
 goto end
 
@@ -168,15 +174,15 @@ set ERROR_CODE=1
 :end
 @endlocal & set ERROR_CODE=%ERROR_CODE%
 
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
 @REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
 :skipRcPost
 
 @REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
 
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
 
-exit /B %ERROR_CODE%
+cmd /C exit /B %ERROR_CODE%

package/generators/maven/templates/pom.xml.jhi.ejs

@@ -59,7 +59,7 @@
     <properties>
         <java.version><%= JAVA_VERSION %></java.version>
 
-        <compiler-plugin.version>3.8.1</compiler-plugin.version>
+        <compiler-plugin.version>3.9.0</compiler-plugin.version>
         <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
 <&- fragments.propertiesSection() -&>
     </properties>

package/generators/openapi-client/esm.mjs

@@ -16,6 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
-
-export default generator;
+export { default } from './index.js';

package/generators/openapi-client/index.js

@@ -21,8 +21,15 @@ const shelljs = require('shelljs');
 const chalk = require('chalk');
 
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
-const { INITIALIZING_PRIORITY, PROMPTING_PRIORITY, CONFIGURING_PRIORITY, WRITING_PRIORITY, POST_WRITING_PRIORITY } =
-  require('../../lib/constants/priorities.cjs').compat;
+const {
+  INITIALIZING_PRIORITY,
+  PROMPTING_PRIORITY,
+  CONFIGURING_PRIORITY,
+  WRITING_PRIORITY,
+  POST_WRITING_PRIORITY,
+  INSTALL_PRIORITY,
+  END_PRIORITY,
+} = require('../../lib/constants/priorities.cjs').compat;
 
 const { GENERATOR_OPENAPI_CLIENT } = require('../generator-list');
 const { OpenAPIOptionsNames, OpenAPIDefaultValues } = require('../../jdl/jhipster/openapi-options');
@@ -152,7 +159,7 @@ module.exports = class extends BaseBlueprintGenerator {
     };
   }
 
-  install() {
+  get [INSTALL_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._install();
   }
@@ -165,7 +172,7 @@ module.exports = class extends BaseBlueprintGenerator {
     };
   }
 
-  end() {
+  get [END_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._end();
   }

package/generators/openshift/esm.mjs

@@ -16,6 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
-
-export default generator;
+export { default } from './index.js';

package/generators/page/esm.mjs

@@ -16,6 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
-
-export default generator;
+export { default } from './index.js';

package/generators/project-name/esm.mjs

@@ -0,0 +1,19 @@
+/**
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      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,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { default } from './index.cjs';

package/generators/server/cleanup.js

@@ -8,6 +8,10 @@
  * @param {string} mainResourceDir - Main resources directory
  * @param {string} testResourceDir - Test resources directory
  */
+const { CASSANDRA, MONGODB } = require('../../jdl/jhipster/database-types');
+const { ELASTICSEARCH } = require('../../jdl/jhipster/search-engine-types');
+const { KAFKA } = require('../../jdl/jhipster/message-broker-types');
+
 function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir) {
   if (generator.isJhipsterVersionLessThan('3.5.0')) {
     generator.removeFile(`${javaDir}domain/util/JSR310DateTimeSerializer.java`);
@@ -78,7 +82,7 @@ function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, tes
   }
   if (generator.isJhipsterVersionLessThan('5.8.0')) {
     generator.removeFile(`${javaDir}config/MetricsConfiguration.java`);
-    if (generator.databaseType === 'cassandra') {
+    if (generator.databaseType === CASSANDRA) {
       generator.removeFile(`${testResourceDir}cassandra-random-port.yml`);
     }
   }
@@ -125,7 +129,7 @@ function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, tes
     generator.removeFile(`${testDir}web/rest/AuditResourceIT.java`);
     generator.removeFile(`${testDir}repository/CustomAuditEventRepositoryIT.java`);
 
-    if (generator.databaseType === 'cassandra') {
+    if (generator.databaseType === CASSANDRA) {
       generator.removeFile(`${javaDir}config/metrics/package-info.java`);
       generator.removeFile(`${javaDir}config/metrics/CassandraHealthIndicator.java`);
       generator.removeFile(`${javaDir}config/metrics/JHipsterHealthIndicatorConfiguration.java`);
@@ -133,7 +137,7 @@ function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, tes
       generator.removeFile(`${javaDir}config/cassandra/CassandraConfiguration.java`);
       generator.removeFile(`${testDir}config/CassandraConfigurationIT.java`);
     }
-    if (generator.searchEngine === 'elasticsearch') {
+    if (generator.searchEngine === ELASTICSEARCH) {
       generator.removeFile(`${testDir}config/ElasticsearchTestConfiguration.java`);
     }
   }
@@ -144,6 +148,18 @@ function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, tes
     generator.removeFile(`${javaDir}config/apidocs/GatewaySwaggerResourcesProvider.java`);
     generator.removeFile(`${testDir}config/apidocs/GatewaySwaggerResourcesProviderTest.java`);
   }
+  if (generator.isJhipsterVersionLessThan('7.7.1')) {
+    if (generator.databaseType === MONGODB) {
+      generator.removeFile(`${testDir}MongoDbTestContainerExtension.java`);
+    }
+    generator.removeFile(`${testDir}TestContainersSpringContextCustomizerFactory.java`);
+    if (generator.databaseType === CASSANDRA) {
+      generator.removeFile(`${testDir}AbstractCassandraTest.java`);
+    }
+    if (generator.messageBroker === KAFKA) {
+      generator.removeFile(`${javaDir}config/KafkaProperties.java`);
+    }
+  }
 }
 
 module.exports = {

package/generators/server/esm.mjs

@@ -16,6 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
 
-export default generator;
+export { default } from './index.js';
+export { serverFiles as files } from './files.js';

package/generators/server/files-couchbase.js

@@ -41,30 +41,6 @@ const couchbaseFiles = {
     {
       path: SERVER_MAIN_SRC_DIR,
       templates: [
-        {
-          file: 'package/config/couchbase/CustomCouchbaseRepositoryFactory.java',
-          renameTo: generator => `${generator.javaDir}config/couchbase/CustomCouchbaseRepositoryFactory.java`,
-        },
-        {
-          file: 'package/config/couchbase/CustomCouchbaseRepositoryFactoryBean.java',
-          renameTo: generator => `${generator.javaDir}config/couchbase/CustomCouchbaseRepositoryFactoryBean.java`,
-        },
-        {
-          file: 'package/config/couchbase/CustomCouchbaseRepositoryQuery.java',
-          renameTo: generator => `${generator.javaDir}config/couchbase/CustomCouchbaseRepositoryQuery.java`,
-        },
-        {
-          file: 'package/config/couchbase/CustomN1qlQueryCreator.java',
-          renameTo: generator => `${generator.javaDir}config/couchbase/CustomN1qlQueryCreator.java`,
-        },
-        {
-          file: 'package/config/couchbase/CustomN1qlRepositoryQueryExecutor.java',
-          renameTo: generator => `${generator.javaDir}config/couchbase/CustomN1qlRepositoryQueryExecutor.java`,
-        },
-        {
-          file: 'package/config/couchbase/package-info.java',
-          renameTo: generator => `${generator.javaDir}config/couchbase/package-info.java`,
-        },
         {
           file: 'package/repository/JHipsterCouchbaseRepository.java',
           renameTo: generator => `${generator.javaDir}repository/JHipsterCouchbaseRepository.java`,
@@ -81,30 +57,41 @@ const couchbaseFiles = {
         },
       ],
     },
+    {
+      condition: generator => generator.searchEngine === COUCHBASE,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/repository/CouchbaseSearchRepository.java',
+          renameTo: generator => `${generator.javaDir}repository/CouchbaseSearchRepository.java`,
+        },
+      ],
+    },
     {
       condition: generator => generator.searchEngine === COUCHBASE,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
-          file: 'package/repository/JHipsterCouchbaseRepositoryTest.java',
-          renameTo: generator => `${generator.testDir}repository/JHipsterCouchbaseRepositoryTest.java`,
+          file: 'package/repository/CouchbaseSearchRepositoryTest.java',
+          renameTo: generator => `${generator.testDir}repository/CouchbaseSearchRepositoryTest.java`,
         },
       ],
     },
   ],
   serverResource: [
     {
+      condition: generator => !generator.skipUserManagement,
       path: SERVER_MAIN_RES_DIR,
-      templates: ['config/couchmove/changelog/V0__create_indexes.n1ql'],
+      templates: ['config/couchmove/changelog/V0__create_collections.n1ql', 'config/couchmove/changelog/V0.2__create_indexes.n1ql'],
     },
     {
       condition: generator => !generator.skipUserManagement || generator.authenticationType === OAUTH2,
       path: SERVER_MAIN_RES_DIR,
       templates: [
-        'config/couchmove/changelog/V0.1__initial_setup/ROLE_ADMIN.json',
-        'config/couchmove/changelog/V0.1__initial_setup/ROLE_USER.json',
-        'config/couchmove/changelog/V0.1__initial_setup/user__admin.json',
-        'config/couchmove/changelog/V0.1__initial_setup/user__user.json',
+        'config/couchmove/changelog/V0.1__initial_setup/authority/ROLE_ADMIN.json',
+        'config/couchmove/changelog/V0.1__initial_setup/authority/ROLE_USER.json',
+        'config/couchmove/changelog/V0.1__initial_setup/user/admin.json',
+        'config/couchmove/changelog/V0.1__initial_setup/user/user.json',
       ],
     },
   ],
@@ -136,6 +123,16 @@ function writeCouchbaseFiles() {
         this.removeFile(`${this.javaDir}repository/SearchCouchbaseRepository.java`);
         this.removeFile(`${this.testDir}repository/CustomCouchbaseRepositoryTest.java`);
       }
+
+      if (this.isJhipsterVersionLessThan('7.6.1')) {
+        this.removeFile(`${constants.SERVER_TEST_SRC_DIR}${this.testDir}repository/JHipsterCouchbaseRepositoryTest.java`);
+        this.removeFolder(`${constants.SERVER_MAIN_SRC_DIR}${this.javaDir}config/couchbase`);
+        this.removeFile(`${constants.SERVER_MAIN_RES_DIR}config/couchmove/changelog/V0__create_indexes.n1ql`);
+        this.removeFile(`${constants.SERVER_MAIN_RES_DIR}config/couchmove/changelog/V0.1__initial_setup/ROLE_ADMIN.json`);
+        this.removeFile(`${constants.SERVER_MAIN_RES_DIR}config/couchmove/changelog/V0.1__initial_setup/ROLE_USER.json`);
+        this.removeFile(`${constants.SERVER_MAIN_RES_DIR}config/couchmove/changelog/V0.1__initial_setup/user__admin.json`);
+        this.removeFile(`${constants.SERVER_MAIN_RES_DIR}config/couchmove/changelog/V0.1__initial_setup/user__user.json`);
+      }
     },
 
     async writeCouchbaseFiles() {