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 a1821e4b949c21373e02ee452c502d99c7037a32
Merge: 392b995 a027a80
Author: chickenlj <[email protected]>
AuthorDate: Wed Apr 12 02:01:10 2023 +0800

    Merge branch 'main' of https://github.com/apache/dubbo-initializer
    
    # Conflicts:
    #       initializer-generator/src/main/resources/metadata.yaml

 .../extension/SampleCodeContributor.java           |   18 +
 .../build/maven/ApiMavenPluginCustomizer.java      |    2 +-
 .../DubboMavenProjectGenerationConfiguration.java  |   17 +-
 ...r.java => RootMavenDependenciesCustomizer.java} |    2 +-
 ...boSourceCodeProjectGenerationConfiguration.java |   12 +-
 ...oProjectSampleCodesGenerationConfiguration.java |   33 +
 .../ProtoBufCodeContributor.java}                  |   45 +-
 .../ApiMavenDependenciesCustomizer.java}           |   13 +-
 ...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               | 1958 ++++++--------------
 .../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 +
 .../resources/application.properties.mustache      |    3 -
 .../codes/dubbo/api/java/DemoService.java.mustache |    7 -
 .../codes/dubbo/java/DemoServiceImpl.java.mustache |   12 -
 .../resources/application.properties.mustache      |    1 -
 32 files changed, 959 insertions(+), 1618 deletions(-)

Reply via email to