Starter fix (#403)

* fix compile error * update action config * Update codeql-analysis.yml
baidu · Jan 26, 2025 · 10d9de0 · 10d9de0
1 parent b5f2562
commit 10d9de0
Show file tree

Hide file tree

Showing 85 changed files with 987 additions and 1,176 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     permissions:
       actions: read
       contents: read
@@ -22,6 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         language: [ 'java' ]
+        java: [ '8', '17' ]
 
     steps:
       - name: Checkout repository
@@ -31,11 +32,11 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '8'
+          java-version: ${{ matrix.java }}
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
 
@@ -47,12 +48,17 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - name: Build
+      - name: Build starlight
+        if: ${{ matrix.java == '8' }}
+        run: |
+          mvn -B clean package -Dmaven.test.skip --file starlight/pom.xml --no-transfer-progress
+          
+      - name: Build starlight-starter
+        if: ${{ matrix.java == '17' }}  
         run: |
-          mvn -B clean package -Dmaven.test.skip --file starlight/pom.xml --no-transfer-progress 
           mvn -B clean package -Dmaven.test.skip --file spring-cloud-starter-baidu-starlight/pom.xml --no-transfer-progress
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -5,7 +5,10 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        java: [ '8', '17' ]
     steps:
       - name: Checkout project
         uses: actions/checkout@v3
@@ -14,7 +17,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '8'
+          java-version: ${{ matrix.java }}
           server-id: ossrh
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
@@ -34,9 +37,19 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - name: Publish Snaphot package
+      - name: Publish Snaphot package starlight
+        if: ${{ matrix.java == '8' }}
         run: |
           mvn -B deploy -P deploy -Dmaven.test.skip --file starlight/pom.xml --no-transfer-progress
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWD }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSWD }}
+
+      - name: Publish Snaphot package starlight-starter
+        if: ${{ matrix.java == '17' }}  
+        run: |
           mvn -B deploy -P deploy -Dmaven.test.skip --file spring-cloud-starter-baidu-starlight/pom.xml --no-transfer-progress
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/starlight-release.yml b/.github/workflows/starlight-release.yml
@@ -15,7 +15,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout project
         uses: actions/checkout@v3

diff --git a/.github/workflows/starlight-starter-release.yml b/.github/workflows/starlight-starter-release.yml
@@ -15,7 +15,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout project
         uses: actions/checkout@v3
@@ -24,7 +24,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '8'
+          java-version: '17'
           server-id: ossrh
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -8,7 +8,10 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        java: [ '8', '17' ]
     steps:
       - name: Checkout project
         uses: actions/checkout@v3
@@ -17,7 +20,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '8'
+          java-version: ${{ matrix.java }}
 
       - name: Cache local Maven repository
         uses: actions/cache@v3
@@ -27,9 +30,14 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - name: Build
+      - name: Build starlight
+        if: ${{ matrix.java == '8' }}
         run: |
           mvn -B verify --file starlight/pom.xml --no-transfer-progress 
+          
+      - name: Build starlight-starter
+        if: ${{ matrix.java == '17' }}  
+        run: |
           mvn -B verify --file spring-cloud-starter-baidu-starlight/pom.xml --no-transfer-progress
 
       - name: Upload Coverage Report

diff --git a/spring-cloud-starter-baidu-starlight/pom.xml b/spring-cloud-starter-baidu-starlight/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -17,12 +18,12 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
         <spring-cloud.version>2022.0.0</spring-cloud.version>
         <!-- plugin versions -->
         <powermock.version>2.0.9</powermock.version>
         <starlight.version>2024.0.2-SNAPSHOT</starlight.version>
-	<git-commit-id-plugin.version>2.2.5</git-commit-id-plugin.version>
+        <git-commit-id-plugin.version>2.2.5</git-commit-id-plugin.version>
     </properties>
 
     <dependencyManagement>
@@ -148,14 +149,14 @@
             <artifactId>reflections</artifactId>
             <version>0.10.2</version>
         </dependency>
-	
-	<dependency>
+        
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
             <scope>test</scope>
         </dependency>
-	
-	<dependency>
+        
+        <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
@@ -268,7 +269,7 @@
                     <tagNameFormat>starter-v@{project.version}</tagNameFormat>
                 </configuration>
             </plugin>
-
+            <!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -282,16 +283,28 @@
                     </execution>
                 </executions>
             </plugin>
+            -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.6.3</version>
+                <version>3.11.2</version>
+                <configuration>
+                    <source>17</source>
+                    <!-- 指定 JDK 版本 -->
+                    <encoding>UTF-8</encoding>
+                    <!-- 文档的编码 -->
+                    <doclint>none</doclint>
+                    <!-- 禁用文档校验 -->
+                </configuration>
                 <executions>
                     <execution>
-                        <id>attach-javadocs</id>
                         <goals>
                             <goal>jar</goal>
                         </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <additionalJOptions>-Xdoclint:none</additionalJOptions>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -323,45 +336,7 @@
                     </execution>
                 </executions>
             </plugin>
-	    <plugin>
-                    <groupId>com.github.os72</groupId>
-                    <artifactId>protoc-jar-maven-plugin</artifactId>
-                    <version>3.6.0.1</version>
-                    <executions>
-                        <execution>
-                            <id>generate-sources</id>
-                            <phase>generate-sources</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                            <configuration>
-                                <protocVersion>2.5.0</protocVersion>
-                                <addSources>none</addSources>
-                                <includeStdTypes>true</includeStdTypes>
-                                <outputDirectory>src/main/java</outputDirectory>
-                                <inputDirectories>
-                                    <include>src/main/proto</include>
-                                </inputDirectories>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>generate-test-sources</id>
-                            <phase>generate-test-sources</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                            <configuration>
-                                <protocVersion>2.5.0</protocVersion>
-                                <includeStdTypes>true</includeStdTypes>
-                                <addSources>none</addSources>
-                                <outputDirectory>src/test/java</outputDirectory>
-                                <inputDirectories>
-                                    <include>src/test/proto</include>
-                                </inputDirectories>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
+
         </plugins>
     </build>
     <url>https://github.com/baidu/starlight</url>
@@ -435,7 +410,7 @@
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.13</version>
+                        <version>1.6.14</version>
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>ossrh</serverId>