You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2024/08/15 12:14:24 UTC
(maven-deploy-plugin) branch MDEPLOY-320 created (now 0130bf0)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a change to branch MDEPLOY-320
in repository https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git
at 0130bf0 [MDEPLOY-320] Simplify and unify message
This branch includes the following new commits:
new 0130bf0 [MDEPLOY-320] Simplify and unify message
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(maven-deploy-plugin) 01/01: [MDEPLOY-320] Simplify and unify message
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch MDEPLOY-320
in repository https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git
commit 0130bf0fabc70bb9c1529f426f7520c8753c4244
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Thu Aug 15 14:12:55 2024 +0200
[MDEPLOY-320] Simplify and unify message
This plugin used old ctor for MojoExecutionException that
uses "message", "long message" and "source". The source
is fully unused in Maven Core, while long message just
complicates things.
Just unify message, use one "standard" exception message.
---
https://issues.apache.org/jira/browse/MDEPLOY-320
---
src/it/gav-validation/invoker.properties | 4 ++--
src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java | 7 +------
.../java/org/apache/maven/plugins/deploy/DeployMojoTest.java | 9 +++------
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/src/it/gav-validation/invoker.properties b/src/it/gav-validation/invoker.properties
index 6635374..051dc7e 100644
--- a/src/it/gav-validation/invoker.properties
+++ b/src/it/gav-validation/invoker.properties
@@ -18,5 +18,5 @@
invoker.goals = org.apache.maven.plugins:maven-deploy-plugin:${project.version}:deploy-file
invoker.buildResult = failure
-invoker.systemPropertiesFile.1 = test-invalid.properties
-invoker.systemPropertiesFile.2 = test-missing.properties
+invoker.userPropertiesFile.1 = test-invalid.properties
+invoker.userPropertiesFile.2 = test-missing.properties
diff --git a/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java b/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
index 2c58661..82c03f5 100644
--- a/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
+++ b/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
@@ -383,8 +383,6 @@ public class DeployMojo extends AbstractDeployMojo {
repo = getRemoteRepository(id, url);
} else {
throw new MojoExecutionException(
- altDeploymentRepo,
- "Invalid legacy syntax and layout for repository.",
"Invalid legacy syntax and layout for alternative repository. Use \"" + id + "::" + url
+ "\" instead, and only default layout is supported.");
}
@@ -392,10 +390,7 @@ public class DeployMojo extends AbstractDeployMojo {
matcher = ALT_REPO_SYNTAX_PATTERN.matcher(altDeploymentRepo);
if (!matcher.matches()) {
- throw new MojoExecutionException(
- altDeploymentRepo,
- "Invalid syntax for repository.",
- "Invalid syntax for alternative repository. Use \"id::url\".");
+ throw new MojoExecutionException("Invalid syntax for alternative repository. Use \"id::url\".");
} else {
String id = matcher.group(1).trim();
String url = matcher.group(2).trim();
diff --git a/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java b/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java
index 52964cc..cd0be13 100644
--- a/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java
@@ -718,9 +718,8 @@ public class DeployMojoTest extends AbstractMojoTestCase {
mojo.getDeploymentRepository(project, null, null, "altDeploymentRepository::legacy::http://localhost");
fail("Should throw: Invalid legacy syntax and layout for repository.");
} catch (MojoExecutionException e) {
- assertEquals(e.getMessage(), "Invalid legacy syntax and layout for repository.");
assertEquals(
- e.getLongMessage(),
+ e.getMessage(),
"Invalid legacy syntax and layout for alternative repository. Use \"altDeploymentRepository::http://localhost\" instead, and only default layout is supported.");
}
}
@@ -739,9 +738,8 @@ public class DeployMojoTest extends AbstractMojoTestCase {
project, null, null, "altDeploymentRepository::hey::wow::foo::http://localhost");
fail("Should throw: Invalid legacy syntax and layout for repository.");
} catch (MojoExecutionException e) {
- assertEquals(e.getMessage(), "Invalid legacy syntax and layout for repository.");
assertEquals(
- e.getLongMessage(),
+ e.getMessage(),
"Invalid legacy syntax and layout for alternative repository. Use \"altDeploymentRepository::wow::foo::http://localhost\" instead, and only default layout is supported.");
}
}
@@ -775,9 +773,8 @@ public class DeployMojoTest extends AbstractMojoTestCase {
project, null, null, "altDeploymentRepository::legacy::scm:svn:http://localhost");
fail("Should throw: Invalid legacy syntax and layout for repository.");
} catch (MojoExecutionException e) {
- assertEquals(e.getMessage(), "Invalid legacy syntax and layout for repository.");
assertEquals(
- e.getLongMessage(),
+ e.getMessage(),
"Invalid legacy syntax and layout for alternative repository. Use \"altDeploymentRepository::scm:svn:http://localhost\" instead, and only default layout is supported.");
}
}