You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2024/03/17 15:28:56 UTC
(maven-checkstyle-plugin) branch dependabot/maven/org.codehaus.plexus-plexus-resources-1.3.0 updated (fc1b02a -> 36177bb)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch dependabot/maven/org.codehaus.plexus-plexus-resources-1.3.0
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git
omit fc1b02a Bump org.codehaus.plexus:plexus-resources from 1.1.0 to 1.3.0
new 36177bb Bump org.codehaus.plexus:plexus-resources from 1.1.0 to 1.3.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (fc1b02a)
\
N -- N -- N refs/heads/dependabot/maven/org.codehaus.plexus-plexus-resources-1.3.0 (36177bb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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.
Summary of changes:
pom.xml | 6 ------
.../checkstyle/resource/LicenseResourceManager.java | 18 ++++++++++++++----
2 files changed, 14 insertions(+), 10 deletions(-)
(maven-checkstyle-plugin) 01/01: Bump org.codehaus.plexus:plexus-resources from 1.1.0 to 1.3.0
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch dependabot/maven/org.codehaus.plexus-plexus-resources-1.3.0
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git
commit 36177bbb3a6ac299414b4f6b17d76c24a02db3f3
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Feb 16 04:49:38 2024 +0000
Bump org.codehaus.plexus:plexus-resources from 1.1.0 to 1.3.0
Bumps [org.codehaus.plexus:plexus-resources](https://github.com/codehaus-plexus/plexus-resources) from 1.1.0 to 1.3.0.
- [Release notes](https://github.com/codehaus-plexus/plexus-resources/releases)
- [Commits](https://github.com/codehaus-plexus/plexus-resources/compare/plexus-resources-1.1.0...plexus-resources-1.3.0)
---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-resources
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
---
pom.xml | 8 +-------
.../checkstyle/resource/LicenseResourceManager.java | 18 ++++++++++++++----
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6714e3a..57333fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,13 +159,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-resources</artifactId>
- <version>1.1.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- </exclusions>
+ <version>1.3.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/resource/LicenseResourceManager.java b/src/main/java/org/apache/maven/plugins/checkstyle/resource/LicenseResourceManager.java
index 8808867..800b97c 100644
--- a/src/main/java/org/apache/maven/plugins/checkstyle/resource/LicenseResourceManager.java
+++ b/src/main/java/org/apache/maven/plugins/checkstyle/resource/LicenseResourceManager.java
@@ -18,6 +18,8 @@
*/
package org.apache.maven.plugins.checkstyle.resource;
+import javax.inject.Inject;
+
import java.util.Map;
import org.codehaus.plexus.component.annotations.Component;
@@ -28,6 +30,8 @@ import org.codehaus.plexus.resource.ResourceManager;
import org.codehaus.plexus.resource.loader.ResourceLoader;
import org.codehaus.plexus.resource.loader.ResourceNotFoundException;
import org.codehaus.plexus.resource.loader.ThreadContextClasspathResourceLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* License resource manager, to avoid defaulting license to maven-checkstyle-plugin's own license.
@@ -37,9 +41,16 @@ import org.codehaus.plexus.resource.loader.ThreadContextClasspathResourceLoader;
@Component(role = ResourceManager.class, hint = "license", instantiationStrategy = "per-lookup")
public class LicenseResourceManager extends DefaultResourceManager {
+ private static final Logger LOGGER = LoggerFactory.getLogger(LicenseResourceManager.class);
+
@Requirement(role = ResourceLoader.class)
private Map<String, ResourceLoader> resourceLoaders;
+ @Inject
+ public LicenseResourceManager(Map<String, ResourceLoader> resourceLoaders) {
+ super(resourceLoaders);
+ }
+
@Override
public void addSearchPath(String id, String path) {
ResourceLoader loader = resourceLoaders.get(id);
@@ -64,13 +75,12 @@ public class LicenseResourceManager extends DefaultResourceManager {
try {
PlexusResource resource = resourceLoader.getResource(name);
- getLogger().debug("The resource '" + name + "' was found as " + resource.getName() + ".");
+ LOGGER.debug("The resource '" + name + "' was found as " + resource.getName() + ".");
return resource;
} catch (ResourceNotFoundException e) {
- getLogger()
- .debug("The resource '" + name + "' was not found with resourceLoader "
- + resourceLoader.getClass().getName() + ".");
+ LOGGER.debug("The resource '" + name + "' was not found with resourceLoader "
+ + resourceLoader.getClass().getName() + ".");
}
}