You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2022/01/17 16:21:22 UTC
[jackrabbit-filevault-package-maven-plugin] branch bugfix/JCRVLT-595-prevent-npe updated (a854cbc -> 35b1f19)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch bugfix/JCRVLT-595-prevent-npe
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git.
discard a854cbc JCRVLT-595 prevent NPE when validate-package is executed outside project
new 35b1f19 JCRVLT-595 prevent NPE when validate-package is executed outside project
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a854cbc)
\
N -- N -- N refs/heads/bugfix/JCRVLT-595-prevent-npe (35b1f19)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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.
Summary of changes:
.../jackrabbit/filevault/maven/packaging/AbstractValidateMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[jackrabbit-filevault-package-maven-plugin] 01/01: JCRVLT-595 prevent NPE when validate-package is executed outside project
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch bugfix/JCRVLT-595-prevent-npe
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git
commit 35b1f190a08f1f52fa2dc2ad9e859b7c5a7e4f46
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Jan 17 17:19:24 2022 +0100
JCRVLT-595 prevent NPE when validate-package is executed outside project
---
.../maven/packaging/AbstractValidateMojo.java | 18 ++++++++++-----
.../maven/packaging/AbstractValidateMojoTest.java | 27 ++++++++++++++++++++--
.../maven/packaging/it/ProjectBuilder.java | 2 +-
.../maven/packaging/it/ValidatePackageIT.java | 14 ++++++++++-
4 files changed, 51 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojo.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojo.java
index e56d239..9c5e4c7 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojo.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojo.java
@@ -113,8 +113,8 @@ public abstract class AbstractValidateMojo extends AbstractMojo {
@Deprecated
private boolean failOnDependencyErrors;
- /** The Maven project (might be {@code null}) */
- @Parameter(property = "project", readonly = true, required = false)
+ /** The Maven project (never {@code null}, but might be dummy project returning {@code null} for all methods if running outside a {@code pom.xml} context) */
+ @Parameter(defaultValue = "${project}", readonly = true, required = false)
protected MavenProject project;
@Parameter(defaultValue = "${mojoExecution}", readonly = true, required = true)
@@ -201,10 +201,16 @@ public abstract class AbstractValidateMojo extends AbstractMojo {
public static final Artifact IGNORE_ARTIFACT = new DefaultArtifact("ignore", "ignore", "1.0", "", "", "", null);
private static Version fileVaultValidationBundleVersion = null;
- private final static Version VERSION_3_5_4 = Version.parseVersion("3.5.4");
-
- protected String getProjectRelativeFilePath(Path file) {
- return "'" + project.getBasedir().toPath().relativize(file).toString() + "'";
+ private static final Version VERSION_3_5_4 = Version.parseVersion("3.5.4");
+
+ protected String getProjectRelativeFilePath(Path path) {
+ final Path shortenedPath;
+ if (project != null && project.getBasedir() != null) {
+ shortenedPath = project.getBasedir().toPath().relativize(path);
+ } else {
+ shortenedPath = path;
+ }
+ return "'" + shortenedPath.toString() + "'";
}
public AbstractValidateMojo() {
diff --git a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojoTest.java b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojoTest.java
index f2be2eb..1c00277 100644
--- a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojoTest.java
+++ b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojoTest.java
@@ -16,7 +16,12 @@
*/
package org.apache.jackrabbit.filevault.maven.packaging;
+import static org.junit.Assert.assertEquals;
+
import java.io.IOException;
+import java.nio.channels.UnsupportedAddressTypeException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -26,13 +31,18 @@ import org.apache.jackrabbit.vault.packaging.Dependency;
import org.apache.jackrabbit.vault.packaging.PackageId;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.InvalidArtifactRTException;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.logging.SystemStreamLog;
+import org.apache.maven.project.MavenProject;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.Assert;
import org.junit.Test;
import org.osgi.framework.Version;
+import aQute.lib.mavenpasswordobfuscator.MavenPasswordObfuscator;
+
public class AbstractValidateMojoTest {
@@ -96,9 +106,22 @@ public class AbstractValidateMojoTest {
list.sort(new AbstractValidateMojo.DotContentXmlFirstComparator());
MatcherAssert.assertThat(list, Matchers.contains(".content.xml", ".content.xml", "someEntryA", "someEntryB"));
}
-
+
@Test
public void testGetFileVaultValidatorVersion() throws IOException {
- Assert.assertTrue(AbstractValidateMojo.getFileVaultValidationBundleVersion().compareTo(Version.parseVersion("3.5.4")) >= 0);
+ Assert.assertTrue("FileVault version being deteted is " + AbstractValidateMojo.getFileVaultValidationBundleVersion(), AbstractValidateMojo.getFileVaultValidationBundleVersion().compareTo(Version.parseVersion("3.5.4")) >= 0);
+ }
+
+ @Test
+ public void testGetProjectRelativeFilePathWithoutRealProject() {
+ AbstractValidateMojo mojo = new AbstractValidateMojo() {
+ @Override
+ public void doExecute(ValidationHelper validationHelper) throws MojoExecutionException, MojoFailureException {
+ throw new UnsupportedOperationException();
+ }
+ };
+ mojo.project = new MavenProject();
+ Path path = Paths.get("").toAbsolutePath();
+ assertEquals("'" + path + "'", mojo.getProjectRelativeFilePath(path));
}
}
diff --git a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ProjectBuilder.java b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ProjectBuilder.java
index 111bf8e..19cf332 100644
--- a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ProjectBuilder.java
+++ b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ProjectBuilder.java
@@ -133,7 +133,7 @@ public class ProjectBuilder {
* @return the version of the current {@code filevault-package-maven-plugin}
* @throws IllegalArgumentException if the version cannot be determined.
*/
- private String getPluginVersion() {
+ static String getPluginVersion() {
String pluginVersion = System.getProperty("plugin.version");
if (pluginVersion == null) {
try (FileReader fileReader = new FileReader("pom.xml")) {
diff --git a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ValidatePackageIT.java b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ValidatePackageIT.java
index 7650bbe..90daa93 100644
--- a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ValidatePackageIT.java
+++ b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ValidatePackageIT.java
@@ -62,7 +62,7 @@ public class ValidatePackageIT {
MatcherAssert.assertThat(actualRecords, Matchers.contains(expectedRecords.stream().map(r -> new CSVRecordMatcher(r, 3)).toArray(CSVRecordMatcher[]::new)));
}
}
-
+
@Test
public void testValidProjectWithZip() throws Exception {
verify("project-with-zip", false, null);
@@ -73,6 +73,18 @@ public class ValidatePackageIT {
verify("classifier-project", false, "test");
}
+ @Test
+ public void testValidPackageWithoutProject() throws Exception {
+ //File testPackage = new File(ProjectBuilder.TEST_PROJECTS_ROOT + "/../test-content/");
+ new ProjectBuilder()
+ // some new dir
+ .setTestProjectDir("../test-content")
+ .setTestGoals(String.format("org.apache.jackrabbit:filevault-package-maven-plugin:%s:validate-package", ProjectBuilder.getPluginVersion()))
+ .setProperty("vault.packageToValidate", "test-package.zip")
+ .setVerifyPackageContents(false)
+ .build();
+ }
+
private static final class CSVRecordMatcher extends TypeSafeMatcher<CSVRecord> {
private final CSVRecord expectedCsvRecord;
private final Collection<Integer> ignoredValueIndices;