From cc49fa426675964f40686fa06a299e3c062c958b Mon Sep 17 00:00:00 2001 From: michielspiritus7 Date: Fri, 14 Jul 2023 12:14:47 +0200 Subject: [PATCH 1/5] added FilterByPropertyIsMultiple: matches all nodes where a given property is a multi-value property (such as an array or list) and contains a specific value or values --- Readme.md | 1 + api/pom.xml | 2 +- .../console/bindings/ContentUpgrade.java | 9 +++ .../filters/FilterByPropertyIsMultiple.java | 66 +++++++++++++++++++ .../bindings/filters/package-info.java | 2 +- .../groovy/console/bindings/package-info.java | 2 +- cloud.startup.hook/pom.xml | 2 +- complete-cloud/pom.xml | 2 +- complete/pom.xml | 2 +- core/pom.xml | 2 +- .../bindings/impl/ContentUpgradeImpl.java | 7 ++ examples-cloud/pom.xml | 2 +- examples/pom.xml | 2 +- oak.index/pom.xml | 2 +- pom.xml | 29 +++----- sonar-project.properties | 2 +- ui.apps.structure/pom.xml | 2 +- ui.apps/pom.xml | 2 +- ui.content/pom.xml | 2 +- 19 files changed, 106 insertions(+), 34 deletions(-) create mode 100644 api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/filters/FilterByPropertyIsMultiple.java diff --git a/Readme.md b/Readme.md index ab581acb..c0ccdca3 100644 --- a/Readme.md +++ b/Readme.md @@ -338,6 +338,7 @@ Filters the resources by property values. * filterByHasProperty: matches all nodes that have the given property. The value of the property is not relevant. * filterByNotHasProperty: matches all nodes that do not have the given property. The value of the property is not relevant. * filterByProperty: matches all nodes that have the given attribute value. Filter does not match if attribute is not present. By using a value of "null" you can search if an attribute is not present. +* filterByPropertyIsMultiple: matches all nodes where a given property is a multi-value property (such as an array or list) and contains a specific value or values. The filter does not match if the attribute does not exist, or if it exists but is not a multi-value property or does not contain the specified value or values. * filterByNotProperty: matches all nodes that do not have the given attribute value. Filter matches if attribute is not present. * filterByProperties: use this to filter by a list of property values (e.g. sling:resourceType). All properties in the map are required to to match. Filter does not match if attribute does not exist. * filterByNotProperties: use this to filter by a list of property values (e.g. sling:resourceType) is not matching. If any property in the map does not match the filter matches. Filter matches if attribute does not exist. diff --git a/api/pom.xml b/api/pom.xml index 7aea5abe..6efa9bf8 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.4.1-SNAPSHOT + 6.5.1-SNAPSHOT aecu.api diff --git a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/ContentUpgrade.java b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/ContentUpgrade.java index 0c9f65f3..38ae58cb 100644 --- a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/ContentUpgrade.java +++ b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/ContentUpgrade.java @@ -133,6 +133,15 @@ public interface ContentUpgrade { */ ContentUpgrade filterByNotProperty(String name, Object value); + /** + * Filters by matching a single property. + * + * @param name property name + * @param value property value + * @return upgrade object + */ + ContentUpgrade filterByPropertyIsMultiple(String name, Object value); + /** * Filters by matching a single property using a regular expression for the value. This is * intended for single value properties. diff --git a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/filters/FilterByPropertyIsMultiple.java b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/filters/FilterByPropertyIsMultiple.java new file mode 100644 index 00000000..b5f1d05e --- /dev/null +++ b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/filters/FilterByPropertyIsMultiple.java @@ -0,0 +1,66 @@ +/* + * Copyright 2018 - 2019 Valtech GmbH + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, + * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or + * substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT + * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +package de.valtech.aecu.api.groovy.console.bindings.filters; + +import javax.annotation.Nonnull; + +import org.apache.sling.api.resource.Resource; +import org.apache.sling.api.resource.ValueMap; + +import de.valtech.aecu.api.groovy.console.bindings.GStringConverter; + +import java.util.Arrays; + +/** + * Filters resources by a given property. The filter only matches if the attribute exists and has + * the exact given value and the property is an array or a list. + * + * @author Roland Gruber + */ +public class FilterByPropertyIsMultiple implements FilterBy { + + private String name; + private Object value; + + /** + * Constructor + * + * @param name attribute name + * @param value attribute value + */ + public FilterByPropertyIsMultiple(@Nonnull String name, Object value) { + this.name = name; + this.value = GStringConverter.convert(value); + } + + @Override + public boolean filter(@Nonnull Resource resource, StringBuilder output) { + ValueMap properties = resource.getValueMap(); + Object attrValue = properties.get(name); + + // Check if the property is an array or a list + if (attrValue instanceof Object[] || attrValue instanceof java.util.List) { + return ((value == null) && (attrValue == null)) || ((value != null) && value.equals(attrValue)); + } + + return false; + } + + +} diff --git a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/filters/package-info.java b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/filters/package-info.java index 5d0a9d63..38c34452 100644 --- a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/filters/package-info.java +++ b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/filters/package-info.java @@ -22,7 +22,7 @@ * * @author Roxana Muresan */ -@Version("3.2.0") +@Version("3.3.0") package de.valtech.aecu.api.groovy.console.bindings.filters; import org.osgi.annotation.versioning.Version; diff --git a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/package-info.java b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/package-info.java index 283837de..360455df 100644 --- a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/package-info.java +++ b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/package-info.java @@ -22,7 +22,7 @@ * * @author Roxana Muresan */ -@Version("4.10.0") +@Version("4.11.0") package de.valtech.aecu.api.groovy.console.bindings; import org.osgi.annotation.versioning.Version; diff --git a/cloud.startup.hook/pom.xml b/cloud.startup.hook/pom.xml index b299f544..e04fa7d0 100644 --- a/cloud.startup.hook/pom.xml +++ b/cloud.startup.hook/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.4.1-SNAPSHOT + 6.5.1-SNAPSHOT aecu.cloud.startup.hook diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml index 1ce916e2..e7a0a483 100644 --- a/complete-cloud/pom.xml +++ b/complete-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.1-SNAPSHOT + 6.5.1-SNAPSHOT aecu.complete.cloud diff --git a/complete/pom.xml b/complete/pom.xml index 64299fd0..1b6f8b64 100644 --- a/complete/pom.xml +++ b/complete/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.1-SNAPSHOT + 6.5.1-SNAPSHOT aecu.complete diff --git a/core/pom.xml b/core/pom.xml index 09b499cf..a83859e7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.4.1-SNAPSHOT + 6.5.1-SNAPSHOT aecu.core diff --git a/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/impl/ContentUpgradeImpl.java b/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/impl/ContentUpgradeImpl.java index 4eb477db..75dfcbb3 100644 --- a/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/impl/ContentUpgradeImpl.java +++ b/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/impl/ContentUpgradeImpl.java @@ -50,6 +50,7 @@ import de.valtech.aecu.api.groovy.console.bindings.filters.FilterByPathRegex; import de.valtech.aecu.api.groovy.console.bindings.filters.FilterByProperties; import de.valtech.aecu.api.groovy.console.bindings.filters.FilterByProperty; +import de.valtech.aecu.api.groovy.console.bindings.filters.FilterByPropertyIsMultiple; import de.valtech.aecu.api.groovy.console.bindings.filters.FilterByPropertyRegex; import de.valtech.aecu.api.groovy.console.bindings.filters.FilterByNodeRootPaths; import de.valtech.aecu.api.groovy.console.bindings.filters.NOTFilter; @@ -219,6 +220,12 @@ public ContentUpgrade filterByNotProperty(String name, Object value) { return this; } + @Override + public ContentUpgrade filterByPropertyIsMultiple(@Nonnull String name, Object value) { + addFilter(new FilterByPropertyIsMultiple(name, value)); + return this; + } + @Override public ContentUpgrade filterByPropertyRegex(String name, String regex) { addFilter(new FilterByPropertyRegex(name, regex)); diff --git a/examples-cloud/pom.xml b/examples-cloud/pom.xml index ca33cc83..79cfa832 100644 --- a/examples-cloud/pom.xml +++ b/examples-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.1-SNAPSHOT + 6.5.1-SNAPSHOT aecu.examples-cloud diff --git a/examples/pom.xml b/examples/pom.xml index a5c38dfa..ccdbde05 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.1-SNAPSHOT + 6.5.1-SNAPSHOT aecu.examples diff --git a/oak.index/pom.xml b/oak.index/pom.xml index e3bc1084..d1943c0e 100644 --- a/oak.index/pom.xml +++ b/oak.index/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.1-SNAPSHOT + 6.5.1-SNAPSHOT aecu.oak.index diff --git a/pom.xml b/pom.xml index 7b60eed2..b79ba48a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 6.4.1-SNAPSHOT + 6.5.1-SNAPSHOT AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade @@ -25,9 +25,9 @@ localhost - 5602 + 4502 localhost - 5705 + 4502 admin admin admin @@ -387,23 +387,6 @@ - - org.owasp - dependency-check-maven - 8.1.2 - - 0 - true - true - - - - - check - - - - @@ -645,6 +628,12 @@ 2.0.1 compile + + de.valtech.aecu + aecu.bundle + LATEST + zip + diff --git a/sonar-project.properties b/sonar-project.properties index a602ffb4..def62a11 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=aecu # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=AEM Easy Content Upgrade -sonar.projectVersion=6.4.1-SNAPSHOT +sonar.projectVersion=6.5.1-SNAPSHOT # Encoding of the source code. Default is default system encoding sonar.sourceEncoding=UTF-8 diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml index a8753c2b..4c935403 100644 --- a/ui.apps.structure/pom.xml +++ b/ui.apps.structure/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.1-SNAPSHOT + 6.5.1-SNAPSHOT aecu.ui.apps.structure diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index 49ba46a0..56fdd6e8 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.1-SNAPSHOT + 6.5.1-SNAPSHOT aecu.ui.apps diff --git a/ui.content/pom.xml b/ui.content/pom.xml index ac954aa8..305014be 100644 --- a/ui.content/pom.xml +++ b/ui.content/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.1-SNAPSHOT + 6.5.1-SNAPSHOT aecu.ui.content From 4f0b66df880f4efaee12eeac33926fd6ab5ad34e Mon Sep 17 00:00:00 2001 From: michielspiritus7 Date: Fri, 14 Jul 2023 12:17:03 +0200 Subject: [PATCH 2/5] added FilterByPropertyIsMultiple: matches all nodes where a given property is a multi-value property (such as an array or list) and contains a specific value or values --- .../filters/FilterByPropertyIsMultiple.java | 1 - .../FilterByPropertyIsMultipleTest.java | 96 +++++++++++++++++++ pom.xml | 31 ++++-- 3 files changed, 117 insertions(+), 11 deletions(-) create mode 100644 api/src/test/java/de/valtech/aecu/core/groovy/console/bindings/filters/FilterByPropertyIsMultipleTest.java diff --git a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/filters/FilterByPropertyIsMultiple.java b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/filters/FilterByPropertyIsMultiple.java index b5f1d05e..92237d3e 100644 --- a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/filters/FilterByPropertyIsMultiple.java +++ b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/filters/FilterByPropertyIsMultiple.java @@ -25,7 +25,6 @@ import de.valtech.aecu.api.groovy.console.bindings.GStringConverter; -import java.util.Arrays; /** * Filters resources by a given property. The filter only matches if the attribute exists and has diff --git a/api/src/test/java/de/valtech/aecu/core/groovy/console/bindings/filters/FilterByPropertyIsMultipleTest.java b/api/src/test/java/de/valtech/aecu/core/groovy/console/bindings/filters/FilterByPropertyIsMultipleTest.java new file mode 100644 index 00000000..88613afc --- /dev/null +++ b/api/src/test/java/de/valtech/aecu/core/groovy/console/bindings/filters/FilterByPropertyIsMultipleTest.java @@ -0,0 +1,96 @@ +/* + * Copyright 2023 Valtech GmbH + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, + * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or + * substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT + * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +package de.valtech.aecu.core.groovy.console.bindings.filters; + +import org.apache.sling.api.resource.ValueMap; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.when; + +import org.apache.sling.api.resource.Resource; +import org.apache.sling.api.resource.ValueMap; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; + +import de.valtech.aecu.api.groovy.console.bindings.filters.FilterByPropertyIsMultiple; + +import java.util.Arrays; +import java.util.List; + +/** + * Tests FilterByPropertyIsMultiple + * + * @author Roland Gruber + */ +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) +public class FilterByPropertyIsMultipleTest { + + private static final String NAME = "name"; + private static final List MULTIPLE_VALUE = Arrays.asList("value1", "value2"); + + @Mock + private Resource resource; + + @Mock + ValueMap values; + + @Mock + ValueMap valueMap; + + @BeforeEach + public void setup() { + when(resource.getValueMap()).thenReturn(values); + } + + @Test + void filterAttributeArray() { + Object[] attrArray = new Object[]{"value1", "value2", "value3"}; + when(resource.getValueMap()).thenReturn(valueMap); + when(valueMap.get("name")).thenReturn(attrArray); + + FilterByPropertyIsMultiple filter = new FilterByPropertyIsMultiple("name", attrArray); + + assertTrue(filter.filter(resource, new StringBuilder())); + } + + + + @Test + public void filterAttributeList() { + FilterByPropertyIsMultiple filter = new FilterByPropertyIsMultiple(NAME, MULTIPLE_VALUE); + when(values.get(NAME)).thenReturn(MULTIPLE_VALUE); + + assertTrue(filter.filter(resource, new StringBuilder())); + } + + @Test + public void filterAttributeNonMultiple() { + FilterByPropertyIsMultiple filter = new FilterByPropertyIsMultiple(NAME, "value"); + when(values.get(NAME)).thenReturn("value"); + + assertFalse(filter.filter(resource, new StringBuilder())); + } + +} diff --git a/pom.xml b/pom.xml index b79ba48a..0d172e00 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 6.5.1-SNAPSHOT + 6.4.1-SNAPSHOT AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade @@ -25,9 +25,9 @@ localhost - 4502 + 5602 localhost - 4502 + 5705 admin admin admin @@ -387,6 +387,23 @@ + + org.owasp + dependency-check-maven + 8.1.2 + + 0 + true + true + + + + + check + + + + @@ -628,12 +645,6 @@ 2.0.1 compile - - de.valtech.aecu - aecu.bundle - LATEST - zip - @@ -724,4 +735,4 @@ - + \ No newline at end of file From 7ec71e90ba25c58850e5e3ff668c71af4c7fcb96 Mon Sep 17 00:00:00 2001 From: michielspiritus7 Date: Fri, 18 Aug 2023 10:57:04 +0200 Subject: [PATCH 3/5] resolved issues --- api/pom.xml | 2 +- .../aecu/api/groovy/console/bindings/ContentUpgrade.java | 5 +++-- .../console/bindings/filters/FilterByPropertyIsMultiple.java | 2 +- cloud.startup.hook/pom.xml | 2 +- complete-cloud/pom.xml | 2 +- complete/pom.xml | 2 +- core/pom.xml | 2 +- examples-cloud/pom.xml | 2 +- examples/pom.xml | 2 +- oak.index/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- ui.apps.structure/pom.xml | 2 +- ui.apps/pom.xml | 2 +- ui.content/pom.xml | 2 +- 15 files changed, 17 insertions(+), 16 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 6efa9bf8..a6dc1683 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.5.1-SNAPSHOT + 6.5.0-SNAPSHOT aecu.api diff --git a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/ContentUpgrade.java b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/ContentUpgrade.java index 38ae58cb..9038ee20 100644 --- a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/ContentUpgrade.java +++ b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/ContentUpgrade.java @@ -134,10 +134,11 @@ public interface ContentUpgrade { ContentUpgrade filterByNotProperty(String name, Object value); /** - * Filters by matching a single property. + * Filters by matching a single property using a regular expression for the value. This is + * intended for single value properties. * * @param name property name - * @param value property value + * @param regex regular expression to match value * @return upgrade object */ ContentUpgrade filterByPropertyIsMultiple(String name, Object value); diff --git a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/filters/FilterByPropertyIsMultiple.java b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/filters/FilterByPropertyIsMultiple.java index 92237d3e..cfa127c3 100644 --- a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/filters/FilterByPropertyIsMultiple.java +++ b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/filters/FilterByPropertyIsMultiple.java @@ -30,7 +30,7 @@ * Filters resources by a given property. The filter only matches if the attribute exists and has * the exact given value and the property is an array or a list. * - * @author Roland Gruber + * @author Michiel Spiritus */ public class FilterByPropertyIsMultiple implements FilterBy { diff --git a/cloud.startup.hook/pom.xml b/cloud.startup.hook/pom.xml index e04fa7d0..41be8299 100644 --- a/cloud.startup.hook/pom.xml +++ b/cloud.startup.hook/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.5.1-SNAPSHOT + 6.5.0-SNAPSHOT aecu.cloud.startup.hook diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml index e7a0a483..548a12e7 100644 --- a/complete-cloud/pom.xml +++ b/complete-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.5.1-SNAPSHOT + 6.5.O-SNAPSHOT aecu.complete.cloud diff --git a/complete/pom.xml b/complete/pom.xml index 1b6f8b64..3850523e 100644 --- a/complete/pom.xml +++ b/complete/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.5.1-SNAPSHOT + 6.5.0-SNAPSHOT aecu.complete diff --git a/core/pom.xml b/core/pom.xml index a83859e7..afe63178 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.5.1-SNAPSHOT + 6.5.0-SNAPSHOT aecu.core diff --git a/examples-cloud/pom.xml b/examples-cloud/pom.xml index 79cfa832..0477bf74 100644 --- a/examples-cloud/pom.xml +++ b/examples-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.5.1-SNAPSHOT + 6.5.0-SNAPSHOT aecu.examples-cloud diff --git a/examples/pom.xml b/examples/pom.xml index ccdbde05..60423335 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.5.1-SNAPSHOT + 6.5.0-SNAPSHOT aecu.examples diff --git a/oak.index/pom.xml b/oak.index/pom.xml index d1943c0e..27df4dc5 100644 --- a/oak.index/pom.xml +++ b/oak.index/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.5.1-SNAPSHOT + 6.5.0-SNAPSHOT aecu.oak.index diff --git a/pom.xml b/pom.xml index 0d172e00..7e82844f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 6.4.1-SNAPSHOT + 6.5.0-SNAPSHOT AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade diff --git a/sonar-project.properties b/sonar-project.properties index def62a11..f9594d23 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=aecu # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=AEM Easy Content Upgrade -sonar.projectVersion=6.5.1-SNAPSHOT +sonar.projectVersion=6.5.0-SNAPSHOT # Encoding of the source code. Default is default system encoding sonar.sourceEncoding=UTF-8 diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml index 4c935403..8d313d01 100644 --- a/ui.apps.structure/pom.xml +++ b/ui.apps.structure/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.5.1-SNAPSHOT + 6.5.0-SNAPSHOT aecu.ui.apps.structure diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index 56fdd6e8..79a98773 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.5.1-SNAPSHOT + 6.5.0-SNAPSHOT aecu.ui.apps diff --git a/ui.content/pom.xml b/ui.content/pom.xml index 305014be..9e2e63cf 100644 --- a/ui.content/pom.xml +++ b/ui.content/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.5.1-SNAPSHOT + 6.5.0-SNAPSHOT aecu.ui.content From 2a32f8c0f84692fb6d9271d0f5375e9b963860fa Mon Sep 17 00:00:00 2001 From: michielspiritus7 <132340612+michielspiritus7@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:23:39 +0200 Subject: [PATCH 4/5] Update pom.xml --- complete-cloud/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml index 548a12e7..18365150 100644 --- a/complete-cloud/pom.xml +++ b/complete-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.5.O-SNAPSHOT + 6.5.0-SNAPSHOT aecu.complete.cloud From ed847049b492da6d3348ce1a5b64191bd0b346db Mon Sep 17 00:00:00 2001 From: Michiel Spiritus Date: Thu, 19 Oct 2023 16:57:20 +0200 Subject: [PATCH 5/5] fix javadoc bug --- .../aecu/api/groovy/console/bindings/ContentUpgrade.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/ContentUpgrade.java b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/ContentUpgrade.java index 9038ee20..babb4034 100644 --- a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/ContentUpgrade.java +++ b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/ContentUpgrade.java @@ -138,7 +138,7 @@ public interface ContentUpgrade { * intended for single value properties. * * @param name property name - * @param regex regular expression to match value + * @param value attribute value * @return upgrade object */ ContentUpgrade filterByPropertyIsMultiple(String name, Object value);