This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new 4b18bfb9a8 [MNG-8372] Augment error message to give users more context 
when running into deprecated encryption warning (#1898)
4b18bfb9a8 is described below

commit 4b18bfb9a8f00548bb7f067997f1f1ce2e29ce58
Author: P. Ottlinger <ottlin...@users.noreply.github.com>
AuthorDate: Wed Nov 13 15:15:57 2024 +0100

    [MNG-8372] Augment error message to give users more context when running 
into deprecated encryption warning (#1898)
    
    Augment error message to give users more context when running into 
deprecated encryption warning
    
    ---
    
    https://issues.apache.org/jira/browse/MNG-8372
---
 .../settings/crypto/DefaultSettingsDecrypter.java  |  3 ++-
 .../README.md                                      | 28 +++++++++++-----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git 
a/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java
 
b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java
index 59d1c13921..f427a95b74 100644
--- 
a/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java
+++ 
b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java
@@ -64,7 +64,8 @@ public class DefaultSettingsDecrypter implements 
SettingsDecrypter {
                 try {
                     if (securityDispatcher.isLegacyEncryptedString(password)) {
                         problems.add(new DefaultSettingsProblem(
-                                "Legacy/insecurely encrypted password detected 
for server " + server.getId(),
+                                "Pre-Maven 4 legacy encrypted password 
detected for server " + server.getId()
+                                        + " - configure password encryption 
with the help of mvnenc to be compatible with Maven 4.",
                                 Severity.WARNING,
                                 "server: " + server.getId(),
                                 -1,
diff --git 
a/its/core-it-suite/src/test/resources/mng-8347-transitive-dependency-manager/README.md
 
b/its/core-it-suite/src/test/resources/mng-8347-transitive-dependency-manager/README.md
index 5676a8b370..13052a01c0 100644
--- 
a/its/core-it-suite/src/test/resources/mng-8347-transitive-dependency-manager/README.md
+++ 
b/its/core-it-suite/src/test/resources/mng-8347-transitive-dependency-manager/README.md
@@ -23,12 +23,12 @@ Java version: 21.0.4, vendor: Eclipse Adoptium, runtime: 
/home/cstamas/.sdkman/c
 Default locale: en_US, platform encoding: UTF-8
 OS name: "linux", version: "6.11.4-201.fc40.x86_64", arch: "amd64", family: 
"unix"
 [INFO] Scanning for projects...
-[INFO] 
+[INFO]
 [INFO] ---------------< org.apache.maven.it.mresolver614:root >----------------
 [INFO] Building root 1.0.0
 [INFO]   from pom.xml
 [INFO] --------------------------------[ jar ]---------------------------------
-[INFO] 
+[INFO]
 [INFO] --- toolbox:0.3.5:tree (default-cli) @ root ---
 [INFO] org.apache.maven.it.mresolver614:root:jar:1.0.0
 [INFO] ╰─org.apache.maven.it.mresolver614:level1:jar:1.0.0 [compile]
@@ -43,7 +43,7 @@ OS name: "linux", version: "6.11.4-201.fc40.x86_64", arch: 
"amd64", family: "uni
 [INFO] Total time:  0.192 s
 [INFO] Finished at: 2024-10-24T19:20:39+02:00
 [INFO] ------------------------------------------------------------------------
-$ 
+$
 ```
 
 Example output with 4.0.0-beta-5: **this version is transitive but broken**, 
as it applies level2 depMgt onto its own
@@ -56,15 +56,15 @@ Java version: 21.0.4, vendor: Eclipse Adoptium, runtime: 
/home/cstamas/.sdkman/c
 Default locale: en_US, platform encoding: UTF-8
 OS name: "linux", version: "6.11.4-201.fc40.x86_64", arch: "amd64", family: 
"unix"
 [WARNING] Unable to find the root directory. Create a .mvn directory in the 
root directory or add the root="true" attribute on the root project's model to 
identify it.
-[WARNING] Legacy/insecurely encrypted password detected for server 
my-legacy-server
-[WARNING] Legacy/insecurely encrypted password detected for server 
my-legacy-broken-server
+[WARNING] Pre-Maven 4 legacy encrypted password detected for server 
my-legacy-server - configure password encryption with the help of mvnenc to be 
compatible with Maven 4.
+[WARNING] Pre-Maven 4 legacy encrypted password detected for server 
my-legacy-broken-server - configure password encryption with the help of mvnenc 
to be compatible with Maven 4.
 [INFO] Scanning for projects...
-[INFO] 
+[INFO]
 [INFO] ----------------------------------------< 
org.apache.maven.it.mresolver614:root >-----------------------------------------
 [INFO] Building root 1.0.0
 [INFO]   from pom.xml
 [INFO] ---------------------------------------------------------[ jar 
]----------------------------------------------------------
-[INFO] 
+[INFO]
 [INFO] --- toolbox:0.3.5:tree (default-cli) @ root ---
 [INFO] org.apache.maven.it.mresolver614:root:jar:1.0.0
 [INFO] ╰─org.apache.maven.it.mresolver614:level1:jar:1.0.0 [compile]
@@ -79,7 +79,7 @@ OS name: "linux", version: "6.11.4-201.fc40.x86_64", arch: 
"amd64", family: "uni
 [INFO] Total time:  0.285 s
 [INFO] Finished at: 2024-10-24T19:21:10+02:00
 [INFO] 
--------------------------------------------------------------------------------------------------------------------------
-$ 
+$
 ```
 
 The **expected** output is:
@@ -103,15 +103,15 @@ Java version: 21.0.4, vendor: Eclipse Adoptium, runtime: 
/home/cstamas/.sdkman/c
 Default locale: en_US, platform encoding: UTF-8
 OS name: "linux", version: "6.11.4-201.fc40.x86_64", arch: "amd64", family: 
"unix"
 [WARNING] Unable to find the root directory. Create a .mvn directory in the 
root directory or add the root="true" attribute on the root project's model to 
identify it.
-[WARNING] Legacy/insecurely encrypted password detected for server 
my-legacy-server
-[WARNING] Legacy/insecurely encrypted password detected for server 
my-legacy-broken-server
+[WARNING] Pre-Maven 4 legacy encrypted password detected for server 
my-legacy-server - configure password encryption with the help of mvnenc to be 
compatible with Maven 4.
+[WARNING] Pre-Maven 4 legacy encrypted password detected for server 
my-legacy-broken-server - configure password encryption with the help of mvnenc 
to be compatible with Maven 4.
 [INFO] Scanning for projects...
-[INFO] 
+[INFO]
 [INFO] ----------------------------------------< 
org.apache.maven.it.mresolver614:root >-----------------------------------------
 [INFO] Building root 1.0.0
 [INFO]   from pom.xml
 [INFO] ---------------------------------------------------------[ jar 
]----------------------------------------------------------
-[INFO] 
+[INFO]
 [INFO] --- toolbox:0.3.5:tree (default-cli) @ root ---
 [INFO] org.apache.maven.it.mresolver614:root:jar:1.0.0
 [INFO] ╰─org.apache.maven.it.mresolver614:level1:jar:1.0.0 [compile]
@@ -126,5 +126,5 @@ OS name: "linux", version: "6.11.4-201.fc40.x86_64", arch: 
"amd64", family: "uni
 [INFO] Total time:  0.312 s
 [INFO] Finished at: 2024-10-24T21:11:21+02:00
 [INFO] 
--------------------------------------------------------------------------------------------------------------------------
-$ 
-```
\ No newline at end of file
+$
+```

Reply via email to