From c6341168bbc359b98d52c8dd2872a572a51cc686 Mon Sep 17 00:00:00 2001 From: aboyko Date: Tue, 16 Jan 2024 18:39:11 -0500 Subject: [PATCH] Attempt to fix failed p2 repo JAR download. Upgrade Maven and set some maven options --- .github/workflows/gh-hosted-eclipse-distro-build.yml | 3 ++- eclipse-distribution/.mvn/wrapper/maven-wrapper.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- eclipse-language-servers/.mvn/wrapper/maven-wrapper.properties | 2 +- headless-services/.mvn/wrapper/maven-wrapper.properties | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml index 2a9a86249..79985e6e8 100644 --- a/.github/workflows/gh-hosted-eclipse-distro-build.yml +++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml @@ -52,6 +52,7 @@ jobs: echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --passphrase-fd 0 --import gpg.asc - name: Build Eclipse Distro env: + MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=5 -Daether.connector.http.connectionMaxTtl=25 -Dhttp.keepAlive=false gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }} gpg_keyname: ${{ secrets.GPG_KEYID }} run: | @@ -66,7 +67,7 @@ jobs: p2_qualifier_param="-Dp2.qualifier=${p2_qualifier}" fi cd eclipse-distribution - ./mvnw --batch-mode -U clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts4_ls_version_param $p2_qualifier_param -Pgitactions -Pgpg.sign -Dmaven.repo.local=~/.m2/repository-signed -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dp2.replaceQualifier=true -Dorg.eclipse.ecf.provider.filetransfer.httpclient.retrieve.readTimeout=1200000 -Dorg.eclipse.equinox.p2.transport.ecf.retry=5 -Dskip.eclipserun.proxies=false -Dtycho.equinox.resolver.uses=true + ./mvnw --batch-mode -U clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts4_ls_version_param $p2_qualifier_param -Pgitactions -Pgpg.sign -Dmaven.repo.local=~/.m2/repository-signed -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dp2.replaceQualifier=true -Dskip.eclipserun.proxies=false -Dtycho.equinox.resolver.uses=true - name: Store S3 Paths id: s3-paths run: | diff --git a/eclipse-distribution/.mvn/wrapper/maven-wrapper.properties b/eclipse-distribution/.mvn/wrapper/maven-wrapper.properties index 5366408e6..2f9352f71 100644 --- a/eclipse-distribution/.mvn/wrapper/maven-wrapper.properties +++ b/eclipse-distribution/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/eclipse-extensions/sts-gradle-model-plugin/sts-gradle-model-plugin/gradle/wrapper/gradle-wrapper.properties b/eclipse-extensions/sts-gradle-model-plugin/sts-gradle-model-plugin/gradle/wrapper/gradle-wrapper.properties index aa991fcea..a59520664 100644 --- a/eclipse-extensions/sts-gradle-model-plugin/sts-gradle-model-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/eclipse-extensions/sts-gradle-model-plugin/sts-gradle-model-plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/eclipse-language-servers/.mvn/wrapper/maven-wrapper.properties b/eclipse-language-servers/.mvn/wrapper/maven-wrapper.properties index 5366408e6..2f9352f71 100644 --- a/eclipse-language-servers/.mvn/wrapper/maven-wrapper.properties +++ b/eclipse-language-servers/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/headless-services/.mvn/wrapper/maven-wrapper.properties b/headless-services/.mvn/wrapper/maven-wrapper.properties index 5366408e6..2f9352f71 100644 --- a/headless-services/.mvn/wrapper/maven-wrapper.properties +++ b/headless-services/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar