feat: 升级JDK17 #10593

.github/workflows/backend.yml

@@ -39,11 +39,11 @@ jobs:
         export MYSQL_PWD=root
         for i in *.sql;do echo $i;mysql -h 127.0.0.1 --port ${{ job.services.mysql.ports['3306'] }} -uroot < $i;done
       working-directory: support-files/sql
-    - name: Set up JDK 1.8
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
         distribution: "temurin"
-        java-version: "8"
+        java-version: "17"
     - uses: actions/cache@v4
       with:
         path: |
@@ -79,11 +79,11 @@ jobs:
         export MYSQL_PWD=root
         for i in *.sql;do echo $i;mysql -h 127.0.0.1 --port ${{ job.services.mysql.ports['3306'] }} -uroot < $i;done
       working-directory: support-files/sql
-    - name: Set up JDK 1.8
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
         distribution: "temurin"
-        java-version: "8"
+        java-version: "17"
     - uses: actions/cache@v4
       with:
         path: |

.github/workflows/publishMavenJar4CI.yml

@@ -29,10 +29,10 @@ jobs:
           export MYSQL_PWD=root
           for i in *.sql;do echo $i;mysql -h 127.0.0.1 --port ${{ job.services.mysql.ports['3306'] }} -uroot < $i;done
         working-directory: support-files/sql
-      - name: Set up JDK 1.8
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 17
       - name: Cache Gradle packages
         uses: actions/cache@v4
         with:

docker-images/core/ci/dockerfile/backend.bkci.Dockerfile

@@ -1,4 +1,4 @@
-FROM bkci/jdk:0.0.5
+FROM bkci/jdk:0.0.9-jdk17
 
 LABEL maintainer="Tencent BlueKing Devops"
 

docker-images/core/ci/dockerfile/backend.bkci.sh

@@ -5,7 +5,7 @@ source service.env
 export JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS $JAVA_TOOL_OPTIONS_TMP"
 
 MEM_OPTS="-XX:+UseContainerSupport -Xss512k -XX:MaxMetaspaceSize=500m -XX:CompressedClassSpaceSize=100m -XX:ReservedCodeCacheSize=400m -XX:-UseAdaptiveSizePolicy -XX:MaxGCPauseMillis=100"
-GC_LOG="-Xloggc:/data/workspace/$MS_NAME/jvm/gc-%t.log -XX:+PrintTenuringDistribution -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
+GC_LOG="-Xlog:gc*,gc+age=trace:file=/data/workspace/$MS_NAME/jvm/gc-%t.log:time,level,tags"
 API_PORT=80
 
 echo "create log dir"

docker-images/core/ci/dockerfile/jdk.Dockerfile

@@ -1,33 +1,33 @@
-FROM bkci/os:0.0.1
+FROM bkci/os:0.0.2
 
 LABEL maintainer="Tencent BlueKing Devops"
 
 ## 安装JDK
 RUN mkdir -p /data && \
     cd /data/ &&\
-    curl -OL https://github.com/Tencent/TencentKona-8/releases/download/8.0.13-GA/TencentKona8.0.13.b1_jdk_linux-x86_64_8u362.tar.gz &&\
-    tar -xzf TencentKona8.0.13.b1_jdk_linux-x86_64_8u362.tar.gz &&\
-    rm -f TencentKona8.0.13.b1_jdk_linux-x86_64_8u362.tar.gz
-ENV JAVA_HOME=/data/TencentKona-8.0.13-362
+    curl -L https://github.com/Tencent/TencentKona-17/releases/download/TencentKona-17.0.8/TencentKona-17.0.8.b1-jdk_linux-x86_64.tar.gz -o kona.tar.gz &&\
+    tar -xzf kona.tar.gz &&\
+    rm -f kona.tar.gz
+ENV JAVA_HOME=/data/TencentKona-17.0.8.b1
 ENV PATH=${JAVA_HOME}/bin:$PATH
 ENV CLASSPATH=.:${JAVA_HOME}/lib
 
 # 安装软件
