Update version to 2.7.9-SNAPSHOT (#775)

* Fix wrong sample code : (#761) @service ====> @DubboService @reference ====> @DubboReference Co-authored-by: 李大成 <lidc@fxiaoke.com> * fix README_CN change Registry Zookeeper Samples and Registry Nacos Samples error (#760) * Update README_CN.md (#762) 修改版本号，2.7.7->2.7.8 * Update README.md (#764) update Registry Zookeeper Samples and Registry Nacos Samples URL * Update README.md (#763) Update the version of the project to 2.7.8 . * Update README.md (#765) Wrong annotation ====> Correct annotation @service ====> @DubboService @reference ====> @DubboReference * update version to 2.7.9-SNAPSHOT, fix compile errors * do not install samples modules * update maven version to 3.6.1 * add github actions workflow * fix workflows path Co-authored-by: JackyKyoto <51149572+JackyKyoto@users.noreply.github.com> Co-authored-by: 李大成 <lidc@fxiaoke.com> Co-authored-by: lxl910128 <287876871@qq.com> Co-authored-by: JustDoNow <emailqz@126.com> Co-authored-by: wuudongdong <74701398+wuudongdong@users.noreply.github.com> Co-authored-by: DaisyLJQ <37607839+DaisyLJQ@users.noreply.github.com> Co-authored-by: sharpzhango <1404405160@qq.com>
apache · Jan 25, 2021 · 525f26c · 525f26c
1 parent ec32800
commit 525f26c
Show file tree

Hide file tree

Showing 8 changed files with 134 additions and 19 deletions.
diff --git a/.github/workflows/dubbo-2.yml b/.github/workflows/dubbo-2.yml
@@ -0,0 +1,103 @@
+name: Dubbo 2
+
+on:
+  pull_request:
+    paths:
+      - "**"
+      - "!**/*.md"
+      - "!docs/**"
+  push:
+    paths:
+      - '**'
+      - "!**/*.md"
+      - "!docs/**"
+  workflow_dispatch:
+
+env:
+  DUBBO_REF: 'master'
+
+jobs:
+  build-dubbo:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    # Map a step output to a job output
+    outputs:
+      commit_id: ${{ steps.git-checker.outputs.commit_id }}
+      cache-hit: ${{ steps.dubbocache.outputs.cache-hit }}
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          repository: 'apache/dubbo'
+          ref: ${{env.DUBBO_REF}}
+      - name: Get commit id and dubbo version
+        id: git-checker
+        run: |
+          #compare dubbo commit id
+          last_commit_id=`git log --format="%H" -n 1`
+          echo "::set-output name=commit_id::$last_commit_id"
+          echo "commit_id: $last_commit_id"
+          # Calculate Dubbo Version
+          REVISION=`awk '/<revision>[^<]+<\/revision>/{gsub(/<revision>|<\/revision>/,"",$1);print $1;exit;}' pom.xml`
+          mkdir dubbo-version
+          echo $REVISION > dubbo-version/dubbo-version
+          echo "dubbo version: $REVISION"
+      - name: Upload Dubbo version
+        uses: actions/upload-artifact@v2
+        with:
+          name: dubbo-version
+          path: dubbo-version
+      - name: Dubbo cache
+        id: dubbocache
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository/org/apache/dubbo
+          key: ${{ runner.os }}-dubbo-snapshot-${{steps.git-checker.outputs.commit_id}}
+      - name: Cache local Maven repository
+        if: steps.dubbocache.outputs.cache-hit != 'true'
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-dubbo-${{env.DUBBO_REF}}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-dubbo-${{env.DUBBO_REF}}-maven-
+      - name: Set up JDK 8
+        if: steps.dubbocache.outputs.cache-hit != 'true'
+        uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - name: Build dubbo
+        if: steps.dubbocache.outputs.cache-hit != 'true'
+        run: |
+          ./mvnw -U --batch-mode --no-transfer-progress -Dmaven.wagon.http.retryHandler.count=3 clean install -Dmaven.test.skip=true -Dmaven.test.skip.exec=true
+
+  build-dubbo-spring-boot:
+    needs: [build-dubbo]
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [8, 11]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-dubbo-spring-boot-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-dubbo-spring-boot-maven-
+      - name: Dubbo cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository/org/apache/dubbo
+          key: ${{ runner.os }}-dubbo-snapshot-${{needs.build-dubbo.outputs.commit_id}}
+      - name: Set up JDK ${{matrix.java}}
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{matrix.java}}
+      - name: Build dubbo-spring-boot
+        run: |
+          ./mvnw -U --batch-mode --no-transfer-progress -Dmaven.wagon.http.retryHandler.count=3 clean package
+      - name: Codecov
+        run: bash <(curl -s https://codecov.io/bash)
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi
 ```xml
 <properties>
     <spring-boot.version>2.3.0.RELEASE</spring-boot.version>
-    <dubbo.version>2.7.7</dubbo.version>
+    <dubbo.version>2.7.8</dubbo.version>
 </properties>
 
 <dependencyManagement>
@@ -50,7 +50,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi
     <dependency>
         <groupId>org.apache.dubbo</groupId>
         <artifactId>dubbo-spring-boot-starter</artifactId>
-        <version>2.7.7</version>
+        <version>2.7.8</version>
     </dependency>    
 </dependencies>
 ```
@@ -117,7 +117,7 @@ public interface DemoService {
 1. Service Provider implements `DemoService`
 
     ```java
-    @Service(version = "1.0.0")
+    @DubboService(version = "1.0.0")
     public class DefaultDemoService implements DemoService {
 
         /**
@@ -176,7 +176,7 @@ public interface DemoService {
 
         private final Logger logger = LoggerFactory.getLogger(getClass());
 
-        @Reference(version = "1.0.0", url = "dubbo://127.0.0.1:12345")
+        @DubboReference(version = "1.0.0", url = "dubbo://127.0.0.1:12345")
         private DemoService demoService;
 
         public static void main(String[] args) {
@@ -263,8 +263,8 @@ The samples project of Dubbo Spring Boot that includes:
 
 - [Auto-Configuaration Samples](dubbo-spring-boot-samples/auto-configure-samples)
 - [Externalized Configuration Samples](dubbo-spring-boot-samples/externalized-configuration-samples)
-- [Registry Zookeeper Samples](dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples)
-- [Registry Nacos Samples](dubbo-spring-boot-samples/dubbo-registry-nacos-samples)
+- [Registry Zookeeper Samples](https://github.com/apache/dubbo-spring-boot-project/tree/master/dubbo-spring-boot-samples/registry-samples/zookeeper-samples)
+- [Registry Nacos Samples](https://github.com/apache/dubbo-spring-boot-project/tree/master/dubbo-spring-boot-samples/registry-samples/nacos-samples)
 
 
 

diff --git a/README_CN.md b/README_CN.md
@@ -22,7 +22,7 @@
 ```xml
 <properties>
     <spring-boot.version>2.3.0.RELEASE</spring-boot.version>
-    <dubbo.version>2.7.7</dubbo.version>
+    <dubbo.version>2.7.8</dubbo.version>
 </properties>
 
 <dependencyManagement>
@@ -72,7 +72,7 @@
     <dependency>
         <groupId>org.apache.dubbo</groupId>
         <artifactId>dubbo-spring-boot-starter</artifactId>
-        <version>2.7.7</version>
+        <version>2.7.8</version>
     </dependency>
 
     <dependency>
@@ -141,7 +141,7 @@ public interface DemoService {
 1. 实现 `DemoService` 接口
 
     ```java
-    @Service(version = "1.0.0")
+    @DubboService(version = "1.0.0")
     public class DefaultDemoService implements DemoService {
 
         /**
@@ -197,15 +197,15 @@ public interface DemoService {
 ### 实现 Dubbo 服务消费方
 
 
-1. 通过 `@Reference` 注入 `DemoService` :
+1. 通过 `@DubboReference` 注入 `DemoService` :
 
     ```java
     @EnableAutoConfiguration
     public class DubboAutoConfigurationConsumerBootstrap {
 
         private final Logger logger = LoggerFactory.getLogger(getClass());
 
-        @Reference(version = "1.0.0", url = "dubbo://127.0.0.1:12345")
+        @DubboReference(version = "1.0.0", url = "dubbo://127.0.0.1:12345")
         private DemoService demoService;
 
         public static void main(String[] args) {
@@ -288,8 +288,8 @@ Dubbo Spring Boot 示例工程包括:
 
 - [自动装配](dubbo-spring-boot-samples/auto-configure-samples)
 - [外部化配置](dubbo-spring-boot-samples/externalized-configuration-samples)
-- [Zookeeper 注册中心](dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples)
-- [Nacos 注册中心](dubbo-spring-boot-samples/dubbo-registry-nacos-samples)
+- [Zookeeper 注册中心](https://github.com/apache/dubbo-spring-boot-project/tree/master/dubbo-spring-boot-samples/registry-samples/zookeeper-samples)
+- [Nacos 注册中心](https://github.com/apache/dubbo-spring-boot-project/tree/master/dubbo-spring-boot-samples/registry-samples/nacos-samples)
 
 
 

diff --git a/...gure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java b/...gure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java
@@ -81,12 +81,10 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
         if (applicationContext instanceof ConfigurableApplicationContext) {
             ConfigurableApplicationContext context = (ConfigurableApplicationContext) applicationContext;
             DubboLifecycleComponentApplicationListener dubboLifecycleComponentApplicationListener
-                    = new DubboLifecycleComponentApplicationListener();
-            dubboLifecycleComponentApplicationListener.setApplicationContext(applicationContext);
+                    = new DubboLifecycleComponentApplicationListener(applicationContext);
             context.addApplicationListener(dubboLifecycleComponentApplicationListener);
 
-            DubboBootstrapApplicationListener dubboBootstrapApplicationListener = new DubboBootstrapApplicationListener();
-            dubboBootstrapApplicationListener.setApplicationContext(applicationContext);
+            DubboBootstrapApplicationListener dubboBootstrapApplicationListener = new DubboBootstrapApplicationListener(applicationContext);
             context.addApplicationListener(dubboBootstrapApplicationListener);
         }
     }

diff --git a/dubbo-spring-boot-distribution/pom.xml b/dubbo-spring-boot-distribution/pom.xml
@@ -106,6 +106,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
 
     </build>

diff --git a/dubbo-spring-boot-samples/pom.xml b/dubbo-spring-boot-samples/pom.xml
@@ -51,6 +51,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
     <properties>
         <maven_javadoc_version>3.0.1</maven_javadoc_version>
         <maven_surefire_version>2.19.1</maven_surefire_version>
-        <revision>2.7.8</revision>
+        <revision>2.7.9-SNAPSHOT</revision>
     </properties>
 
     <modules>