You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2020/11/12 14:23:38 UTC
[sling-org-apache-sling-feature] branch master updated: SLING-9902:
use the alias version for HIGHEST merge.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature.git
The following commit(s) were added to refs/heads/master by this push:
new b8833b5 SLING-9902: use the alias version for HIGHEST merge.
b8833b5 is described below
commit b8833b5d05eddc80e97eb79d3801a8113a497658
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Thu Nov 12 15:23:27 2020 +0100
SLING-9902: use the alias version for HIGHEST merge.
---
src/main/java/org/apache/sling/feature/builder/BuilderUtil.java | 4 ++--
src/test/java/org/apache/sling/feature/builder/BuilderUtilTest.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/builder/BuilderUtil.java b/src/main/java/org/apache/sling/feature/builder/BuilderUtil.java
index 2dba3f0..c42fafa 100644
--- a/src/main/java/org/apache/sling/feature/builder/BuilderUtil.java
+++ b/src/main/java/org/apache/sling/feature/builder/BuilderUtil.java
@@ -244,8 +244,8 @@ class BuilderUtil {
result.add(fromTarget);
result.add(fromSource);
} else if (BuilderContext.VERSION_OVERRIDE_HIGHEST.equalsIgnoreCase(rule)) {
- Version a1v = fromTarget.getId().getOSGiVersion();
- Version a2v = fromSource.getId().getOSGiVersion();
+ Version a1v = fromTarget.getAliases(true).stream().filter(prefix::isSame).findFirst().get().getOSGiVersion();
+ Version a2v = fromSource.getAliases(true).stream().filter(prefix::isSame).findFirst().get().getOSGiVersion();
result.add(
addFeatureOrigin(
selectStartOrder(fromTarget, fromSource, a1v.compareTo(a2v) > 0 ? fromTarget : fromSource),
diff --git a/src/test/java/org/apache/sling/feature/builder/BuilderUtilTest.java b/src/test/java/org/apache/sling/feature/builder/BuilderUtilTest.java
index d547d59..e55d3ce 100644
--- a/src/test/java/org/apache/sling/feature/builder/BuilderUtilTest.java
+++ b/src/test/java/org/apache/sling/feature/builder/BuilderUtilTest.java
@@ -192,8 +192,8 @@ public class BuilderUtilTest {
@Test public void testMergeBundlesWithAlias() {
final Bundles target = new Bundles();
- Artifact b = createBundle("g/b/2.0", 2);
- b.getMetadata().put("alias", "x:z:1,a:a");
+ Artifact b = createBundle("g/b/1.0", 2);
+ b.getMetadata().put("alias", "x:z:2.0,a:a");
target.add(b);
final Bundles source = new Bundles();
@@ -206,7 +206,7 @@ public class BuilderUtilTest {
final List<Map.Entry<Integer, Artifact>> result = getBundles(target);
assertEquals(1, result.size());
- assertContains(result, 2, ArtifactId.parse("g/b/2.0"));
+ assertContains(result, 2, ArtifactId.parse("g/b/1.0"));
}
@Test public void testMergeBundlesDifferentStartlevel() {