Merge branch 'master' into dev

dromara · Jun 12, 2024 · 5a5d6ef · 5a5d6ef
2 parents b94f660 + 4368e57
commit 5a5d6ef
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 16 deletions.
diff --git a/.gitee/ISSUE_TEMPLATE/issue.yml b/.gitee/ISSUE_TEMPLATE/issue.yml
@@ -26,6 +26,13 @@ body:
         - "其他"
     validations:
       required: true
+  - type: input
+    id: usage-scenarios
+    attributes:
+      label: 使用场景
+      description: 简述使用场景
+    validations:
+      required: true
   - type: textarea
     id: desired-solution
     attributes:

diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -24,8 +24,7 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
       - name: Publish to the Maven Central Repository
         run: |
-          chmod +x ./deploy.sh
-          ./deploy.sh
+          mvn clean package deploy -Psnapshot,!develop -pl mica-mqtt-codec,mica-mqtt-common,mica-mqtt-client,mica-mqtt-server,starter/mica-mqtt-client-spring-boot-starter,starter/mica-mqtt-server-spring-boot-starter,starter/jfinal-mica-mqtt-client,starter/jfinal-mica-mqtt-server
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}

diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml
@@ -14,7 +14,7 @@ jobs:
           cache: 'maven'
           java-version: 8
       - name: Build with Maven
-        run: mvn package
+        run: mvn package -P !develop
   buildOnJava21:
     name: build on java21
     runs-on: ubuntu-latest
@@ -27,4 +27,4 @@ jobs:
           cache: 'maven'
           java-version: 21
       - name: Build with Maven
-        run: mvn package
+        run: mvn package -P !develop
diff --git a/pom.xml b/pom.xml
@@ -137,18 +137,6 @@
     </scm>
 
     <repositories>
-        <!--阿里云主仓库，代理了 maven central 和 jcenter 仓库-->
-        <repository>
-            <id>aliyun</id>
-            <name>aliyun</name>
-            <url>https://maven.aliyun.com/repository/public</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
         <!-- 拉取快照版本的 mica-net -->
         <repository>
             <id>sonatype-nexus-snapshots</id>
@@ -236,6 +224,25 @@
     </licenses>
 
     <profiles>
+        <profile>
+            <id>develop</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <repositories>
+                <repository>
+                    <id>aliyun</id>
+                    <name>aliyun</name>
+                    <url>https://maven.aliyun.com/repository/public/</url>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <releases>
+                        <enabled>true</enabled>
+                    </releases>
+                </repository>
+            </repositories>
+        </profile>
         <profile>
             <id>snapshot</id>
             <distributionManagement>