You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2022/06/03 17:00:02 UTC
[sling-maven-enforcer-rules] branch master updated: SLING-11369 remove any traces of "transitive" as both transitive and direct provided dependencies are checked
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/sling-maven-enforcer-rules.git
The following commit(s) were added to refs/heads/master by this push:
new d6550f2 SLING-11369 remove any traces of "transitive" as both transitive and direct provided dependencies are checked
d6550f2 is described below
commit d6550f2cbe4bba235d38c35195edbe53f4a18c60
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Jun 3 18:59:58 2022 +0200
SLING-11369 remove any traces of "transitive" as both transitive and
direct provided dependencies are checked
---
README.md | 8 ++++----
.../require-transitive-provided-deps-in-runtime-classpath/pom.xml | 6 +++---
...th.java => RequireProvidedDependenciesInRuntimeClasspath.java} | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index b70d8fe..d353fda 100644
--- a/README.md
+++ b/README.md
@@ -16,10 +16,10 @@ It provides additional [Maven Enforcer](https://maven.apache.org/enforcer/maven-
## Rules
-### Require Transitive Provided Dependencies in Runtime Classpath
+### Require Provided Dependencies in Runtime Classpath
Checks that the runtime classpath (e.g. used by Maven Plugins via the
-[Plugin Classloader](https://maven.apache.org/guides/mini/guide-maven-classloading.html#3-plugin-classloaders) or by the [Appassembler Maven Plugin's `assemble` goal](http://www.mojohaus.org/appassembler/appassembler-maven-plugin/assemble-mojo.html)) contains all transitive [provided dependencies](https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Dependency_Scope).
+[Plugin Classloader](https://maven.apache.org/guides/mini/guide-maven-classloading.html#3-plugin-classloaders) or by the [Appassembler Maven Plugin's `assemble` goal](http://www.mojohaus.org/appassembler/appassembler-maven-plugin/assemble-mojo.html)) contains all [provided dependencies](https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Dependency_Scope) both direct and transitive ones.
As those are not transitively inherited they need to be declared explicitly in the pom.xml of the using Maven project.
@@ -57,11 +57,11 @@ As those are not transitively inherited they need to be declared explicitly in t
</goals>
<configuration>
<rules>
- <requireTransitiveProvidedDependenciesInRuntimeClasspath implementation="org.apache.sling.maven.enforcer.RequireTransitiveProvidedDependenciesInRuntimeClasspath">
+ <requireProvidedDependenciesInRuntimeClasspath implementation="org.apache.sling.maven.enforcer.RequireProvidedDependenciesInRuntimeClasspath">
<excludes>
<exclude>javax.servlet:javax.servlet-api</exclude>
</excludes>
- </requireTransitiveProvidedDependenciesInRuntimeClasspath>
+ </requireProvidedDependenciesInRuntimeClasspath>
</rules>
<fail>true</fail>
</configuration>
diff --git a/src/it/require-transitive-provided-deps-in-runtime-classpath/pom.xml b/src/it/require-transitive-provided-deps-in-runtime-classpath/pom.xml
index 918be82..61a85de 100644
--- a/src/it/require-transitive-provided-deps-in-runtime-classpath/pom.xml
+++ b/src/it/require-transitive-provided-deps-in-runtime-classpath/pom.xml
@@ -47,14 +47,14 @@
</goals>
<configuration>
<rules>
- <requireTransitiveProvidedDependenciesInRuntimeClasspath
- implementation="org.apache.sling.maven.enforcer.RequireTransitiveProvidedDependenciesInRuntimeClasspath">
+ <requireProvidedDependenciesInRuntimeClasspath
+ implementation="org.apache.sling.maven.enforcer.RequireProvidedDependenciesInRuntimeClasspath">
<excludes>
<exclude>*:h2</exclude>
<exclude>org.codehaus.woodstox</exclude>
<exclude>javax.servlet:javax.servlet-api:3.1.0</exclude>
</excludes>
- </requireTransitiveProvidedDependenciesInRuntimeClasspath>
+ </requireProvidedDependenciesInRuntimeClasspath>
</rules>
<fail>true</fail>
</configuration>
diff --git a/src/main/java/org/apache/sling/maven/enforcer/RequireTransitiveProvidedDependenciesInRuntimeClasspath.java b/src/main/java/org/apache/sling/maven/enforcer/RequireProvidedDependenciesInRuntimeClasspath.java
similarity index 98%
rename from src/main/java/org/apache/sling/maven/enforcer/RequireTransitiveProvidedDependenciesInRuntimeClasspath.java
rename to src/main/java/org/apache/sling/maven/enforcer/RequireProvidedDependenciesInRuntimeClasspath.java
index 6920f54..545238e 100644
--- a/src/main/java/org/apache/sling/maven/enforcer/RequireTransitiveProvidedDependenciesInRuntimeClasspath.java
+++ b/src/main/java/org/apache/sling/maven/enforcer/RequireProvidedDependenciesInRuntimeClasspath.java
@@ -74,7 +74,7 @@ import org.eclipse.aether.util.graph.visitor.TreeDependencyVisitor;
*
* This check is useful to make sure that a Maven Plugin has access to all necessary classes at run time.
*/
-public class RequireTransitiveProvidedDependenciesInRuntimeClasspath
+public class RequireProvidedDependenciesInRuntimeClasspath
extends AbstractNonCacheableEnforcerRule implements EnforcerRule2 {
/** Specify the banned dependencies. This can be a list of artifacts in the format <code>groupId[:artifactId][:version]</code>. Any of
@@ -186,7 +186,7 @@ public class RequireTransitiveProvidedDependenciesInRuntimeClasspath
private static String dumpPaths(List<List<DependencyNode>> paths) {
String via = paths.stream()
- .map(RequireTransitiveProvidedDependenciesInRuntimeClasspath::dumpPath)
+ .map(RequireProvidedDependenciesInRuntimeClasspath::dumpPath)
.collect(Collectors.joining(" and "));
if (via.isEmpty()) {
return "direct";