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/07 18:31:31 UTC
[jackrabbit-filevault-package-maven-plugin] branch master updated: JCRVLT-580 parameterize Maven version (#66)
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 349b2b8 JCRVLT-580 parameterize Maven version (#66)
349b2b8 is described below
commit 349b2b883e52b5cc1d469699f2b975f3b888c1f5
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Jan 7 19:31:26 2022 +0100
JCRVLT-580 parameterize Maven version (#66)
add some dependencies
allow reexecution of all ITs
---
Jenkinsfile | 7 ++++-
pom.xml | 34 +++++++++++++++-------
.../filevault/maven/packaging/it/FormattingIT.java | 11 ++++++-
3 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d1a684c..10885a2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,4 +20,9 @@
// use the shared library from https://github.com/apache/jackrabbit-filevault-jenkins-lib
library "filevault@master"
-fileVaultMavenStdBuild([11, 8, 17], 11, [ "ubuntu", "Windows"], "ubuntu", "apache_jackrabbit-filevault-package-maven-plugin")
\ No newline at end of file
+vaultPipeline('ubuntu', 11, '3', {
+ vaultStageBuild(['ubuntu', 'Windows'], [8, 11, 17], ['3', '3.6.3'], 'apache_jackrabbit-filevault-package-maven-plugin', [ hasSeparateItExecution: true ])
+ vaultStageIT(['ubuntu', 'Windows'], [8, 11, 17], ['3.3.9', '3.5.4', '3.6.3', '3'])
+ vaultStageDeploy()
+ }
+)
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d6d7850..89664af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,7 @@
<build>
<pluginManagement>
<plugins>
+ <!-- update from 3.6.1 in ASF parent -->
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.6.2</version>
@@ -148,7 +149,12 @@
<configuration>
<systemPropertyVariables>
<plugin.version>${project.version}</plugin.version>
+ <!-- https://github.com/jenkinsci/pipeline-maven-plugin/blob/master/FAQ.adoc#how-to-disable-the-maven-event-spy-injected-by-the-pipeline-maven-plugin-in-maven-builds -->
+ <org.jenkinsci.plugins.pipeline.maven.eventspy.JenkinsMavenEventSpy.disabled>true</org.jenkinsci.plugins.pipeline.maven.eventspy.JenkinsMavenEventSpy.disabled>
</systemPropertyVariables>
+ <environmentVariables>
+ <JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
+ </environmentVariables>
</configuration>
</execution>
</executions>
@@ -257,6 +263,16 @@
<artifactId>plexus-utils</artifactId>
<version>3.3.0</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -317,7 +333,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -330,7 +345,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.6.0</version>
+ <version>3.6.2</version>
<scope>provided</scope>
</dependency>
<!-- This is not a core artifact, i.e. must not be used with scope "provided" despite having group id "org.apache.maven", https://issues.apache.org/jira/browse/MPLUGIN-385 -->
@@ -370,7 +385,7 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.19</version>
+ <version>1.20</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
@@ -381,19 +396,19 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer</artifactId>
- <version>1.19</version>
+ <version>1.20</version>
</dependency>
<!-- class analyzer -->
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
- <version>4.8.106</version>
+ <version>4.8.138</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
- <version>1.4</version>
+ <version>3.2.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
@@ -424,13 +439,13 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
- <version>1.8</version>
+ <version>1.9.0</version>
</dependency>
<!-- testing -->
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -441,13 +456,12 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.28.2</version>
+ <version>4.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/FormattingIT.java b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/FormattingIT.java
index e71ed58..bb4240f 100644
--- a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/FormattingIT.java
+++ b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/FormattingIT.java
@@ -19,14 +19,23 @@ package org.apache.jackrabbit.filevault.maven.packaging.it;
import java.io.File;
import java.io.IOException;
+import org.apache.commons.io.FileUtils;
import org.apache.maven.it.VerificationException;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
public class FormattingIT {
+ @Rule
+ public TemporaryFolder tmpFolder = new TemporaryFolder();
+
private void verify(String project, String... formattedFiles) throws VerificationException, IOException {
+ // copy project to tmp folder as the test modifies the project (allows re-execution without clean/recompile)
+ File sourceDirectory = new File(ProjectBuilder.TEST_PROJECTS_ROOT + "/format-xml-tests/" + project);
+ FileUtils.copyDirectory(sourceDirectory, tmpFolder.getRoot());
ProjectBuilder builder = new ProjectBuilder()
- .setTestProjectDir("format-xml-tests/" + project)
+ .setTestProjectDir(tmpFolder.getRoot())
.setTestGoals("filevault-package:format-xml")
.setBuildExpectedToFail(false)
.setVerifyPackageContents(false)