From e3092521b16c87e24ae6d255a06edca2317dd4c3 Mon Sep 17 00:00:00 2001
From: Dmitrii Unterov <du228@cam.ac.uk>
Date: Fri, 28 Feb 2025 10:09:07 +0000
Subject: [PATCH] fix: add -Dmaven.resolver.transport=wagon to MAVEN_CLI_OPTS
---
CHANGELOG.md | 9 +++++++++
auto-devops/maven.gitlab-ci.yml | 3 +--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 258ffad..c0a9f02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [6.7.2] - 2025-02-28
+
+### Changed
+
+- Removed `-Dhttp.keepAlive=false` and `-Dmaven.wagon.http.pool=false` options
+ from `MAVEN_OPTS` in `auto-devops/maven.gitlab-ci.yml` file.
+- Added `-Dmaven.resolver.transport=wagon` to `MAVEN_CLI_OPTS` in
+ `auto-devops/maven.gitlab-ci.yml` file.
+
## [6.7.1] - 2025-02-26
### Added
diff --git a/auto-devops/maven.gitlab-ci.yml b/auto-devops/maven.gitlab-ci.yml
index 41cbcc3..77e3515 100644
--- a/auto-devops/maven.gitlab-ci.yml
+++ b/auto-devops/maven.gitlab-ci.yml
@@ -95,8 +95,6 @@ services:
-Dorg.slf4j.simpleLogger.showDateTime=true
-Djava.awt.headless=true
-Xmx512m
- -Dhttp.keepAlive=false
- -Dmaven.wagon.http.pool=false
# As of Maven 3.3.0 instead of this you MAY define these options in `.mvn/maven.config` so the
# same config is used when running from the command line.
@@ -112,6 +110,7 @@ services:
--no-transfer-progress
-DinstallAtEnd=true
-DdeployAtEnd=true
+ -Dmaven.resolver.transport=wagon
--settings ci_settings.xml
# Template verify-only job to run tests.
--
GitLab