You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2017/10/23 04:59:06 UTC
svn commit: r1812972 - in
/jackrabbit/commons/filevault-package-maven-plugin/trunk/src:
main/java/org/apache/jackrabbit/filevault/maven/packaging/
test/java/org/apache/jackrabbit/filevault/maven/packaging/it/
test/resources/test-projects/default-test-p...
Author: tripod
Date: Mon Oct 23 04:59:06 2017
New Revision: 1812972
URL: http://svn.apache.org/viewvc?rev=1812972&view=rev
Log:
remove absrtact embedder mojo to clean up
Removed:
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractEmbeddedsMojo.java
Modified:
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AnalyzeClassesMojo.java
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/CheckSignatureMojo.java
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ProjectBuilder.java
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic/expected-files.txt
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic/pom.xml
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AnalyzeClassesMojo.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AnalyzeClassesMojo.java?rev=1812972&r1=1812971&r2=1812972&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AnalyzeClassesMojo.java (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AnalyzeClassesMojo.java Mon Oct 23 04:59:06 2017
@@ -22,13 +22,14 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.FileUtils;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.artifact.filter.PatternExcludesArtifactFilter;
import aQute.bnd.osgi.Processor;
@@ -41,7 +42,13 @@ import aQute.bnd.osgi.Processor;
defaultPhase = LifecyclePhase.PROCESS_CLASSES,
requiresDependencyResolution = ResolutionScope.COMPILE
)
-public class AnalyzeClassesMojo extends AbstractEmbeddedsMojo {
+public class AnalyzeClassesMojo extends AbstractMojo {
+
+ /**
+ * The Maven project.
+ */
+ @Parameter(property = "project", readonly = true, required = true)
+ private MavenProject project;
/**
* Location of class files
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/CheckSignatureMojo.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/CheckSignatureMojo.java?rev=1812972&r1=1812971&r2=1812972&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/CheckSignatureMojo.java (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/CheckSignatureMojo.java Mon Oct 23 04:59:06 2017
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.filevault.
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -30,6 +31,7 @@ import org.apache.maven.artifact.factory
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
@@ -37,6 +39,7 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.project.MavenProject;
import org.codehaus.mojo.animal_sniffer.ClassListBuilder;
import org.codehaus.mojo.animal_sniffer.SignatureChecker;
import org.codehaus.mojo.animal_sniffer.maven.MavenLogger;
@@ -51,7 +54,27 @@ import org.codehaus.mojo.animal_sniffer.
defaultPhase = LifecyclePhase.PROCESS_CLASSES,
requiresDependencyResolution = ResolutionScope.COMPILE
)
-public class CheckSignatureMojo extends AbstractEmbeddedsMojo {
+public class CheckSignatureMojo extends AbstractMojo {
+
+ /**
+ * The Maven project.
+ */
+ @Parameter(property = "project", readonly = true, required = true)
+ private MavenProject project;
+
+ /**
+ * list of embedded bundles
+ */
+ @Parameter
+ private Embedded[] embeddeds = new Embedded[0];
+
+ /**
+ * Defines whether to fail the build when an embedded artifact is not
+ * found in the project's dependencies
+ */
+ @Parameter(property = "vault.failOnMissingEmbed", defaultValue = "false", required = true)
+ private boolean failOnMissingEmbed;
+
/**
*/
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java?rev=1812972&r1=1812971&r2=1812972&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java Mon Oct 23 04:59:06 2017
@@ -24,6 +24,7 @@ import java.io.OutputStream;
import java.nio.file.Files;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
@@ -45,6 +46,7 @@ import org.apache.maven.archiver.MavenAr
import org.apache.maven.archiver.MavenArchiver;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
+import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
@@ -52,6 +54,7 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.ArchiveEntry;
import org.codehaus.plexus.archiver.FileSet;
import org.codehaus.plexus.util.AbstractScanner;
@@ -78,7 +81,7 @@ import static org.codehaus.plexus.archiv
defaultPhase = LifecyclePhase.PACKAGE,
requiresDependencyResolution = ResolutionScope.COMPILE
)
-public class VaultMojo extends AbstractEmbeddedsMojo {
+public class VaultMojo extends AbstractMojo {
private static final String JCR_ROOT = "jcr_root/";
@@ -110,6 +113,12 @@ public class VaultMojo extends AbstractE
private ArtifactHandlerManager artifactHandlerManager;
/**
+ * The Maven project.
+ */
+ @Parameter(property = "project", readonly = true, required = true)
+ private MavenProject project;
+
+ /**
* The directory containing the content to be packaged up into the content
* package.
*
@@ -274,6 +283,19 @@ public class VaultMojo extends AbstractE
private String embeddedTarget;
/**
+ * list of embedded bundles
+ */
+ @Parameter
+ private Embedded[] embeddeds = new Embedded[0];
+
+ /**
+ * Defines whether to fail the build when an embedded artifact is not
+ * found in the project's dependencies
+ */
+ @Parameter(property = "vault.failOnMissingEmbed", defaultValue = "false", required = true)
+ private boolean failOnMissingEmbed;
+
+ /**
* Defines the content package type. this is either 'application', 'content', 'container' or 'mixed'.
* If omitted, it is calculated automatically based on filter definitions. certain package types imply restrictions,
* for example, 'application' and 'content' packages are not allowed to contain sub packages or embedded bundles.
@@ -871,6 +893,9 @@ public class VaultMojo extends AbstractE
targetPath = JCR_ROOT + targetPath;
targetPath = FileUtils.normalize(targetPath);
+ if (!targetPath.endsWith("/")) {
+ targetPath += "/";
+ }
getLog().info("Embedding --- " + emb + " ---");
for (final Artifact artifact : artifacts) {
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ProjectBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ProjectBuilder.java?rev=1812972&r1=1812971&r2=1812972&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ProjectBuilder.java (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ProjectBuilder.java Mon Oct 23 04:59:06 2017
@@ -264,7 +264,9 @@ public class ProjectBuilder {
public ProjectBuilder verifyExpectedFiles() throws IOException {
// first check that only the expected entries are there in the package (regardless of the order)
List<String> expectedEntries = Files.readAllLines(expectedFilesFile.toPath(), StandardCharsets.UTF_8);
- assertThat("Package contains the expected entry names", pkgZipEntries, Matchers.containsInAnyOrder(expectedEntries.toArray()));
+ assertEquals("Package contains the expected entry names",
+ toTidyString(expectedEntries),
+ toTidyString(pkgZipEntries));
return this;
}
@@ -290,4 +292,14 @@ public class ProjectBuilder {
public List<String> getBuildOutput() throws IOException {
return Files.readAllLines(logTxtFile.toPath(), StandardCharsets.UTF_8);
}
+
+ private String toTidyString(List<String> lines) {
+ String[] copy = lines.toArray(new String[lines.size()]);
+ Arrays.sort(copy);
+ StringBuilder buf = new StringBuilder();
+ for (String line: copy) {
+ buf.append(line).append("\n");
+ }
+ return buf.toString();
+ }
}
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic/expected-files.txt
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic/expected-files.txt?rev=1812972&r1=1812971&r2=1812972&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic/expected-files.txt (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic/expected-files.txt Mon Oct 23 04:59:06 2017
@@ -7,6 +7,8 @@ META-INF/vault/properties.xml
META-INF/vault/settings.xml
jcr_root/
jcr_root/apps/
+jcr_root/apps/install/
+jcr_root/apps/install/org.apache.jackrabbit.vault-3.1.40.jar
jcr_root/apps/wcm/
jcr_root/apps/wcm/core/
jcr_root/apps/wcm/core/content/
@@ -27,6 +29,9 @@ jcr_root/etc/cloudservices/ooyala/.conte
jcr_root/etc/cloudservices/.content.xml
jcr_root/apps/wcm/.content.xml
jcr_root/apps/wcm/core/.content.xml
+jcr_root/libs/
+jcr_root/libs/install/
+jcr_root/libs/install/jcr-2.0.jar
META-INF/maven/
META-INF/maven/org.apache.jackrabbit.filevault/
META-INF/maven/org.apache.jackrabbit.filevault/package-plugin-test-pkg/
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic/pom.xml?rev=1812972&r1=1812971&r2=1812972&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic/pom.xml Mon Oct 23 04:59:06 2017
@@ -49,9 +49,35 @@
<root>/apps/some-thirdparty-libs</root>
</filter>
</filters>
- <embeddedTarget>/apps/some-thirdparty-libs/install</embeddedTarget>
+
+ <embeddeds>
+ <embedded>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <target>/libs/install</target>
+ </embedded>
+ <embedded>
+ <groupId>org.apache.jackrabbit.vault</groupId>
+ <artifactId>org.apache.jackrabbit.vault</artifactId>
+ </embedded>
+ </embeddeds>
+ <embeddedTarget>/apps/install</embeddedTarget>
</configuration>
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit.vault</groupId>
+ <artifactId>org.apache.jackrabbit.vault</artifactId>
+ <version>3.1.40</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>