lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-09-20 02:29:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix package tangle

Browse Source 
Closes gh-992
This commit is contained in:
Stephane Nicoll
2019-08-23 11:36:22 +02:00
parent ddd609c639
commit c2886679d6
2 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/BuildProjectGenerationConfiguration.java
View File

@@ -20,20 +20,12 @@ import io.spring.initializr.generator.buildsystem.Build;
import io.spring.initializr.generator.buildsystem.Dependency; import io.spring.initializr.generator.buildsystem.Dependency;
import io.spring.initializr.generator.buildsystem.Dependency.Exclusion; import io.spring.initializr.generator.buildsystem.Dependency.Exclusion;
import io.spring.initializr.generator.buildsystem.DependencyScope; import io.spring.initializr.generator.buildsystem.DependencyScope;
import io.spring.initializr.generator.buildsystem.gradle.GradleBuildSystem;
import io.spring.initializr.generator.buildsystem.maven.MavenBuildSystem;
import io.spring.initializr.generator.condition.ConditionalOnBuildSystem;
import io.spring.initializr.generator.condition.ConditionalOnLanguage;
import io.spring.initializr.generator.condition.ConditionalOnPackaging; import io.spring.initializr.generator.condition.ConditionalOnPackaging;
import io.spring.initializr.generator.condition.ConditionalOnPlatformVersion; import io.spring.initializr.generator.condition.ConditionalOnPlatformVersion;
import io.spring.initializr.generator.language.kotlin.KotlinLanguage;
import io.spring.initializr.generator.packaging.war.WarPackaging; import io.spring.initializr.generator.packaging.war.WarPackaging;
import io.spring.initializr.generator.project.ProjectGenerationConfiguration; import io.spring.initializr.generator.project.ProjectGenerationConfiguration;
import io.spring.initializr.generator.project.ResolvedProjectDescription; import io.spring.initializr.generator.project.ResolvedProjectDescription;
import io.spring.initializr.generator.spring.build.maven.DefaultMavenBuildCustomizer; import io.spring.initializr.generator.spring.build.maven.DefaultMavenBuildCustomizer;
import io.spring.initializr.generator.spring.code.kotlin.KotlinJpaGradleBuildCustomizer;
import io.spring.initializr.generator.spring.code.kotlin.KotlinJpaMavenBuildCustomizer;
import io.spring.initializr.generator.spring.code.kotlin.KotlinProjectSettings;
import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.InitializrMetadata;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@@ -91,21 +83,6 @@ public class BuildProjectGenerationConfiguration {
return new WarPackagingWebStarterBuildCustomizer(metadata); return new WarPackagingWebStarterBuildCustomizer(metadata);
} }
@Bean
@ConditionalOnLanguage(KotlinLanguage.ID)
@ConditionalOnBuildSystem(GradleBuildSystem.ID)
public KotlinJpaGradleBuildCustomizer kotlinJpaGradleBuildCustomizer(InitializrMetadata metadata,
KotlinProjectSettings settings) {
return new KotlinJpaGradleBuildCustomizer(metadata, settings);
}
@Bean
@ConditionalOnLanguage(KotlinLanguage.ID)
@ConditionalOnBuildSystem(MavenBuildSystem.ID)
public KotlinJpaMavenBuildCustomizer kotlinJpaMavenBuildCustomizer(InitializrMetadata metadata) {
return new KotlinJpaMavenBuildCustomizer(metadata);
}
@Bean @Bean
public DependencyManagementBuildCustomizer dependencyManagementBuildCustomizer( public DependencyManagementBuildCustomizer dependencyManagementBuildCustomizer(
ResolvedProjectDescription projectDescription, InitializrMetadata metadata) { ResolvedProjectDescription projectDescription, InitializrMetadata metadata) {

14
initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationDefaultContributorsConfiguration.java
View File

@@ -38,6 +38,7 @@ import io.spring.initializr.generator.spring.build.BuildCustomizer;
import io.spring.initializr.generator.spring.code.MainCompilationUnitCustomizer; import io.spring.initializr.generator.spring.code.MainCompilationUnitCustomizer;
import io.spring.initializr.generator.spring.code.ServletInitializerCustomizer; import io.spring.initializr.generator.spring.code.ServletInitializerCustomizer;
import io.spring.initializr.generator.spring.code.TestApplicationTypeCustomizer; import io.spring.initializr.generator.spring.code.TestApplicationTypeCustomizer;
import io.spring.initializr.metadata.InitializrMetadata;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@@ -77,6 +78,19 @@ class KotlinProjectGenerationDefaultContributorsConfiguration {
return new KotlinDependenciesConfigurer(projectDescription.getPlatformVersion()); return new KotlinDependenciesConfigurer(projectDescription.getPlatformVersion());
} }
@Bean
@ConditionalOnBuildSystem(GradleBuildSystem.ID)
KotlinJpaGradleBuildCustomizer kotlinJpaGradleBuildCustomizer(InitializrMetadata metadata,
KotlinProjectSettings settings) {
return new KotlinJpaGradleBuildCustomizer(metadata, settings);
}
@Bean
@ConditionalOnBuildSystem(MavenBuildSystem.ID)
KotlinJpaMavenBuildCustomizer kotlinJpaMavenBuildCustomizer(InitializrMetadata metadata) {
return new KotlinJpaMavenBuildCustomizer(metadata);
}
/** /**
* Configuration for Kotlin projects using Spring Boot 1.5. * Configuration for Kotlin projects using Spring Boot 1.5.
*/ */