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 2023/07/04 15:33:16 UTC
[jackrabbit-filevault] branch feature/asf-parent-30 created (now 2ab177c6)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch feature/asf-parent-30
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
at 2ab177c6 JCRVLT-710 Update to ASF parent 30
This branch includes the following new commits:
new 2ab177c6 JCRVLT-710 Update to ASF parent 30
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.
[jackrabbit-filevault] 01/01: JCRVLT-710 Update to ASF parent 30
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/asf-parent-30
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
commit 2ab177c6110a9128b5002313001528c9aa32933e
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Tue Jul 4 17:33:10 2023 +0200
JCRVLT-710 Update to ASF parent 30
Cleanup and update maven-dependency-plugin/jacoco-maven-plugin to
8.3.1/0.8.10
---
parent/pom.xml | 41 ++++------------------
.../vault-core-it-execution-jr2-min/pom.xml | 6 ++++
2 files changed, 12 insertions(+), 35 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 83b295ae..5bfd6602 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>29</version>
+ <version>30</version>
<relativePath />
</parent>
@@ -204,28 +204,6 @@ Bundle-Category: jackrabbit
</configuration>
</plugin>
<!-- ====================================================================== -->
- <!-- S U R E F I R E P L U G I N -->
- <!-- ====================================================================== -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <!-- put derby.log (created for Jackrabbit based ITs below target instead of the current directory) -->
- <derby.stream.error.file>target/derby.log</derby.stream.error.file>
- <oak>${test.oak}</oak>
- </systemPropertyVariables>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
- <!-- ====================================================================== -->
<!-- R E L E A S E P L U G I N -->
<!-- ====================================================================== -->
<plugin>
@@ -239,7 +217,7 @@ Bundle-Category: jackrabbit
<dependency>
<groupId>org.apache.maven.release</groupId>
<artifactId>maven-release-oddeven-policy</artifactId>
- <version>3.0.0-M7</version>
+ <version>${version.maven-release-plugin}</version>
</dependency>
</dependencies>
</plugin>
@@ -282,12 +260,12 @@ Bundle-Category: jackrabbit
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.8</version>
+ <version>0.8.10</version>
</plugin>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>8.1.0</version>
+ <version>8.3.1</version>
<executions>
<execution>
<goals>
@@ -325,19 +303,11 @@ Bundle-Category: jackrabbit
<debug>true</debug>
<showDeprecation>false</showDeprecation>
<showWarnings>true</showWarnings>
- <optimize>false</optimize>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-enforcer-rules</artifactId>
- <version>1.1.0</version>
- </dependency>
- </dependencies>
<executions>
<execution>
<id>enforce-explicit-scope</id>
@@ -346,7 +316,8 @@ Bundle-Category: jackrabbit
</goals>
<configuration>
<rules>
- <requireExplicitDependencyScope implementation="org.apache.sling.maven.enforcer.RequireExplicitDependencyScope" />
+ <!-- https://maven.apache.org/enforcer/enforcer-rules/requireExplicitDependencyScope.html -->
+ <requireExplicitDependencyScope />
</rules>
</configuration>
</execution>
diff --git a/vault-core-it/vault-core-it-execution/vault-core-it-execution-jr2-min/pom.xml b/vault-core-it/vault-core-it-execution/vault-core-it-execution-jr2-min/pom.xml
index 091b6104..6ca9a2ae 100644
--- a/vault-core-it/vault-core-it-execution/vault-core-it-execution-jr2-min/pom.xml
+++ b/vault-core-it/vault-core-it-execution/vault-core-it-execution-jr2-min/pom.xml
@@ -41,6 +41,12 @@
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <!-- put derby.log (created for Jackrabbit based ITs below target instead of the current directory) -->
+ <derby.stream.error.file>target/derby.log</derby.stream.error.file>
+ </systemPropertyVariables>
+ </configuration>
</plugin>
</plugins>
</build>