This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.1-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/0.1.1-release by this push: new 1db4fdd 0.1.x (#200) 1db4fdd is described below commit 1db4fdd8daef52b6de02c3471c04ee3e2c79e9c8 Author: 小马哥 <mercybl...@gmail.com> AuthorDate: Thu Jun 21 17:49:12 2018 +0800 0.1.x (#200) * Fix test cases * Update maven plugins * Update excludes * Update License position * Update License * Update License * Add exclude * Update License * Add maven-release-plugin * Fix JavaDoc Issues * Update build settings --- ...oMvcEndpointManagementContextConfiguration.java | 2 +- .../actuate/endpoint/mvc/DubboMvcEndpoint.java | 2 +- .../health/DubboHealthIndicatorProperties.java | 1 - .../autoconfigure/DubboAutoConfiguration.java | 5 +- .../OverrideDubboConfigApplicationListener.java | 3 +- .../event/WelcomeLogoApplicationListener.java | 2 +- .../com/alibaba/boot/dubbo/util/DubboUtils.java | 1 - dubbo-spring-boot-parent/pom.xml | 147 +++++++++++++++++++++ .../controller/DemoConsumerController.java | 2 +- pom.xml | 33 ----- 10 files changed, 156 insertions(+), 42 deletions(-) diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboMvcEndpointManagementContextConfiguration.java b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboMvcEndpointManagementContextConfiguration.java index 18a44a1..d2a405c 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboMvcEndpointManagementContextConfiguration.java +++ b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboMvcEndpointManagementContextConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Bean; * Dubbo {@link MvcEndpoint} {@link ManagementContextConfiguration} * * @author <a href="mailto:mercybl...@gmail.com">Mercy</a> - * @see + * @see ManagementContextConfiguration * @since 1.0.0 */ @ManagementContextConfiguration diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpoint.java b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpoint.java index 125cd34..f11c575 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpoint.java +++ b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpoint.java @@ -63,7 +63,7 @@ import static org.springframework.util.ClassUtils.isPrimitiveOrWrapper; * {@link MvcEndpoint} to expose Dubbo Metadata * * @author <a href="mailto:mercybl...@gmail.com">Mercy</a> - * @see + * @see MvcEndpoint * @since 1.0.0 */ public class DubboMvcEndpoint extends EndpointMvcAdapter implements ApplicationContextAware, EnvironmentAware { diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorProperties.java b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorProperties.java index bd35ed9..9232cba 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorProperties.java +++ b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorProperties.java @@ -53,7 +53,6 @@ public class DubboHealthIndicatorProperties { /** * The nested class for {@link StatusChecker}'s names - * <p> * <pre> * registry=com.alibaba.dubbo.registry.status.RegistryStatusChecker * spring=com.alibaba.dubbo.config.spring.status.SpringStatusChecker diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java b/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java index 251934a..f3060b1 100644 --- a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java +++ b/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java @@ -70,9 +70,9 @@ public class DubboAutoConfiguration { } /** - * Multiple Dubbo Config Configuration , equals {@link EnableDubboConfig#multiple()} == <code>true</code> + * Multiple Dubbo Config Configuration , equals @EnableDubboConfig.multiple() == <code>true</code> * - * @see EnableDubboConfig#multiple() + * @see EnableDubboConfig * @see DubboConfigConfiguration.Multiple */ @ConditionalOnProperty(name = MULTIPLE_CONFIG_PROPERTY_NAME, havingValue = "true") @@ -83,6 +83,7 @@ public class DubboAutoConfiguration { /** * Creates {@link ServiceAnnotationBeanPostProcessor} Bean * + * @param environment {@link Environment} Bean * @return {@link ServiceAnnotationBeanPostProcessor} */ @ConditionalOnProperty(name = BASE_PACKAGES_PROPERTY_NAME) diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListener.java b/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListener.java index 08135c6..33ac29b 100644 --- a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListener.java +++ b/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListener.java @@ -17,6 +17,7 @@ package com.alibaba.boot.dubbo.context.event; import com.alibaba.dubbo.common.utils.ConfigUtils; +import com.alibaba.dubbo.config.AbstractConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; @@ -32,7 +33,7 @@ import static com.alibaba.boot.dubbo.util.DubboUtils.*; /** * {@link ApplicationListener} to override the dubbo properties from {@link Environment}into * {@link ConfigUtils#getProperties() Dubbo Config}. - * {@ConfigUtils Dubbo Config} on {@link ApplicationEnvironmentPreparedEvent}. + * {@link AbstractConfig Dubbo Config} on {@link ApplicationEnvironmentPreparedEvent}. * <p> * * @author <a href="mailto:mercybl...@gmail.com">Mercy</a> diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListener.java b/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListener.java index 8504857..d87b4ba 100644 --- a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListener.java +++ b/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListener.java @@ -31,7 +31,7 @@ import static com.alibaba.dubbo.qos.server.DubboLogo.dubbo; * Dubbo Welcome Logo {@link ApplicationListener} * * @author <a href="mailto:mercybl...@gmail.com">Mercy</a> - * @see + * @see ApplicationListener * @since 1.0.0 */ @Order(LoggingApplicationListener.DEFAULT_ORDER + 1) diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/DubboUtils.java b/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/DubboUtils.java index 4654cd1..c49b36a 100644 --- a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/DubboUtils.java +++ b/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/DubboUtils.java @@ -27,7 +27,6 @@ import java.util.TreeMap; * The utilities class for Dubbo * * @author <a href="mailto:mercybl...@gmail.com">Mercy</a> - * @see * @since 1.0.0 */ public abstract class DubboUtils { diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index ce76953..b08fb6d 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -46,6 +46,7 @@ <argline>-server -Xms256m -Xmx512m -XX:PermSize=64m -XX:MaxPermSize=128m -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true </argline> + <arguments/> <!-- Maven plugins --> <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version> @@ -54,6 +55,8 @@ <maven-jacoco-plugin.version>0.8.1</maven-jacoco-plugin.version> <maven-gpg-plugin.version>1.5</maven-gpg-plugin.version> <apache-rat-plugin.version>0.12</apache-rat-plugin.version> + <maven-release-plugin.version>2.5.3</maven-release-plugin.version> + <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version> </properties> <dependencyManagement> @@ -198,6 +201,31 @@ </pluginRepositories> <build> + <!-- Used for packaging NOTICE & LICENSE to each sub-module jar--> + <resources> + <resource> + <directory>src/main/resources/</directory> + <filtering>false</filtering> + </resource> + <resource> + <directory>../</directory> + <targetPath>META-INF/</targetPath> + <filtering>false</filtering> + <includes> + <include>NOTICE</include> + <include>LICENSE</include> + </includes> + </resource> + <resource> + <directory>../../</directory> + <targetPath>META-INF/</targetPath> + <filtering>false</filtering> + <includes> + <include>NOTICE</include> + <include>LICENSE</include> + </includes> + </resource> + </resources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -296,6 +324,77 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> + <configuration> + <useSystemClassLoader>true</useSystemClassLoader> + <forkMode>once</forkMode> + <argLine>${argline} ${jacocoArgLine}</argLine> + <systemProperties> + <!-- common shared --> + <property> + <name>transporter</name> + <value>${transporter}</value> + </property> + <property> + <name>serialization</name> + <value>${serialization}</value> + </property> + <!-- server side --> + <property> + <name>port</name> + <value>${port}</value> + </property> + <property> + <name>threadpool</name> + <value>${threadpool}</value> + </property> + <property> + <name>threads</name> + <value>${threads}</value> + </property> + <property> + <name>iothreads</name> + <value>${iothreads}</value> + </property> + <!-- client side --> + <property> + <name>server</name> + <value>${server}</value> + </property> + <property> + <name>timeout</name> + <value>${timeout}</value> + </property> + <property> + <name>length</name> + <value>${length}</value> + </property> + <property> + <name>connections</name> + <value>${connections}</value> + </property> + <property> + <name>base</name> + <value>${base}</value> + </property> + <property> + <name>concurrent</name> + <value>${concurrent}</value> + </property> + <property> + <name>runs</name> + <value>${runs}</value> + </property> + <property> + <name>onerror</name> + <value>${onerror}</value> + </property> + </systemProperties> + </configuration> + </plugin> + <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <version>${apache-rat-plugin.version}</version> @@ -349,6 +448,54 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>${maven-release-plugin.version}</version> + <configuration> + <autoVersionSubmodules>true</autoVersionSubmodules> + <useReleaseProfile>false</useReleaseProfile> + <releaseProfiles>release</releaseProfiles> + <goals>deploy</goals> + <arguments>${arguments}</arguments> + </configuration> + </plugin> </plugins> </build> + + <profiles> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> \ No newline at end of file diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/src/main/java/com/alibaba/boot/dubbo/demo/consumer/controller/DemoConsumerController.java b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/src/main/java/com/alibaba/boot/dubbo/demo/consumer/controller/DemoConsumerController.java index 5b105d6..1897979 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/src/main/java/com/alibaba/boot/dubbo/demo/consumer/controller/DemoConsumerController.java +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/src/main/java/com/alibaba/boot/dubbo/demo/consumer/controller/DemoConsumerController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; * Demo Consumer Controller (REST) * * @author <a href="mailto:mercybl...@gmail.com">Mercy</a> - * @see + * @see RestController * @since 1.0.0 */ @RestController diff --git a/pom.xml b/pom.xml index 93a3d84..759645e 100644 --- a/pom.xml +++ b/pom.xml @@ -87,38 +87,5 @@ </developer> </developers> - <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> \ No newline at end of file