Merge pull request #13 from andrewshan/main

修改版本号为正式版本
polarismesh · Nov 21, 2022 · 4555636 · 4555636
2 parents 5b1a727 + 3c652a7
commit 4555636
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 16 deletions.
diff --git a/dubbo/dubbo-examples/dubbo-discovery-example/dubbo-discovery-provider/pom.xml b/dubbo/dubbo-examples/dubbo-discovery-example/dubbo-discovery-provider/pom.xml
@@ -12,10 +12,6 @@
 
     <artifactId>dubbo-discovery-provider</artifactId>
 
-    <properties>
-        <skip_maven_deploy>true</skip_maven_deploy>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.tencent.polaris</groupId>

diff --git a/dubbo/dubbo-examples/pom.xml b/dubbo/dubbo-examples/pom.xml
@@ -22,6 +22,7 @@
 
     <properties>
         <slf4j-log4j12.version>1.7.25</slf4j-log4j12.version>
+        <skip_maven_deploy>true</skip_maven_deploy>
     </properties>
 
     <dependencyManagement>

diff --git a/...bo-registry-polaris/src/main/java/com/tencent/polaris/dubbo/registry/PolarisRegistry.java b/...bo-registry-polaris/src/main/java/com/tencent/polaris/dubbo/registry/PolarisRegistry.java
@@ -130,6 +130,7 @@ public void destroy() {
                 doUnregister(url);
             }
             polarisOperator.destroy();
+            taskScheduler.destroy();
         }
     }
 

diff --git a/dubbo/dubbo-plugins/pom.xml b/dubbo/dubbo-plugins/pom.xml
@@ -12,6 +12,10 @@
 
     <artifactId>dubbo-plugins</artifactId>
     <packaging>pom</packaging>
+
+    <properties>
+        <skip_maven_deploy>false</skip_maven_deploy>
+    </properties>
     <modules>
         <module>dubbo-registry-polaris</module>
         <module>dubbo-router-polaris</module>

diff --git a/dubbox/dubbox-examples/pom.xml b/dubbox/dubbox-examples/pom.xml
@@ -63,7 +63,7 @@
         <easymock_version>3.0</easymock_version>
         <jmockit_version>0.999.8</jmockit_version>
 
-        <skip_maven_deploy>false</skip_maven_deploy>
+        <skip_maven_deploy>true</skip_maven_deploy>
         <!-- for maven compiler plugin -->
         <maven_compiler_plugin_version>2.3.2</maven_compiler_plugin_version>
         <java_source_version>1.6</java_source_version>

diff --git a/...x-registry-polaris/src/main/java/com/tencent/polaris/dubbox/registry/PolarisRegistry.java b/...x-registry-polaris/src/main/java/com/tencent/polaris/dubbox/registry/PolarisRegistry.java
@@ -130,6 +130,7 @@ public void destroy() {
                 doUnregister(url);
             }
             polarisOperator.destroy();
+            taskScheduler.destroy();
         }
     }
 

diff --git a/dubbox/dubbox-plugins/pom.xml b/dubbox/dubbox-plugins/pom.xml
@@ -13,6 +13,10 @@
     <artifactId>dubbox-plugins</artifactId>
     <packaging>pom</packaging>
 
+    <properties>
+        <skip_maven_deploy>false</skip_maven_deploy>
+    </properties>
+
     <modules>
         <module>dubbox-registry-polaris</module>
         <module>dubbox-router-polaris</module>

diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
 
     <properties>
         <!-- Project revision -->
-        <revision>0.1.0-SNAPSHOT</revision>
+        <revision>0.1.0</revision>
         <timestamp>${maven.build.timestamp}</timestamp>
         <skip.maven.deploy>false</skip.maven.deploy>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
@@ -257,14 +257,14 @@
         </repository>
     </distributionManagement>
 
-<!--    <repositories>-->
-<!--        <repository>-->
-<!--            <id>ossrh</id>-->
-<!--            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>-->
-<!--            <snapshots>-->
-<!--                <enabled>true</enabled>-->
-<!--                <updatePolicy>always</updatePolicy>-->
-<!--            </snapshots>-->
-<!--        </repository>-->
-<!--    </repositories>-->
+    <!--    <repositories>-->
+    <!--        <repository>-->
+    <!--            <id>ossrh</id>-->
+    <!--            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>-->
+    <!--            <snapshots>-->
+    <!--                <enabled>true</enabled>-->
+    <!--                <updatePolicy>always</updatePolicy>-->
+    <!--            </snapshots>-->
+    <!--        </repository>-->
+    <!--    </repositories>-->
 </project>