From 9e4de918aca7e131816cf35509581dd363dc1ed7 Mon Sep 17 00:00:00 2001 From: Pil0tXia Date: Mon, 1 Jan 2024 19:32:37 +0800 Subject: [PATCH 1/3] remove task jar --- .github/workflows/ci.yml | 2 +- docker/Dockerfile_jdk11 | 2 +- docker/Dockerfile_jdk8 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 98f7c66736..64a5c67115 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,7 +82,7 @@ jobs: # https://docs.gradle.org/current/userguide/performance.html - name: Build - run: ./gradlew clean build jar dist jacocoTestReport -x spotlessJava -x generateGrammarSource --parallel --daemon + run: ./gradlew clean build dist jacocoTestReport -x spotlessJava -x generateGrammarSource --parallel --daemon env: GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} diff --git a/docker/Dockerfile_jdk11 b/docker/Dockerfile_jdk11 index 7245e26046..95eaeb9851 100644 --- a/docker/Dockerfile_jdk11 +++ b/docker/Dockerfile_jdk11 @@ -19,7 +19,7 @@ FROM openjdk:11-jdk as builder WORKDIR /build COPY . . -RUN ./gradlew clean build jar dist --parallel --daemon +RUN ./gradlew clean build dist --parallel --daemon RUN ./gradlew installPlugin FROM openjdk:11-jdk diff --git a/docker/Dockerfile_jdk8 b/docker/Dockerfile_jdk8 index 3e98459da7..78c16290f5 100644 --- a/docker/Dockerfile_jdk8 +++ b/docker/Dockerfile_jdk8 @@ -24,7 +24,7 @@ RUN ./gradlew clean generateGrammarSource --parallel --daemon FROM openjdk:8-jdk as builder_8 WORKDIR /build COPY --from=builder_11 /build ./ -RUN ./gradlew clean build jar dist -x spotlessJava -x generateGrammarSource --parallel --daemon +RUN ./gradlew clean build dist -x spotlessJava -x generateGrammarSource --parallel --daemon RUN ./gradlew installPlugin FROM openjdk:8-jdk From 9491eb4196f99b51a67ad0ca6206a9733544d7f2 Mon Sep 17 00:00:00 2001 From: Pil0tXia Date: Wed, 3 Jan 2024 17:23:01 +0800 Subject: [PATCH 2/3] Supplement 'remove task jar' --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64a5c67115..a18176470c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,4 +112,4 @@ jobs: - name: Check third party dependencies run: | - ./gradlew clean jar dist -x spotlessJava -x test -x checkstyleMain -x javaDoc && ./gradlew installPlugin && ./gradlew tar && sh tools/dependency-check/check-dependencies.sh && echo "Thirty party dependencies check success" + ./gradlew clean dist -x spotlessJava -x test -x checkstyleMain -x javaDoc && ./gradlew installPlugin && ./gradlew tar && sh tools/dependency-check/check-dependencies.sh && echo "Thirty party dependencies check success" From 794b8b102b0d61f7431bda5101d36ff94e091a57 Mon Sep 17 00:00:00 2001 From: Pil0tXia Date: Wed, 3 Jan 2024 17:27:45 +0800 Subject: [PATCH 3/3] http to https --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6f56a72919..774e2ae998 100644 --- a/build.gradle +++ b/build.gradle @@ -437,7 +437,7 @@ subprojects { licenses { license { name = 'The Apache License, Version 2.0' - url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + url = 'https://www.apache.org/licenses/LICENSE-2.0.txt' } } developers {