sb4: adjusts (#31854)

Author: mshima

generators/spring-boot/generator.ts

@@ -529,7 +529,7 @@ ${classProperties
         const getScopeForModule = (moduleName: SpringBootModule): JavaArtifactType['scope'] => {
           if (moduleName === 'spring-boot-properties-migrator') return 'runtime';
           if (moduleName === 'spring-boot-configuration-processor') return 'annotationProcessor';
-          return moduleName.endsWith('-test') ? 'test' : undefined;
+          return moduleName.endsWith('-test') || moduleName.includes('-test-') ? 'test' : undefined;
         };
         source.addSpringBootModule = (...moduleNames) =>
           source.addJavaDependencies?.(

generators/spring-boot/templates/src/main/java/_package_/config/WebConfigurer.java.ejs

@@ -19,7 +19,7 @@
 package <%= packageName %>.config;
 
 <%_ if (reactive) { _%>
-import com.fasterxml.jackson.databind.ObjectMapper;
+import <%= springBoot4 ? 'tools' : 'com.fasterxml' %>.jackson.databind.ObjectMapper;
 <%_ } _%>
 <%_ if (!skipClient || devDatabaseTypeH2Any) { _%>
 import tech.jhipster.config.JHipsterConstants;