-RUN yum update -y &&\
-    yum install -y epel-release &&\
-    yum install -y mysql &&\
-    yum install -y redis &&\
-    yum install -y python3 &&\
-    pip3 install requests 
+RUN dnf makecache &&\
+    dnf install -y mysql &&\
+    dnf install -y redis &&\
+    dnf install -y python3 &&\
+    dnf install -y pip3 &&\
+    pip install requests
 
 # 安装Java工具
 RUN mkdir -p /data/tools && \
     curl -o /data/tools/arthas.jar https://arthas.aliyun.com/arthas-boot.jar  && \
     curl -o /data/tools/ot-agent.jar https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar -L
 
 # 安装第三方构建机JRE
-RUN wget "https://github.com/bkdevops-projects/devops-jre/raw/main/linux/jre.zip" -P /data/workspace/agent-package/jre/linux/ &&\
-    wget "https://github.com/bkdevops-projects/devops-jre/raw/main/windows/jre.zip" -P /data/workspace/agent-package/jre/windows/ &&\
-    wget "https://github.com/bkdevops-projects/devops-jre/raw/main/macos/jre.zip" -P /data/workspace/agent-package/jre/macos/ &&\
-    wget "https://github.com/bkdevops-projects/devops-jre/raw/main/linux_arm64/jre.zip" -P /data/workspace/agent-package/jre/linux_arm64/ &&\
-    wget "https://github.com/bkdevops-projects/devops-jre/raw/main/macos_arm64/jre.zip" -P /data/workspace/agent-package/jre/macos_arm64/ 
+RUN wget "https://raw.githubusercontent.com/bkdevops-projects/devops-jre/refs/heads/jdk17/linux/jdk17.zip" -P /data/workspace/agent-package/jre/linux/ &&\
+    wget "https://raw.githubusercontent.com/bkdevops-projects/devops-jre/refs/heads/jdk17/windows/jdk17.zip" -P /data/workspace/agent-package/jre/windows/ &&\
+    wget "https://raw.githubusercontent.com/bkdevops-projects/devops-jre/refs/heads/jdk17/macos/jdk17.zip" -P /data/workspace/agent-package/jre/macos/ &&\
+    wget "https://raw.githubusercontent.com/bkdevops-projects/devops-jre/refs/heads/jdk17/linux_arm64/jdk17.zip" -P /data/workspace/agent-package/jre/linux_arm64/ &&\
+    wget "https://raw.githubusercontent.com/bkdevops-projects/devops-jre/refs/heads/jdk17/macos_arm64/jdk17.zip" -P /data/workspace/agent-package/jre/macos_arm64/ 

docker-images/core/ci/dockerfile/os.Dockerfile

@@ -1,4 +1,4 @@
-FROM centos:7
+FROM fedora:42
 
 LABEL maintainer="Tencent BlueKing Devops"
 
@@ -11,9 +11,9 @@ RUN ln -snf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime &&\
     echo 'alias tailf="tail -f"' >> ~/.bashrc
 
 # 安装软件
-RUN yum install -y procps && \
-    yum install -y vi && \
-    yum install -y vim && \
-    yum install -y less && \
-    yum install -y wget && \
-    yum install -y lrzsz
+RUN dnf install -y procps && \
+    dnf install -y vi && \
+    dnf install -y vim && \
+    dnf install -y less && \
+    dnf install -y wget && \
+    dnf install -y lrzsz

helm-charts/core/ci/base/values.yaml

@@ -82,9 +82,9 @@ init:
   defaultImage:
     enabled: true
     image:
-      registry: registry-1.docker.io/bkci
+      registry: bkci
       repository: ci
-      tag: latest
+      tag: jdk17
   plugin:
     enabled: false
     atoms:

