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 2024/08/11 16:06:29 UTC

(jackrabbit-filevault) branch master updated (931ceef9 -> 2f6ca004)

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git


    omit 931ceef9 Documentation: Fix typo
     new 2f6ca004 JCRVLT-774 Allow to overwrite resolvePackageInfo(Dependency) through subclasses

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   (931ceef9)
            \
             N -- N -- N   refs/heads/master (2f6ca004)

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:
 src/site/markdown/packagetypes.md                                      | 2 +-
 .../vault/validation/context/AbstractDependencyResolver.java           | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)


(jackrabbit-filevault) 01/01: JCRVLT-774 Allow to overwrite resolvePackageInfo(Dependency) through subclasses

Posted by kw...@apache.org.
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.git

commit 2f6ca004557bef35eb04d929dbb297a2e7ee17a5
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Sun Aug 11 18:06:21 2024 +0200

    JCRVLT-774 Allow to overwrite resolvePackageInfo(Dependency) through
    subclasses
---
 .../vault/validation/context/AbstractDependencyResolver.java           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/context/AbstractDependencyResolver.java b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/context/AbstractDependencyResolver.java
index 15eb1550..9bbe693d 100644
--- a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/context/AbstractDependencyResolver.java
+++ b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/context/AbstractDependencyResolver.java
@@ -95,11 +95,10 @@ public abstract class AbstractDependencyResolver implements DependencyResolver {
      * @return the resolved package info or {@code null}
      * @throws IOException
      */
-    private @Nullable PackageInfo resolvePackageInfo(@NotNull Dependency dependency) throws IOException {
+    protected @Nullable PackageInfo resolvePackageInfo(@NotNull Dependency dependency) throws IOException {
         // resolving a version range is not supported with Maven API, but only with lower level Aether API (requires Maven 3.5 or newer)
         // https://github.com/eclipse/aether-demo/blob/master/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/FindAvailableVersions.java
         // therefore do an best effort resolve instead
-
         final String groupId = dependency.getGroup();
         final String artifactId = dependency.getName();
         PackageInfo info = null;