You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2023/07/04 06:36:13 UTC
[maven] branch master updated (e39142b77 -> 567df8dea)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
from e39142b77 [MNG-7830] Switch from plexus-xml to stax / woodstox (#1185)
new 08e996bb2 Fix search for topDirectory when using -f / --file
new 08979553f Prefer Files.newInputStream
new 8f45d51bd Prefer using String.isEmpty over String.length()>0
new 97774578f Add missing maven artifacts to BOM
new 567df8dea Use correct order in javadoc
The 5 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.
Summary of changes:
.../main/java/org/apache/maven/api/Artifact.java | 4 ++--
maven-bom/pom.xml | 25 ++++++++++++++++++++++
.../java/org/apache/maven/building/FileSource.java | 4 ++--
.../maven/internal/impl/DefaultArtifact.java | 2 +-
.../plugin/internal/DefaultMavenPluginManager.java | 5 ++---
.../main/java/org/apache/maven/cli/MavenCli.java | 16 ++++++++++++--
6 files changed, 46 insertions(+), 10 deletions(-)
[maven] 05/05: Use correct order in javadoc
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 567df8dea84b307aa657f1ba137281fbdad52276
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 3 16:56:11 2023 +0200
Use correct order in javadoc
---
api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java
index 73cf15d2e..5cb9279b9 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java
@@ -33,7 +33,7 @@ public interface Artifact {
/**
* Returns a unique identifier for this artifact.
- * The identifier is composed of groupId, artifactId, version, classifier, extension.
+ * The identifier is composed of groupId, artifactId, extension, classifier, and version.
*
* @return the unique identifier
*/
[maven] 02/05: Prefer Files.newInputStream
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 08979553f2e20385a8d623249b542105a7fdb814
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 3 10:25:37 2023 +0200
Prefer Files.newInputStream
---
.../src/main/java/org/apache/maven/building/FileSource.java | 4 ++--
.../org/apache/maven/plugin/internal/DefaultMavenPluginManager.java | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java b/maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java
index 37020a825..b3d04057e 100644
--- a/maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java
+++ b/maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java
@@ -19,9 +19,9 @@
package org.apache.maven.building;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.Files;
import java.util.Objects;
/**
@@ -46,7 +46,7 @@ public class FileSource implements Source {
@Override
public InputStream getInputStream() throws IOException {
- return new FileInputStream(file);
+ return Files.newInputStream(file.toPath());
}
@Override
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
index 1845e3980..6f9a63fa0 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
@@ -22,13 +22,12 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
-import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -229,7 +228,7 @@ public class DefaultMavenPluginManager implements MavenPluginManager {
File pluginXml = new File(pluginFile, getPluginDescriptorLocation());
if (pluginXml.isFile()) {
- try (InputStream is = new BufferedInputStream(new FileInputStream(pluginXml))) {
+ try (InputStream is = Files.newInputStream(pluginXml.toPath())) {
pluginDescriptor = parsePluginDescriptor(is, plugin, pluginXml.getAbsolutePath());
}
}
[maven] 03/05: Prefer using String.isEmpty over String.length()>0
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 8f45d51bd60290cc3a95fa6dd530bf0362e86816
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 3 10:26:10 2023 +0200
Prefer using String.isEmpty over String.length()>0
---
api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java | 2 +-
.../src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java
index d645b89f0..73cf15d2e 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java
@@ -43,7 +43,7 @@ public interface Artifact {
+ getArtifactId()
+ ':'
+ getExtension()
- + (getClassifier().length() > 0 ? ":" + getClassifier() : "")
+ + (getClassifier().isEmpty() ? "" : ":" + getClassifier())
+ ':'
+ getVersion();
}
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java
index 666e22722..ed865b81b 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java
@@ -43,7 +43,7 @@ public class DefaultArtifact implements Artifact {
+ getArtifactId()
+ ':'
+ getExtension()
- + (getClassifier().length() > 0 ? ":" + getClassifier() : "")
+ + (getClassifier().isEmpty() ? "" : ":" + getClassifier())
+ ':'
+ getVersion();
}
[maven] 01/05: Fix search for topDirectory when using -f / --file
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 08e996bb28266a5b1707f45d20809ba44117e16a
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jun 30 15:27:58 2023 +0200
Fix search for topDirectory when using -f / --file
---
.../src/main/java/org/apache/maven/cli/MavenCli.java | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 5070deffa..a4ad1d23f 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -333,7 +333,7 @@ public class MavenCli {
for (String arg : cliRequest.args) {
if (isAltFile) {
// this is the argument following -f/--file
- Path path = topDirectory.resolve(arg);
+ Path path = topDirectory.resolve(stripLeadingAndTrailingQuotes(arg));
if (Files.isDirectory(path)) {
topDirectory = path;
} else if (Files.isRegularFile(path)) {
@@ -351,7 +351,7 @@ public class MavenCli {
break;
} else {
// Check if this is the -f/--file option
- isAltFile = arg.equals(String.valueOf(CLIManager.ALTERNATE_POM_FILE)) || arg.equals("file");
+ isAltFile = arg.equals("-f") || arg.equals("--file");
}
}
topDirectory = getCanonicalPath(topDirectory);
@@ -1616,6 +1616,18 @@ public class MavenCli {
return interpolator;
}
+ private static String stripLeadingAndTrailingQuotes(String str) {
+ final int length = str.length();
+ if (length > 1
+ && str.startsWith("\"")
+ && str.endsWith("\"")
+ && str.substring(1, length - 1).indexOf('"') == -1) {
+ str = str.substring(1, length - 1);
+ }
+
+ return str;
+ }
+
private static Path getCanonicalPath(Path path) {
try {
return path.toRealPath();
[maven] 04/05: Add missing maven artifacts to BOM
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 97774578fbd2f72268e7018c87860139705d653b
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 3 10:26:20 2023 +0200
Add missing maven artifacts to BOM
---
maven-bom/pom.xml | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/maven-bom/pom.xml b/maven-bom/pom.xml
index 086801759..d1d669787 100644
--- a/maven-bom/pom.xml
+++ b/maven-bom/pom.xml
@@ -97,6 +97,31 @@ under the License.
<artifactId>maven-api-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-api-meta</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-api-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-api-settings</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-api-toolchain</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-api-xml</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model-builder</artifactId>