From ad7b9fe0993b8ff1bd6d1e8c605d3842ca419a89 Mon Sep 17 00:00:00 2001 From: aboyko Date: Thu, 9 Nov 2023 10:56:46 -0500 Subject: [PATCH] GHA: Cleanup eclipse ls ext pom and command --- .../workflows/eclipse-ls-extensions-build.yml | 8 +- eclipse-distribution/pom.xml | 2 +- eclipse-language-servers/pom.xml | 163 +----------------- headless-services/jdt-ls-extension/pom.xml | 2 +- 4 files changed, 8 insertions(+), 167 deletions(-) diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml index d59fefcb2..010b11557 100644 --- a/.github/workflows/eclipse-ls-extensions-build.yml +++ b/.github/workflows/eclipse-ls-extensions-build.yml @@ -73,9 +73,9 @@ jobs: fi cd eclipse-language-servers if command -v xvfb-run ; then - xvfb-run ./mvnw --batch-mode clean deploy -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts4_ls_version_param -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dsigning.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Ds3service.https-only=true -Dtycho.localArtifacts=ignore + xvfb-run ./mvnw --batch-mode clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts4_ls_version_param -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore else - ./mvnw --batch-mode clean deploy -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts4_ls_version_param -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dsigning.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Ds3service.https-only=true -Dtycho.localArtifacts=ignore + ./mvnw --batch-mode clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts4_ls_version_param -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore fi - name: Akamai Setup id: akamai-setup @@ -121,9 +121,9 @@ jobs: run: | cd eclipse-language-servers if command -v xvfb-run ; then - xvfb-run ./mvnw --batch-mode clean package -Pe430 -P${{ inputs.build_type }} -Dsigning.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Ds3service.https-only=true -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore + xvfb-run ./mvnw --batch-mode clean package -Pe430 -P${{ inputs.build_type }} -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore else - ./mvnw --batch-mode clean package -Pe430 -P${{ inputs.build_type }} -Dsigning.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Ds3service.https-only=true -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore + ./mvnw --batch-mode clean package -Pe430 -P${{ inputs.build_type }} -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore fi notify-failure: diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml index 0f21d057f..a34dac177 100644 --- a/eclipse-distribution/pom.xml +++ b/eclipse-distribution/pom.xml @@ -89,7 +89,7 @@ nightly ${dist.type}/${dist.key}/${dist.project}/${dist.pathpostfix} - https://dist.springsource.com/${dist.type}/TOOLS/sts4-language-server-integrations/${sts4-language-servers-version} + https://cdn.spring.io/spring-tools/${dist.type}/TOOLS/sts4-language-server-integrations/${sts4-language-servers-version} 4.0.0 UTF-8 diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml index 55bafbc8c..5af9a8784 100644 --- a/eclipse-language-servers/pom.xml +++ b/eclipse-language-servers/pom.xml @@ -77,32 +77,17 @@ SNAPSHOT - false Spring Boot IDE Language Server - - true - vmware - - - true - - 4.0.0 + 4.0.4 UTF-8 - ${env.AWS_ACCESS_KEY_ID} - ${env.AWS_SECRET_ACCESS_KEY} - tools-spring-io TOOLS ${dist.type}/${dist.key}/${dist.project}/${dist.version} 3.9.4.202211021051 - ${env.bamboo_vault_tools_signing_gpg_secret_passphrase} - - signer - ~bamboo/.ssh/id_rsa @@ -153,32 +138,6 @@ - - vm-signing - - - - exec-maven-plugin - org.codehaus.mojo - - - VM JAR Sign - package - - exec - - - - - - ${project.build.directory} - - - - - - - e428 @@ -338,46 +297,13 @@ - - build.springsource.com - - - bamboo.buildNumber - - - - - CI-B${bamboo.buildNumber} - true - - - - - - - bamboo-signing - - ${env.bamboo_vault_signing_passphrase} - ${env.bamboo_vault_signing_passphrase} - - - - - aboyko - - aboyko - ~/.ssh/id_rsa - - - p2-thirdparty-bundles p2 - https://dist.springsource.com/release/TOOLS/third-party/misc-p2-repo/${misc.p2.repo.version} + https://cdn.spring.io/spring-tools/release/TOOLS/third-party/misc-p2-repo/${misc.p2.repo.version} @@ -411,14 +337,6 @@ - - @@ -441,14 +359,6 @@ - - maven-deploy-plugin - 2.5 - - true - - - org.eclipse.tycho tycho-maven-plugin @@ -465,30 +375,6 @@ - - org.apache.maven.plugins - maven-jarsigner-plugin - 3.0.0 - - - sign - - sign - - - - - ${signing.skip} - ${signing.alias} - ${signing.keystore} - ${signing.storetype} - ${signing.store.password} - ${signing.key.password} - - http://timestamp.digicert.com - - - org.eclipse.tycho tycho-p2-plugin @@ -583,51 +469,6 @@ ISO-8859-1 - - org.apache.maven.plugins - maven-antrun-plugin - 1.6 - - - ant-contrib - ant-contrib - 1.0b3 - - - ant - ant - - - - - org.apache.ant - ant-nodeps - 1.8.1 - - - org.springframework.build - org.springframework.build.aws.ant - 3.0.6.RELEASE - - - net.java.dev.jets3t - jets3t - 0.8.1 - - - - - - exec-maven-plugin - org.codehaus.mojo - - scripts/sign-jars.sh - - ${vm-signing.ssh.user} - ${vm-signing.ssh.key} - - - diff --git a/headless-services/jdt-ls-extension/pom.xml b/headless-services/jdt-ls-extension/pom.xml index a15d2f277..f5d18d59f 100644 --- a/headless-services/jdt-ls-extension/pom.xml +++ b/headless-services/jdt-ls-extension/pom.xml @@ -45,7 +45,7 @@ - 4.0.0 + 4.0.4 true