helm-charts/core/ci/local_chart/kubernetes-management/values.yaml

@@ -16,7 +16,7 @@ multiCluster:
 # 镜像配置
 backendImage:
   pullPolicy: IfNotPresent
-  registry: registry-1.docker.io/bkci
+  registry: bkci
   repository: bkci-kubernetes-manager
   tag: 0.0.32
   pullPolicy: IfNotPresent 
@@ -153,7 +153,7 @@ kubernetesManager:
   buildlessDeployment:
     # bkci/ci:latest
     image: 
-      registry: registry-1.docker.io/bkci
+      registry: bkci
       repository: ci
       tag: latest
   apiserver:
@@ -171,7 +171,7 @@ kubernetesManager:
   docker:
     enable: false
     image: 
-      registry: registry-1.docker.io
+      registry: "docker.io"
       repository: docker
       tag: 24.0.1-dind
     resources:

helm-charts/core/ci/templates/artifactory/statefulset.yaml

@@ -151,7 +151,7 @@ spec:
           volumeMounts:
             - name: storage
               mountPath: {{ .Values.persistence.mountPath }}
-            - mountPath: /data/workspace/dispatch/jvm
+            - mountPath: /data/workspace/artifactory/jvm
               name: log-volume
               subPathExpr: bkci/jvm/$(POD_NAME)
           lifecycle:

scripts/bk-ci-setup.sh

@@ -170,7 +170,7 @@ setup_ci__ms_service_env (){
   env_line_append "$service_env" "CLASSPATH" ".:lib/*"
   env_line_append "$service_env" "SPRING_CONFIG_LOCATION" "file:./application.yml"
   env_line_append "$service_env" "SPRING_CLOUD_CONFIG_ENABLED" false
-  env_line_append "$service_env" "JAVA_TOOL_OPTIONS" "-Dspring.main.allow-circular-references=true -Djava.security.egd=file:/dev/urandom -Dcertificate.file= -Dservice.log.dir=./logs/ -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=utf8 -XX:NewRatio=1 -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC"
+  env_line_append "$service_env" "JAVA_TOOL_OPTIONS" "-Dspring.main.allow-circular-references=true -Djava.security.egd=file:/dev/urandom -Dcertificate.file= -Dservice.log.dir=./logs/ -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=utf8 -XX:NewRatio=1 -XX:SurvivorRatio=8 -XX:+UseG1GC"
 }
 
 # 微服务启动env.

scripts/bk-ci-slim.sh

@@ -167,7 +167,7 @@ MEM_OPTS="-Xms256m -Xmx512m"
 CLASSPATH=".:lib/*"
 SPRING_CONFIG_LOCATION="file:./application.yml"
 SPRING_CLOUD_CONFIG_ENABLED=false
-JAVA_TOOL_OPTIONS="-Dspring.main.allow-circular-references=true -Djava.security.egd=file:/dev/urandom -Dcertificate.file= -Dservice.log.dir=./logs/ -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=utf8 -XX:NewRatio=1 -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC"
+JAVA_TOOL_OPTIONS="-Dspring.main.allow-circular-references=true -Djava.security.egd=file:/dev/urandom -Dcertificate.file= -Dservice.log.dir=./logs/ -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=utf8 -XX:NewRatio=1 -XX:SurvivorRatio=8 -XX:+UseG1GC"
 EOF
 
 echo "copy classes:"

src/backend/ci/boot-assembly/build.gradle.kts

@@ -47,5 +47,5 @@ dependencies {
 }
 
 configurations.all {
-    exclude(group = "javax.ws.rs", module = "jsr311-api")
+    exclude(group = "jakarta.ws.rs", module = "jsr311-api")
 }

src/backend/ci/build.gradle.kts

@@ -1,13 +1,11 @@
 import java.net.URI
 
 plugins {
-    id("com.tencent.devops.boot") version "0.0.7"
+    id("com.tencent.devops.boot") version "1.0.0"
     detektCheck
     `task-license-report` // 检查License合规
 }
 
