Merge pull request #15 from kanglong1023/develop

Develop
kanglong1023 · Apr 15, 2023 · 4e4682c · 4e4682c
2 parents aacf59f + 33a556e
commit 4e4682c
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 22 deletions.
diff --git a/.github/workflows/release-mvn-snapshot.yml b/.github/workflows/release-mvn-snapshot.yml
@@ -5,10 +5,12 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-latest
+    if: github.triggering_actor == github.repository.owner
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v3
-        ref: 'develop'
+        with:
+          ref: 'develop'
 
       - name: Install Java and Maven
         uses: actions/setup-java@v3
@@ -29,4 +31,4 @@ jobs:
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-        run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSWORD }} -P deploy clean deploy
+        run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSWORD }} -P snapshot,deploy clean deploy
diff --git a/README.md b/README.md
@@ -53,15 +53,15 @@ There was a requirement to download a large number of m3u8 live classes some tim
 <dependency>
     <groupId>io.github.kanglong1023</groupId>
     <artifactId>m3u8-catcher</artifactId>
-    <version>1.0</version>
+    <version>1.0.0</version>
 </dependency>
 ```
 
 or use
 
 ```groovy
 dependencies {
-    implementation 'io.github.kanglong1023:m3u8-catcher:1.0'
+    implementation 'io.github.kanglong1023:m3u8-catcher:1.0.0'
 }
 ```
 
@@ -82,7 +82,7 @@ This could import ffmpeg for all platform. If you don't need platform compatibil
         <dependency>
             <groupId>io.github.kanglong1023</groupId>
             <artifactId>m3u8-catcher</artifactId>
-            <version>1.0</version>
+            <version>1.0.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bytedeco</groupId>
@@ -143,7 +143,7 @@ Alternatively, You can exclude ffmpeg dependencies if ffmpeg is installed on you
 <dependency>
     <groupId>io.github.kanglong1023</groupId>
     <artifactId>m3u8-catcher</artifactId>
-    <version>1.0</version>
+    <version>1.0.0</version>
     <exclusions>
         <exclusion>
             <groupId>org.bytedeco</groupId>

diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -53,15 +53,15 @@
 <dependency>
     <groupId>io.github.kanglong1023</groupId>
     <artifactId>m3u8-catcher</artifactId>
-    <version>1.0</version>
+    <version>1.0.0</version>
 </dependency>
 ```
 
 或者
 
 ```groovy
 dependencies {
-    implementation 'io.github.kanglong1023:m3u8-catcher:1.0'
+    implementation 'io.github.kanglong1023:m3u8-catcher:1.0.0'
 }
 ```
 
@@ -82,7 +82,7 @@ dependencies {
         <dependency>
             <groupId>io.github.kanglong1023</groupId>
             <artifactId>m3u8-catcher</artifactId>
-            <version>1.0</version>
+            <version>1.0.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bytedeco</groupId>
@@ -143,7 +143,7 @@ dependencies {
 <dependency>
     <groupId>io.github.kanglong1023</groupId>
     <artifactId>m3u8-catcher</artifactId>
-    <version>1.0</version>
+    <version>1.0.0</version>
     <exclusions>
         <exclusion>
             <groupId>org.bytedeco</groupId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.kanglong1023</groupId>
     <artifactId>m3u8-catcher</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
     <packaging>jar</packaging>
 
     <name>M3U8 Catcher</name>
@@ -137,8 +137,47 @@
                 <additionalparam>-Xdoclint:none</additionalparam>
             </properties>
         </profile>
+        <profile>
+            <id>snapshot</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-enforcer-plugin</artifactId>
+                        <version>3.3.0</version>
+                        <executions>
+                            <execution>
+                                <id>enforce-no-releases</id>
+                                <goals>
+                                    <goal>enforce</goal>
+                                </goals>
+                                <configuration>
+                                    <rules>
+                                        <requireSnapshotVersion>
+                                            <message>No Releases Allowed!</message>
+                                        </requireSnapshotVersion>
+                                    </rules>
+                                    <!-- if the goal should fail the build when a rule fails -->
+                                    <fail>true</fail>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>deploy</id>
+            <distributionManagement>
+                <snapshotRepository>
+                    <id>ossrh</id>
+                    <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+                </snapshotRepository>
+                <repository>
+                    <id>ossrh</id>
+                    <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+                </repository>
+            </distributionManagement>
             <build>
                 <plugins>
                     <plugin>
@@ -215,17 +254,6 @@
         </profile>
     </profiles>
 
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-    </distributionManagement>
-
     <build>
         <plugins>
             <plugin>