You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2023/04/14 09:44:42 UTC
[dubbo-initializer] 32/47: Merge branch 'main' into dubbo-customized-version-main-backup
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/dubbo-initializer.git
commit 644f226353920134e609e765470a449ebd8192b7
Merge: 48d3284 a1821e4
Author: chickenlj <ke...@gmail.com>
AuthorDate: Wed Apr 12 09:02:20 2023 +0800
Merge branch 'main' into dubbo-customized-version-main-backup
# Conflicts:
# initializer-generator/src/main/java/org/apache/dubbo/initializer/generation/extension/build/maven/DubboMavenProjectGenerationConfiguration.java
# initializer-generator/src/main/java/org/apache/dubbo/initializer/generation/extension/codes/DubboSourceCodeProjectGenerationConfiguration.java
# initializer-generator/src/main/java/org/apache/dubbo/initializer/generation/extension/dependency/DubboDependencyProjectGenerationConfiguration.java
# initializer-generator/src/main/resources/metadata.yaml
# initializer-generator/src/main/resources/templates/codes/dubbo-zookeeper/resources/application.properties.mustache
# initializer-generator/src/main/resources/templates/codes/dubbo/api/java/DemoService.java.mustache
# initializer-generator/src/main/resources/templates/codes/dubbo/java/DemoServiceImpl.java.mustache
# initializer-generator/src/main/resources/templates/codes/dubbo/resources/application.properties.mustache
.../extension/SampleCodeContributor.java | 18 ++
.../build/maven/ApiMavenPluginCustomizer.java | 2 +-
.../DubboMavenProjectGenerationConfiguration.java | 2 +-
...r.java => RootMavenDependenciesCustomizer.java} | 2 +-
...boSourceCodeProjectGenerationConfiguration.java | 12 +-
...oProjectSampleCodesGenerationConfiguration.java | 33 ++++
.../ProtoBufCodeContributor.java} | 45 +----
.../ApiMavenDependenciesCustomizer.java} | 7 +-
...oDependencyProjectGenerationConfiguration.java} | 38 +++--
.../DubboGrpcBuildCustomizer.java} | 27 ++-
.../DubboGrpcDependenciesCustomizer.java | 53 ++++++
.../dependency/DubboGrpcPluginCustomizer.java | 76 +++++++++
.../DubboRegisterZookeeperBuildCustomizer.java | 72 --------
...sumerDubboRegisterZookeeperBuildCustomizer.java | 47 ------
.../src/main/resources/META-INF/spring.factories | 2 +-
.../src/main/resources/metadata.yaml | 182 +--------------------
.../api/java/DemoService.java.mustache | 10 ++
.../api/java/RequestData.java.mustache | 26 +++
.../api/java/ResponseData.java.mustache | 26 +++
.../java/DemoServiceImpl.java.mustache | 15 ++
.../resources/application.properties.mustache | 4 +
.../api/proto/DemoService.proto.mustache | 22 +++
.../java/DemoServiceImpl.java.mustache | 19 +++
.../resources/application.properties.mustache | 4 +
.../resources/application.properties.mustache | 3 +
.../resources/application.properties.mustache | 4 +
.../resources/application.properties.mustache | 3 +
.../resources/application.properties.mustache | 3 +
28 files changed, 376 insertions(+), 381 deletions(-)
diff --cc initializer-generator/src/main/java/org/apache/dubbo/initializer/generation/extension/build/maven/DubboMavenProjectGenerationConfiguration.java
index 0d74445,e71583a..887dac5
--- a/initializer-generator/src/main/java/org/apache/dubbo/initializer/generation/extension/build/maven/DubboMavenProjectGenerationConfiguration.java
+++ b/initializer-generator/src/main/java/org/apache/dubbo/initializer/generation/extension/build/maven/DubboMavenProjectGenerationConfiguration.java
@@@ -51,17 -48,16 +51,17 @@@ public class DubboMavenProjectGeneratio
}
@Bean
- @ConditionalOnRequestedModule("root")
- public RootMavenDependenciesCustomizer rootMavenDependenciesCustomizer() {
- return new RootMavenDependenciesCustomizer();
+ @ConditionalOnRequestedArchitecture("dubbo")
- @ConditionalOnRequestedModule({"root", "api"})
++ @ConditionalOnRequestedModule({"root"})
+ public DefaultMavenDependenciesCustomizer defaultMavenDependenciesCustomizer() {
+ return new DefaultMavenDependenciesCustomizer();
}
-
@Bean
- @ConditionalOnRequestedModule("service")
- public BuildCustomizer<Build> defaultStarterBuildCustomizer() {
- return build -> build.dependencies().add("dubbo-starter", Dependency.withCoordinates("org.apache.dubbo", "dubbo-spring-boot-starter").build());
+ @ConditionalOnDubboIdlDependency
+ @ConditionalOnRequestedDependency("dubbo-idl")
+ public IdlMavenPluginCustomizer IdlMavenPluginCustomizer() {
+ return new IdlMavenPluginCustomizer();
}
}
diff --cc initializer-generator/src/main/java/org/apache/dubbo/initializer/generation/extension/codes/sample/ProtoBufCodeContributor.java
index f859f7b,91ebdf5..d9a56ca
--- a/initializer-generator/src/main/java/org/apache/dubbo/initializer/generation/extension/codes/sample/ProtoBufCodeContributor.java
+++ b/initializer-generator/src/main/java/org/apache/dubbo/initializer/generation/extension/codes/sample/ProtoBufCodeContributor.java
@@@ -55,11 -54,9 +55,11 @@@ import java.util.stream.Collectors
import static com.alibaba.initializer.generation.constants.BootstrapTemplateRenderConstants.KEY_ARTIFACT_ID;
/**
+ * Not enabled for now, please use {@linkplain SampleCodeContributor} instead.
+ *
* @author @author <a href="mailto:15835991162@163.com">ErDan Wang</a>
*/
- public class DubboSampleCodeContributor implements ProjectContributor {
+ public class ProtoBufCodeContributor implements ProjectContributor {
@Value("${application.democode-path}")
private String templates;
diff --cc initializer-generator/src/main/resources/metadata.yaml
index d7a0934,655c762..ff61098
--- a/initializer-generator/src/main/resources/metadata.yaml
+++ b/initializer-generator/src/main/resources/metadata.yaml
@@@ -15,190 -15,16 +15,24 @@@ initializr
additionalBoms: [ apache-dubbo ]
mappings:
- compatibilityRange: "2.3.0.M1"
- version: 3.1.7
+ version: 3.1.8
+ apache-dubbo-zookeeper-curator5:
+ groupId: org.apache.dubbo
+ artifactId: dubbo-dependencies-zookeeper-curator5
+ versionProperty: dubbo.version
+ additionalBoms: [ apache-dubbo ]
+ mappings:
+ - compatibilityRange: "2.3.0.M1"
+ version: 3.1.8
- codecentric-spring-boot-admin:
- groupId: de.codecentric
- artifactId: spring-boot-admin-dependencies
- versionProperty: spring-boot-admin.version
- mappings:
- - compatibilityRange: "[2.3.0.M1,2.5.0-M1)"
- version: 2.4.3
- - compatibilityRange: "[2.5.0.M1,2.6.0-M1)"
- version: 2.5.6
- - compatibilityRange: "[2.6.0.M1,2.7.0-M1)"
- version: 2.6.8
- - compatibilityRange: "[2.7.0.M1,3.0.0-M1)"
- version: 2.7.4
- - compatibilityRange: "[3.0.0-M1,3.1.0-M1)"
- version: 3.0.0-M4
- solace-spring-boot:
- groupId: com.solace.spring.boot
- artifactId: solace-spring-boot-bom
- versionProperty: solace-spring-boot.version
- mappings:
- - compatibilityRange: "[2.3.0.M1,2.6.0-M1)"
- version: 1.1.0
- - compatibilityRange: "[2.6.0.M1,3.0.0-M1)"
- version: 1.2.2
- solace-spring-cloud:
- groupId: com.solace.spring.cloud
- artifactId: solace-spring-cloud-bom
- versionProperty: solace-spring-cloud.version
- mappings:
- - compatibilityRange: "[2.3.0.M1,2.4.0-M1)"
- version: 1.1.1
- - compatibilityRange: "[2.4.0.M1,2.6.0-M1)"
- version: 2.1.0
- - compatibilityRange: "[2.6.0.M1,3.0.0-M1)"
- version: 2.3.2
- spring-cloud:
- groupId: org.springframework.cloud
- artifactId: spring-cloud-dependencies
- versionProperty: spring-cloud.version
- order: 50
- mappings:
- - compatibilityRange: "[2.2.0.RELEASE,2.4.0.M1)"
- version: Hoxton.SR12
- - compatibilityRange: "[2.4.0.M1,2.6.0-M1)"
- version: 2020.0.6
- - compatibilityRange: "[2.6.0-M1,2.6.0-M3)"
- version: 2021.0.0-M1
- repositories: spring-milestones
- - compatibilityRange: "[2.6.0-M3,2.6.0-RC1)"
- version: 2021.0.0-M3
- repositories: spring-milestones
- - compatibilityRange: "[2.6.0-RC1,2.6.1)"
- version: 2021.0.0-RC1
- repositories: spring-milestones
- - compatibilityRange: "[2.6.1,3.0.0-M1)"
- version: 2021.0.5
- - compatibilityRange: "[3.0.0-M1,3.0.0-M2)"
- version: 2022.0.0-M1
- repositories: spring-milestones
- - compatibilityRange: "[3.0.0-M2,3.0.0-M3)"
- version: 2022.0.0-M2
- repositories: spring-milestones
- - compatibilityRange: "[3.0.0-M3,3.0.0-M4)"
- version: 2022.0.0-M3
- repositories: spring-milestones
- - compatibilityRange: "[3.0.0-M4,3.0.0-M5)"
- version: 2022.0.0-M4
- repositories: spring-milestones
- - compatibilityRange: "[3.0.0-M5,3.0.0-RC1)"
- version: 2022.0.0-M5
- repositories: spring-milestones
- - compatibilityRange: "[3.0.0-RC1,3.0.0-RC2)"
- version: 2022.0.0-RC1
- repositories: spring-milestones
- - compatibilityRange: "[3.0.0-RC2,3.1.0-M1)"
- version: 2022.0.0-RC2
- repositories: spring-milestones
- spring-cloud-azure:
- groupId: com.azure.spring
- artifactId: spring-cloud-azure-dependencies
- versionProperty: spring-cloud-azure.version
- mappings:
- - compatibilityRange: "[2.5.0.M1,2.7.0-M1)"
- version: 4.3.0
- - compatibilityRange: "[2.7.0-M1,3.0.0-M1)"
- version: 4.4.1
- - compatibilityRange: "[3.0.0-M1,3.1.0-M1)"
- version: 6.0.0-beta.3
- spring-cloud-gcp:
- groupId: com.google.cloud
- artifactId: spring-cloud-gcp-dependencies
- versionProperty: spring-cloud-gcp.version
- additionalBoms: [ spring-cloud ]
- mappings:
- - compatibilityRange: "[2.4.0-M1,2.6.0-M1)"
- version: 2.0.11
- - compatibilityRange: "[2.6.0-M1,3.0.0-M1)"
- version: 3.4.0
- spring-cloud-services:
- groupId: io.pivotal.spring.cloud
- artifactId: spring-cloud-services-dependencies
- versionProperty: spring-cloud-services.version
- additionalBoms: [ spring-cloud ]
- mappings:
- - compatibilityRange: "[2.3.0.RELEASE,2.4.0-M1)"
- version: 2.3.0.RELEASE
- - compatibilityRange: "[2.4.0-M1,2.5.0-M1)"
- version: 2.4.1
- - compatibilityRange: "[2.5.0-M1,2.6.0-M1)"
- version: 3.3.0
- - compatibilityRange: "[2.6.0-M1,2.7.0-M1)"
- version: 3.4.0
- - compatibilityRange: "[2.7.0-M1,3.0.0-M1)"
- version: 3.5.0
- spring-shell:
- groupId: org.springframework.shell
- artifactId: spring-shell-dependencies
- versionProperty: spring-shell.version
- mappings:
- - compatibilityRange: "[2.7.0,3.0.0-M1)"
- version: 2.1.3
- - compatibilityRange: "[3.0.0-M1,3.1.0-M1)"
- version: 3.0.0-M2
- repositories: spring-milestones
- testcontainers:
- groupId: org.testcontainers
- artifactId: testcontainers-bom
- version: 1.17.6
- versionProperty: testcontainers.version
- vaadin:
- groupId: com.vaadin
- artifactId: vaadin-bom
- versionProperty: vaadin.version
- mappings:
- - compatibilityRange: "[2.1.0.RELEASE,2.6.0-M1)"
- version: 14.9.2
- - compatibilityRange: "[2.6.0-M1,2.8.0-M1)"
- version: 23.2.10
- wavefront:
- groupId: com.wavefront
- artifactId: wavefront-spring-boot-bom
- versionProperty: wavefront.version
- mappings:
- - compatibilityRange: "[2.1.0.RELEASE,2.4.0-M1)"
- version: 2.0.2
- - compatibilityRange: "[2.4.0-M1,2.5.0-M1)"
- version: 2.1.1
- - compatibilityRange: "[2.5.0-M1,2.7.0-M1)"
- version: 2.2.2
- - compatibilityRange: "[2.7.0-M1,3.0.0-M1)"
- version: 2.3.1
- spring-cloud-alibaba:
- groupId: com.alibaba.cloud
- artifactId: spring-cloud-alibaba-dependencies
- versionProperty: spring-cloud-alibaba.version
+ io-grpc:
+ groupId: io.grpc
+ artifactId: grpc-bom
+ versionProperty: grpc.version
+ additionalBoms: [ apache-dubbo ]
+ order: 2
mappings:
- - compatibilityRange: "[2.6.11, 2.6.11]"
- version: 2021.0.4.0
- - compatibilityRange: "[2.6.0,2.6.11)"
- version: 2021.0.1.0
- - compatibilityRange: "[2.4.0,2.6.0)"
- version: 2021.1
- - compatibilityRange: "[2.2.0.RELEASE,2.4.0)"
- version: 2.2.9.RELEASE
- - compatibilityRange: "[2.1.0.M1,2.2.0.RELEASE)"
- version: 2.1.4.RELEASE
- - compatibilityRange: "[2.0.0.M1,2.1.0.M1)"
- version: 2.0.4.RELEASE
- - compatibilityRange: "[1.5.0.RELEASE,2.0.0.M1)"
- version: 1.5.1.RELEASE
- aliyun-spring-boot:
- groupId: com.alibaba.cloud
- artifactId: aliyun-spring-boot-dependencies
- versionProperty: aliyun-spring-boot.version
- version: 1.0.0
+ - compatibilityRange: "2.3.0.M1"
+ version: 1.44.1
maven:
parent:
includeSpringBootBom: true