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 2021/10/05 14:16:05 UTC
[jackrabbit-filevault-package-maven-plugin] branch master updated:
JCRVLT-554 don't bind "analyze-classes" by default (#60)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 59e5ff1 JCRVLT-554 don't bind "analyze-classes" by default (#60)
59e5ff1 is described below
commit 59e5ff117949dd5cabc056230b05c09d177fb32d
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Tue Oct 5 16:15:56 2021 +0200
JCRVLT-554 don't bind "analyze-classes" by default (#60)
JCRVLT-555 don't bind "check-signature" by default
rearrange default lifecycle binding and default phases to enforce a
certain order
---
.../maven/packaging/GenerateMetadataMojo.java | 2 +-
.../maven/packaging/ValidateFilesMojo.java | 5 ++++-
src/main/resources/META-INF/plexus/components.xml | 21 ++++++++-------------
.../maven/packaging/it/ProjectBuilder.java | 2 +-
.../maven/packaging/it/ValidateFilesIT.java | 2 +-
.../analyze-classes-multimodule/b/pom.xml | 7 +++++++
.../resources/test-projects/check-signature/pom.xml | 7 +++++++
.../test-projects/check-signature2/pom.xml | 7 +++++++
.../additional-metainf-files/expected-manifest.txt | 2 --
.../default-test-projects/htl-validation/pom.xml | 7 +++++++
.../manifest-generation/with-bundles/pom.xml | 7 +++++++
.../manifest-generation/with-code/pom.xml | 7 +++++++
.../with-unused-parent-dependencies/pom.xml | 7 +++++++
13 files changed, 64 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojo.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojo.java
index 151c082..64353e0 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojo.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojo.java
@@ -100,7 +100,7 @@ import aQute.bnd.osgi.Processor;
*/
@Mojo(
name = "generate-metadata",
- defaultPhase = LifecyclePhase.PROCESS_CLASSES,
+ defaultPhase = LifecyclePhase.GENERATE_SOURCES, // to make sure it runs after "analyze-classes"
requiresDependencyResolution = ResolutionScope.COMPILE,
threadSafe = true
)
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidateFilesMojo.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidateFilesMojo.java
index 9e08562..c4706a2 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidateFilesMojo.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidateFilesMojo.java
@@ -71,7 +71,10 @@ import org.codehaus.plexus.util.Scanner;
* @see <a href="https://jackrabbit.apache.org/filevault-package-maven-plugin/validators.html">Validators</a>
* @since 1.1.0
*/
-@Mojo(name = "validate-files", defaultPhase = LifecyclePhase.PROCESS_CLASSES, requiresDependencyResolution = ResolutionScope.COMPILE, threadSafe = true)
+@Mojo(name = "validate-files",
+ defaultPhase = LifecyclePhase.PROCESS_TEST_SOURCES, // to make sure it runs after "generate-metadata"
+ requiresDependencyResolution = ResolutionScope.COMPILE,
+ threadSafe = true)
public class ValidateFilesMojo extends AbstractValidateMojo {
//-----
diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml
index 9335c47..e5dd52a 100644
--- a/src/main/resources/META-INF/plexus/components.xml
+++ b/src/main/resources/META-INF/plexus/components.xml
@@ -24,29 +24,24 @@
<lifecycles>
<lifecycle>
<id>default</id>
- <!-- START SNIPPET: bundle-lifecycle -->
+ <!-- START SNIPPET: content-package lifecycle -->
<phases>
<process-resources>org.apache.maven.plugins:maven-resources-plugin:resources
</process-resources>
<compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
- <process-classes>
- org.apache.jackrabbit:filevault-package-maven-plugin:check-signature,
- org.apache.jackrabbit:filevault-package-maven-plugin:analyze-classes,
- org.apache.jackrabbit:filevault-package-maven-plugin:generate-metadata,
- org.apache.jackrabbit:filevault-package-maven-plugin:validate-files
- </process-classes>
- <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources
+ <generate-test-sources>org.apache.jackrabbit:filevault-package-maven-plugin:generate-metadata</generate-test-sources>
+ <process-test-resources>
+ org.apache.maven.plugins:maven-resources-plugin:testResources,
+ org.apache.jackrabbit:filevault-package-maven-plugin:validate-files
</process-test-resources>
<test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
<test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
- <package>
- org.apache.jackrabbit:filevault-package-maven-plugin:package,
- org.apache.jackrabbit:filevault-package-maven-plugin:validate-package
- </package>
+ <package>org.apache.jackrabbit:filevault-package-maven-plugin:package</package>
+ <verify>org.apache.jackrabbit:filevault-package-maven-plugin:validate-package</verify>
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
</phases>
- <!-- END SNIPPET: bundle-lifecycle -->
+ <!-- END SNIPPET: content package lifecycle -->
</lifecycle>
</lifecycles>
</configuration>
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 d205ac1..111bf8e 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
@@ -92,7 +92,7 @@ public class ProjectBuilder {
private Properties testProperties;
- private String[] testGoals = {"clean", "package"};
+ private String[] testGoals = {"clean", "verify"};
private List<String> pkgZipEntries;
diff --git a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ValidateFilesIT.java b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ValidateFilesIT.java
index 61c1372..5f1e2eb 100644
--- a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ValidateFilesIT.java
+++ b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ValidateFilesIT.java
@@ -29,7 +29,7 @@ public class ValidateFilesIT {
private ProjectBuilder verify(String projectName) throws VerificationException, IOException {
return new ProjectBuilder()
.setTestProjectDir(TEST_PROJECT_NAME + projectName)
- .setTestGoals("clean", "process-classes") // make sure the validate-files mojo is not skipped
+ .setTestGoals("clean", "package") // make sure the validate-files mojo is not skipped
.setBuildExpectedToFail(true)
.build()
.verifyExpectedLogLines(Paths.get("META-INF","vault","filter.xml").toString());
diff --git a/src/test/resources/test-projects/analyze-classes-multimodule/b/pom.xml b/src/test/resources/test-projects/analyze-classes-multimodule/b/pom.xml
index 8274118..860a952 100644
--- a/src/test/resources/test-projects/analyze-classes-multimodule/b/pom.xml
+++ b/src/test/resources/test-projects/analyze-classes-multimodule/b/pom.xml
@@ -46,6 +46,13 @@
</embedded>
</embeddeds>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>analyze-classes</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
diff --git a/src/test/resources/test-projects/check-signature/pom.xml b/src/test/resources/test-projects/check-signature/pom.xml
index e58e275..cda92a5 100644
--- a/src/test/resources/test-projects/check-signature/pom.xml
+++ b/src/test/resources/test-projects/check-signature/pom.xml
@@ -50,6 +50,13 @@
</embedded>
</embeddeds>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check-signature</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
diff --git a/src/test/resources/test-projects/check-signature2/pom.xml b/src/test/resources/test-projects/check-signature2/pom.xml
index 6708c3f..b4b4274 100644
--- a/src/test/resources/test-projects/check-signature2/pom.xml
+++ b/src/test/resources/test-projects/check-signature2/pom.xml
@@ -48,6 +48,13 @@
</embedded>
</embeddeds>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check-signature</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
diff --git a/src/test/resources/test-projects/default-test-projects/additional-metainf-files/expected-manifest.txt b/src/test/resources/test-projects/default-test-projects/additional-metainf-files/expected-manifest.txt
index 5468d39..8ebe8eb 100644
--- a/src/test/resources/test-projects/default-test-projects/additional-metainf-files/expected-manifest.txt
+++ b/src/test/resources/test-projects/default-test-projects/additional-metainf-files/expected-manifest.txt
@@ -4,6 +4,4 @@ Content-Package-Roots:/apps/htl/test
Content-Package-Type:mixed
Implementation-Title:Packaging test
Implementation-Version:1.0.0-SNAPSHOT
-Import-Package:javax.jcr;version="[2.0.0,3.0.0)"
-Import-Package:org.apache.sling.scripting.sightly;version="[2.0.0,3.0.0)"
Manifest-Version:1.0
\ No newline at end of file
diff --git a/src/test/resources/test-projects/default-test-projects/htl-validation/pom.xml b/src/test/resources/test-projects/default-test-projects/htl-validation/pom.xml
index 74f9f43..e9188e6 100755
--- a/src/test/resources/test-projects/default-test-projects/htl-validation/pom.xml
+++ b/src/test/resources/test-projects/default-test-projects/htl-validation/pom.xml
@@ -43,6 +43,13 @@
</filter>
</filters>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>analyze-classes</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.sling</groupId>
diff --git a/src/test/resources/test-projects/manifest-generation/with-bundles/pom.xml b/src/test/resources/test-projects/manifest-generation/with-bundles/pom.xml
index 8f56c6c..34d1767 100644
--- a/src/test/resources/test-projects/manifest-generation/with-bundles/pom.xml
+++ b/src/test/resources/test-projects/manifest-generation/with-bundles/pom.xml
@@ -46,6 +46,13 @@
</filter>
</filters>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>analyze-classes</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
diff --git a/src/test/resources/test-projects/manifest-generation/with-code/pom.xml b/src/test/resources/test-projects/manifest-generation/with-code/pom.xml
index 0067247..27ff51f 100644
--- a/src/test/resources/test-projects/manifest-generation/with-code/pom.xml
+++ b/src/test/resources/test-projects/manifest-generation/with-code/pom.xml
@@ -42,6 +42,13 @@
</filters>
<showImportPackageReport>true</showImportPackageReport>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>analyze-classes</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
diff --git a/src/test/resources/test-projects/manifest-generation/with-unused-parent-dependencies/pom.xml b/src/test/resources/test-projects/manifest-generation/with-unused-parent-dependencies/pom.xml
index b24df16..089102a 100644
--- a/src/test/resources/test-projects/manifest-generation/with-unused-parent-dependencies/pom.xml
+++ b/src/test/resources/test-projects/manifest-generation/with-unused-parent-dependencies/pom.xml
@@ -52,6 +52,13 @@
</filter>
</filters>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>analyze-classes</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>