From ee84b6780d515385d64474b5542b7699af151c61 Mon Sep 17 00:00:00 2001 From: Marcin Januszkiewicz Date: Fri, 25 Oct 2024 11:56:29 +0200 Subject: [PATCH 1/3] Update CI actions, do not persist credentials for checkout action --- .github/workflows/release-from-tag.yml | 10 ++++++---- .github/workflows/test.yml | 9 +++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-from-tag.yml b/.github/workflows/release-from-tag.yml index 9256495..650565f 100644 --- a/.github/workflows/release-from-tag.yml +++ b/.github/workflows/release-from-tag.yml @@ -12,9 +12,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 + with: + persist-credentials: false - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'adopt' @@ -22,11 +24,11 @@ jobs: settings-path: ${{ github.workspace }} # location for the settings.xml file - name: Build with Gradle - uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021 + uses: gradle/actions/setup-gradle@v3 with: arguments: -Ptag=${{github.ref_name}} shadowJar - name: GH Release - uses: softprops/action-gh-release@v0.1.14 + uses: softprops/action-gh-release@v2 with: files: "**/build/libs/*.jar" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e449b94..7b61e02 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,10 +17,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - + - uses: actions/checkout@v4 + with: + persist-credentials: false - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'adopt' @@ -28,6 +29,6 @@ jobs: settings-path: ${{ github.workspace }} # location for the settings.xml file - name: Build the plugin - uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021 + uses: gradle/actions/setup-gradle@v3 with: arguments: dockerTest From c10650a1bf8a2be74efb8ac96c09b00e13acab78 Mon Sep 17 00:00:00 2001 From: Marcin Januszkiewicz Date: Fri, 25 Oct 2024 12:03:25 +0200 Subject: [PATCH 2/3] Remove deprecated functionality --- .github/workflows/release-from-tag.yml | 7 +++---- .github/workflows/test.yml | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-from-tag.yml b/.github/workflows/release-from-tag.yml index 650565f..e790c41 100644 --- a/.github/workflows/release-from-tag.yml +++ b/.github/workflows/release-from-tag.yml @@ -22,11 +22,10 @@ jobs: distribution: 'adopt' server-id: github # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Build with Gradle + - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 - with: - arguments: -Ptag=${{github.ref_name}} shadowJar + - name: Build with Gradle + run: ./gradlew -Ptag=${{github.ref_name}} shadowJar - name: GH Release uses: softprops/action-gh-release@v2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7b61e02..8a17780 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,8 +27,7 @@ jobs: distribution: 'adopt' server-id: github # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Build the plugin + - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 - with: - arguments: dockerTest + - name: Test the plugin + run: ./gradlew dockerTest From 57dae30557886a7ffde1857010898dfbafd1d4be Mon Sep 17 00:00:00 2001 From: Marcin Januszkiewicz Date: Fri, 25 Oct 2024 12:12:02 +0200 Subject: [PATCH 3/3] Update restlet maven repo location --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d294179..b08e0fb 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ configure(subprojects) { repositories { mavenCentral() maven { - url "http://maven.restlet.org/" + url "http://maven.restlet.talend.com/" allowInsecureProtocol = true } }