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/06/27 06:46:05 UTC
[jackrabbit-filevault-package-maven-plugin] branch master updated: JCRVLT-641 drop maven-shared-utils dependency (#79)
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 826b12a JCRVLT-641 drop maven-shared-utils dependency (#79)
826b12a is described below
commit 826b12a9355e413c21647a531d88a114daf46d29
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Jun 27 08:46:00 2022 +0200
JCRVLT-641 drop maven-shared-utils dependency (#79)
use plexus-utils again instead
---
pom.xml | 16 +++++-----------
.../maven/packaging/MavenBasedPackageDependency.java | 2 +-
.../maven/packaging/SubPackageHandlingEntry.java | 2 +-
.../mojo/AbstractSourceAndMetadataPackageMojo.java | 1 -
.../maven/packaging/mojo/GenerateMetadataMojo.java | 6 +++---
.../maven/packaging/mojo/ValidateFilesMojo.java | 1 -
.../filevault/maven/packaging/mojo/VaultMojo.java | 8 ++++----
7 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0fc0972..7f2ea23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -269,12 +269,6 @@
<dependencyManagement>
<dependencies>
- <!-- manage to the version used by plexus-archiver, only used transitively -->
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.4.2</version>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -371,6 +365,11 @@
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.4.2</version>
+ </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>
@@ -382,11 +381,6 @@
<artifactId>plexus-archiver</artifactId>
<version>4.4.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-utils</artifactId>
- <version>3.3.4</version>
- </dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/MavenBasedPackageDependency.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/MavenBasedPackageDependency.java
index 8365a30..4a7afe2 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/MavenBasedPackageDependency.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/MavenBasedPackageDependency.java
@@ -30,7 +30,7 @@ import org.apache.jackrabbit.vault.validation.context.AbstractDependencyResolver
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.utils.StringUtils;
+import org.codehaus.plexus.util.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/SubPackageHandlingEntry.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/SubPackageHandlingEntry.java
index bc4d53e..b8521f7 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/SubPackageHandlingEntry.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/SubPackageHandlingEntry.java
@@ -20,7 +20,7 @@ import org.apache.jackrabbit.vault.fs.io.AccessControlHandling;
import org.apache.jackrabbit.vault.packaging.SubPackageHandling.Entry;
import org.apache.jackrabbit.vault.packaging.SubPackageHandling.Option;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.shared.utils.StringUtils;
+import org.codehaus.plexus.util.StringUtils;
/**
* Defines a sub package handling entry encapsulating option, groupName and packageName.
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/AbstractSourceAndMetadataPackageMojo.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/AbstractSourceAndMetadataPackageMojo.java
index 339268a..fd5ff72 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/AbstractSourceAndMetadataPackageMojo.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/AbstractSourceAndMetadataPackageMojo.java
@@ -21,7 +21,6 @@ import java.util.Set;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.shared.utils.io.DirectoryScanner;
import org.jetbrains.annotations.Nullable;
/**
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/GenerateMetadataMojo.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/GenerateMetadataMojo.java
index 9beb05f..c6ef114 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/GenerateMetadataMojo.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/GenerateMetadataMojo.java
@@ -101,10 +101,10 @@ 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.utils.StringUtils;
-import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.utils.io.IOUtil;
import org.codehaus.plexus.archiver.jar.ManifestException;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.RemoteRepository;
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/ValidateFilesMojo.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/ValidateFilesMojo.java
index 510a9fa..f257307 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/ValidateFilesMojo.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/ValidateFilesMojo.java
@@ -62,7 +62,6 @@ 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.shared.utils.io.DirectoryScanner;
import org.codehaus.plexus.util.AbstractScanner;
import org.codehaus.plexus.util.Scanner;
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/VaultMojo.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/VaultMojo.java
index 821fc73..5bd100a 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/VaultMojo.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/VaultMojo.java
@@ -63,10 +63,10 @@ import org.apache.maven.shared.filtering.MavenResourcesFiltering;
import org.codehaus.plexus.archiver.FileSet;
import org.codehaus.plexus.archiver.jar.ManifestException;
import org.codehaus.plexus.archiver.util.DefaultFileSet;
-import org.apache.maven.shared.utils.io.DirectoryScanner;
-import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.utils.io.MatchPatterns;
-import org.apache.maven.shared.utils.StringUtils;
+import org.codehaus.plexus.util.DirectoryScanner;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.MatchPatterns;
+import org.codehaus.plexus.util.StringUtils;
import org.jetbrains.annotations.NotNull;
/** Builds a content package. Uses the metadata generated by and embedded artifacts (like subpackages or OSGi bundles) configured in a preceding execution of goal {@code generate-metadata}.