Javadoc与maven部署放入同一CI

.github/workflows/deploy.yml

@@ -26,39 +26,18 @@ jobs:
           server-id: github
           server-username: MAVEN_USERNAME
           server-password: MAVEN_TOKEN
-      - name: "Deploy"
+
+      - name: "Maven Deploy"
         run: mvn -B deploy --file pom.xml -DskipTests
         env:
           MAVEN_USERNAME: ${{ github.repository_owner }}
           MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
-  javadoc-website:
+      - name: "Copy Javadoc"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the repo
-        uses: actions/checkout@v2
-
-      - name: Set up the Java JDK
-        uses: actions/setup-java@v2
-        with:
-          cache: maven
-          java-version: '11'
-          distribution: 'adopt'
-          server-id: github
-          server-username: MAVEN_USERNAME
-          server-password: MAVEN_TOKEN
-
-      - name: Generate docs
-        run: mvn javadoc:javadoc -DskipTests
-        env:
-          MAVEN_USERNAME: ${{ github.repository_owner }}
-          MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
-
-      - name: Copy to Location
         run: |
           bash .scripts/copy-javadoc.sh
 
-      - name: Generate the sitemap
+      - name: "Generate Sitemap"
         id: sitemap
         uses: cicirello/generate-sitemap@v1
         with:
@@ -92,7 +71,8 @@ jobs:
           git checkout -b gh-pages
           git add -A
           git commit -m "API Document generated."
-      - name: Push javadocs
+
+      - name: Javadoc Website Push
         run: |
           cd docs
           git push origin HEAD:gh-pages --force

.scripts/copy-javadoc.sh

@@ -1,7 +1,7 @@
 rm -rf docs
 mkdir -vp docs
 
-DOC_URL="target/site/apidocs"
+DOC_URL="target/apidocs"
 
 for FILE in easyplugin-*; do
 

easyplugin-all/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.2-SNAPSHOT.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-bom/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.2-SNAPSHOT.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-command/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.2-SNAPSHOT.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.2-SNAPSHOT.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-configuration/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.2-SNAPSHOT.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-database/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.2-SNAPSHOT.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-gui/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.2-SNAPSHOT.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-lp/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.2-SNAPSHOT.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-main/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.2-SNAPSHOT.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-placeholderapi/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.2-SNAPSHOT.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-vault/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.2-SNAPSHOT.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -14,7 +14,7 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easyplugin-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.2-SNAPSHOT.2</version>
     <modules>
 
         <module>easyplugin-main</module>