-apply(plugin = "org.owasp.dependencycheck")
-
 allprojects {
     apply(plugin = "com.tencent.devops.boot")
     // 包路径
@@ -19,7 +17,6 @@ allprojects {
     // 加载boot的插件
     if (name.startsWith("boot-")) {
         pluginManager.apply("task-sharding-db-table-check") // 分区表检查插件
-        pluginManager.apply("org.owasp.dependencycheck") // 检查依赖包漏洞版本
         pluginManager.apply("task-i18n-load") // i18n插件
         if (System.getProperty("devops.assemblyMode") == "KUBERNETES") {
             pluginManager.apply("task-docker-build") // Docker镜像构建
@@ -36,7 +33,6 @@ allprojects {
         setApplyMavenExclusions(false)
         dependencies {
             dependency("org.json:json:${Versions.orgJson}")
-            dependency("javax.ws.rs:javax.ws.rs-api:${Versions.Jaxrs}")
             dependency("org.bouncycastle:bcpkix-jdk15on:${Versions.BouncyCastle}")
             dependency("org.bouncycastle:bcprov-jdk15on:${Versions.BouncyCastle}")
             dependency("com.github.fge:json-schema-validator:${Versions.JsonSchema}")
@@ -75,6 +71,9 @@ allprojects {
             dependency("org.mybatis:mybatis:${Versions.MyBatis}")
             dependency("commons-io:commons-io:${Versions.CommonIo}")
             dependency("com.tencent.bk.sdk:crypto-java-sdk:${Versions.BkCrypto}")
+            dependency("mysql:mysql-connector-java:${Versions.MysqlDriver}")
+            dependency("org.apache.shardingsphere:shardingsphere-jdbc:${Versions.ShardingSphere}")
+            dependency("org.apache.shardingsphere:shardingsphere-infra-algorithm-core:${Versions.ShardingSphere}")
             dependencySet("org.glassfish.jersey.containers:${Versions.Jersey}") {
                 entry("jersey-container-servlet-core")
                 entry("jersey-container-servlet")
@@ -87,20 +86,20 @@ allprojects {
             dependencySet("org.glassfish.jersey.ext:${Versions.Jersey}") {
                 entry("jersey-bean-validation")
                 entry("jersey-entity-filtering")
-                entry("jersey-spring5")
+                entry("jersey-spring6")
             }
             dependencySet("org.glassfish.jersey.media:${Versions.Jersey}") {
                 entry("jersey-media-multipart")
                 entry("jersey-media-json-jackson")
             }
             dependency("org.glassfish.jersey.inject:jersey-hk2:${Versions.Jersey}")
-            dependencySet("io.swagger:${Versions.Swagger}") {
-                entry("swagger-annotations")
-                entry("swagger-jersey2-jaxrs")
-                entry("swagger-models")
+            dependencySet("io.swagger.core.v3:${Versions.Swagger}") {
+                entry("swagger-annotations-jakarta")
+                entry("swagger-jaxrs2-jakarta")
+                entry("swagger-models-jakarta")
             }
             dependencySet("com.github.docker-java:${Versions.DockerJava}") {
-                entry("docker-java")
+                entry("docker-java-core")
                 entry("docker-java-transport-okhttp")
             }
             dependencySet("com.tencent.bk.repo:${Versions.TencentBkRepo}") {
@@ -116,18 +115,7 @@ allprojects {
             dependency("io.mockk:mockk:${Versions.mockk}")
             dependencySet("io.github.resilience4j:${Versions.Resilience4j}") {
                 entry("resilience4j-circuitbreaker")
-            }
-            // TODO 修复IPv6单栈环境报错问题, 等后面Okhttp3版本升级上来就可以去掉
-            dependencySet("com.squareup.okhttp3:${Versions.Okhttp}") {
-                entry("logging-interceptor")
-                entry("mockwebserver")
-                entry("okcurl")
-                entry("okhttp")
-                entry("okhttp-dnsoverhttps")
-                entry("okhttp-sse")
-                entry("okhttp-testing-support")
-                entry("okhttp-tls")
-                entry("okhttp-urlconnection")
+                entry("resilience4j-core")
             }
             dependencySet("org.eclipse.jgit:${Versions.jgit}") {
                 entry("org.eclipse.jgit")
@@ -136,20 +124,10 @@ allprojects {
             dependency("com.tencent.bk.sdk:iam-java-sdk:${Versions.iam}")
             dependency("com.tencent.bk.sdk:spring-boot-bk-audit-starter:${Versions.audit}")
             dependency("com.jakewharton:disklrucache:${Versions.disklrucache}")
-            dependency("com.mysql:mysql-connector-j:${Versions.MysqlDriver}")
-            // TODO 升级swagger,等升级到spring boot 3.1+后可以去掉
-            dependencySet("io.swagger.core.v3:${Versions.swagger}") {
-                entry("swagger-annotations")
-                entry("swagger-jaxrs2")
-                entry("swagger-core")
-                entry("swagger-models")
-            }
             // worker需要依赖
             dependency("org.jvnet.winp:winp:${Versions.Winp}")
             dependency("net.java.dev.jna:jna:${Versions.Jna}")
             dependency("org.jenkins-ci:version-number:${Versions.JenkinsVersionNumber}")
-            // TODO 等undertow升级上来之后可以去掉
-            dependency("io.undertow:undertow-core:2.2.37.Final")
         }
     }
 
@@ -160,13 +138,16 @@ allprojects {
         it.exclude("org.slf4j", "log4j-over-slf4j")
         it.exclude("org.slf4j", "slf4j-log4j12")
         it.exclude("org.slf4j", "slf4j-nop")
-        it.exclude("javax.ws.rs", "jsr311-api")
         it.exclude("dom4j", "dom4j")
         it.exclude("com.flipkart.zjsonpatch", "zjsonpatch")
         it.exclude("com.zaxxer", "HikariCP-java7")
         it.exclude("com.tencent.devops", "devops-boot-starter-plugin")
         it.exclude("org.bouncycastle", "bcutil-jdk15on")
-        it.exclude("io.swagger") // TODO 升级swagger,等升级到spring boot 3.1+后可以去掉
+        it.exclude("io.swagger", "swagger-annotations")
+        it.exclude("io.swagger", "swagger-models")
+        it.exclude("commons-logging", "commons-logging")
+        it.exclude("com.vaadin.external.google", "android-json")
+        it.exclude("org.apache.shardingsphere", "shardingsphere-test-util")
     }
     dependencies {
         // 兼容dom4j 的 bug : https://github.com/gradle/gradle/issues/13656

src/backend/ci/buildSrc/build.gradle.kts

@@ -17,11 +17,10 @@ repositories {
 
 // 依赖插件
 dependencies {
-    implementation("nu.studer:gradle-jooq-plugin:5.2.1")
-    implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
-    implementation("org.apache.logging.log4j:log4j-core:2.17.1")
-    implementation("org.owasp:dependency-check-gradle:7.1.0.1")
+    implementation("nu.studer.jooq:nu.studer.jooq.gradle.plugin:8.2.3")
+    implementation("com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:7.1.2")
     implementation("com.google.cloud.tools:jib-gradle-plugin:3.3.1")
-    implementation("com.github.jk1:gradle-license-report:1.17") // 2.x need gradle-7.0
-    implementation("com.mysql:mysql-connector-j:8.0.33")
+    implementation("com.github.jk1:gradle-license-report:2.1")
+    implementation("com.mysql:mysql-connector-j:8.3.0")
+    implementation("org.apache.commons:commons-compress:1.26.2")// 解决冲突
 }