This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-toolkit.git
commit cbff1dd177a916f27a5bb59f626338c0f47dc46d Author: MabinGo <[email protected]> AuthorDate: Wed May 29 11:10:22 2019 +0800 Update to use spring-boot-maven-plugin to repackage jar Signed-off-by: MabinGo <[email protected]> --- README-ZH.md | 10 ++++++---- README.md | 10 ++++++---- toolkit-cli/pom.xml | 32 +++++++++++++++++++------------- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/README-ZH.md b/README-ZH.md index ea3eee9..2a97256 100755 --- a/README-ZH.md +++ b/README-ZH.md @@ -40,6 +40,8 @@ * 支持契约增量生成代码。 + * 支持生成“Hello World”微服务演示项目。 + ### 1.3 适用场景 * 集成多厂商应用的企业 @@ -82,13 +84,13 @@ $ mvn clean install ``` ### 3.2 使用toolkit-cli工具 -可执行jar包位于toolkit/toolkit-cli/target目录下 +可执行jar包位于toolkit/toolkit-cli/target/bin目录下 ```shell -$ java -jar toolkit-cli.jar help +$ java -jar toolkit-cli-{version}.jar help ``` #### 3.2.1 契约生成微服务工程 ```shell -$ java -jar toolkit-cli.jar codegenerate -m ServiceComb -i swagger.yaml -o ./project -p SpringMVC +$ java -jar toolkit-cli-{version}.jar codegenerate -m ServiceComb -i swagger.yaml -o ./project -p SpringMVC ``` > **codegenerate** 命令选项说明: * -m, --microservice-framework : 指定微服务框架,现支持ServiceComb @@ -108,7 +110,7 @@ $ java -jar toolkit-cli.jar codegenerate -m ServiceComb -i swagger.yaml -o ./pr #### 3.2.2 契约生成文档 ```shell -$ java -jar toolkit-cli.jar docgenerate -i swagger.yaml -o ./document +$ java -jar toolkit-cli-{version}.jar docgenerate -i swagger.yaml -o ./document ``` > **docGenerate** 命令选项说明: * -i, --input : 指定遵循OpenAPI规范的契约文件，支持yaml和json格式，支持指定本地和网络文件 diff --git a/README.md b/README.md index dd42918..af77348 100755 --- a/README.md +++ b/README.md @@ -40,6 +40,8 @@ Contract-based microservice development toolkit * Support contract incremental generation code. + * Support for generating "Hello World" microservice demo project. + ### 1.3 Applicable Scene * For users who integrate multi-vendor applications @@ -81,13 +83,13 @@ $ mvn clean install ``` ### 3.2 Use the toolkit-cli -The executable jar package is located in the toolkit/toolkit-cli/target directory +The executable jar package is located in the toolkit/toolkit-cli/target/bin directory ```shell -$ java -jar toolkit-cli.jar help +$ java -jar toolkit-cli-{version}.jar help ``` #### 3.2.1 Service contract generation microservice project ```shell -$ java -jar toolkit-cli.jar codegenerate -m ServiceComb -i swagger.yaml -o ./project -p SpringMVC +$ java -jar toolkit-cli-{version}.jar codegenerate -m ServiceComb -i swagger.yaml -o ./project -p SpringMVC ``` > **codegenerate** Command option * -m, --microservice-framework. Specify microservices framework, now supports ServiceComb. @@ -107,7 +109,7 @@ $ java -jar toolkit-cli.jar codegenerate -m ServiceComb -i swagger.yaml -o ./pr #### 3.2.2 Service contract generation document ```shell -$ java -jar toolkit-cli.jar docgenerate -i swagger.yaml -o ./document +$ java -jar toolkit-cli-{version}.jar docgenerate -i swagger.yaml -o ./document ``` > **docgenerate** Command option * -i, --input. Specifies contract files that follow the OpenAPI specification, supports yaml and json formats, and supports specifying local and network files. diff --git a/toolkit-cli/pom.xml b/toolkit-cli/pom.xml index 8c6cb5b..73de4b3 100755 --- a/toolkit-cli/pom.xml +++ b/toolkit-cli/pom.xml @@ -28,6 +28,10 @@ <artifactId>toolkit-cli</artifactId> + <properties> + <main.class>org.apache.servicecomb.toolkit.cli.ToolkitMain</main.class> + </properties> + <dependencies> <dependency> <groupId>io.airlift</groupId> @@ -69,24 +73,26 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.5.5</version> + <artifactId>maven-resources-plugin</artifactId> + <version>3.0.0</version> + <configuration> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + <version>1.5.12.RELEASE</version> <configuration> - <archive> - <manifest> - <mainClass>org.apache.servicecomb.toolkit.cli.ToolkitMain</mainClass> - </manifest> - </archive> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> + <fork>true</fork> + <mainClass>${main.class}</mainClass> + <outputDirectory>target/bin</outputDirectory> </configuration> <executions> <execution> - <id>make-assembly</id> - <phase>package</phase> <goals> - <goal>single</goal> + <goal>repackage</goal> </goals> </execution> </executions>
