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/12/16 18:29:15 UTC
[jackrabbit-filevault-package-maven-plugin] branch master updated: trivial: reorder dependencies to group Maven Core artifacts (with scope "provided") together
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 12d38a5 trivial: reorder dependencies to group Maven Core artifacts (with scope "provided") together
12d38a5 is described below
commit 12d38a50bfe8136793d6b25ee80a4e96057c26be
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Dec 16 19:25:28 2021 +0100
trivial: reorder dependencies to group Maven Core artifacts (with scope
"provided") together
---
pom.xml | 46 +++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3dd22e6..3e04cf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,8 @@
<properties>
<maven.version>3.3.9</maven.version> <!-- required for https://issues.apache.org/jira/browse/MNG-5440 -->
- <aether.version>1.0.2.v20150114</aether.version>
- <slf4j.version>1.7.5</slf4j.version>
+ <aether.version>1.0.2.v20150114</aether.version> <!-- should be the version exported by the maven.version, https://github.com/apache/maven/blob/bb52d8502b132ec0a5a3f4c09453c07478323dc5/pom.xml#L64 -->
+ <slf4j.version>1.7.5</slf4j.version> <!-- should be the version exported by the maven.version, https://github.com/apache/maven/blob/bb52d8502b132ec0a5a3f4c09453c07478323dc5/pom.xml#L65 -->
<filevault.version>${project.parent.version}</filevault.version> <!-- must be equal to parent version -->
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
@@ -288,7 +288,8 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-jackrabbit-api</artifactId>
</dependency>
- <!-- Maven Plugin stuff (everything from https://github.com/apache/maven/blob/master/maven-core/src/main/resources/META-INF/maven/extension.xml#L133-L193 should have scope provided -->
+ <!-- Maven Core artifacts, version is determined by Maven distribution
+ contained in https://github.com/apache/maven/blob/master/maven-core/src/main/resources/META-INF/maven/extension.xml#L133-L193, should have scope provided -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
@@ -302,12 +303,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-annotations</artifactId>
- <version>3.6.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${maven.version}</version>
@@ -319,6 +314,25 @@
<version>${maven.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-api</artifactId>
+ <version>${aether.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- annotations and shared utils -->
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.6.0</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 -->
<dependency>
<groupId>org.apache.maven</groupId>
@@ -341,12 +355,6 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
@@ -413,14 +421,6 @@
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-api</artifactId>
- <version>${aether.version}</version>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>