From a9b27e0648acc1e6b0157671b176b256b3c78bc6 Mon Sep 17 00:00:00 2001 From: Namics OSS CI Date: Fri, 22 Mar 2024 06:17:11 +0000 Subject: [PATCH 1/7] Release 3.2.0: set develop to next development version 3.2.1-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0332d84..3144905 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.namics.oss.aem genericmultifield bundle - 3.2.0-SNAPSHOT + 3.2.1-SNAPSHOT Generic Multi-field for AEM 6.5 com.namics.oss.aem - Generic Multi-field for AEM 6.5 https://github.com/namics/aem-generic-multifield From 943b9845f5908322bdf83238f33a1b54c73bcc24 Mon Sep 17 00:00:00 2001 From: mheil Date: Fri, 22 Mar 2024 07:27:19 +0100 Subject: [PATCH 2/7] NOISSUE Update badge --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 235dfc1..6d4a0b1 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,11 @@ With this project you can use a widget in [Adobe Experience Manager 6.5](https://docs.adobe.com/content/help/en/experience-manager-65/release-notes/release-notes.html) Touch UI which lets you create a generic multifield in a dialog. -| System | Status | -|------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| CI master | [![deploy snapshot](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/deploy-snapshot.yml/badge.svg?branch=6.5%2Fmaster)](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/deploy-snapshot.yml) | -| CI develop | [![deploy snapshot](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/deploy-snapshot.yml/badge.svg?branch=6.5%2Fdevelop)](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/deploy-snapshot.yml) | -| Dependency | [![Maven Central][maven-central-version]][maven-central] | +| System | Status | +|------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| CI master | [![release and deploy](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/release-and-deploy-release.yml/badge.svg?branch=6.5%2Fmaster)](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/release-and-deploy-release.yml) | +| CI develop | [![deploy snapshot](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/deploy-snapshot.yml/badge.svg?branch=6.5%2Fdevelop)](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/deploy-snapshot.yml) | +| Dependency | [![Maven Central][maven-central-version]][maven-central] | * [Generic Multifield for AEM 6.5](#generic-multifield-for-aem-65) From 76bf33b7a3ce2c5f9649569d2f76c491abe6f6c1 Mon Sep 17 00:00:00 2001 From: Michael Heil Date: Fri, 22 Mar 2024 07:50:46 +0100 Subject: [PATCH 3/7] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3144905..dd88abe 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 3.2.1-SNAPSHOT Generic Multi-field for AEM 6.5 com.namics.oss.aem - Generic Multi-field for AEM 6.5 - https://github.com/namics/aem-generic-multifield + https://github.com/merkle-open/aem-generic-multifield From dbc632ee299771e3f7934204bb584db706c376d5 Mon Sep 17 00:00:00 2001 From: mheil Date: Fri, 22 Mar 2024 08:04:57 +0100 Subject: [PATCH 4/7] NOISSUE Update badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6d4a0b1..6a3e66f 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Touch UI which lets you create a generic multifield in a dialog. |------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | CI master | [![release and deploy](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/release-and-deploy-release.yml/badge.svg?branch=6.5%2Fmaster)](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/release-and-deploy-release.yml) | | CI develop | [![deploy snapshot](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/deploy-snapshot.yml/badge.svg?branch=6.5%2Fdevelop)](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/deploy-snapshot.yml) | -| Dependency | [![Maven Central][maven-central-version]][maven-central] | +| Dependency | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.namics.oss.aem/genericmultifield/badge.svg?version=3.2.0)](https://search.maven.org/artifact/com.namics.oss.aem/genericmultifield/3.2.0/bundle) | * [Generic Multifield for AEM 6.5](#generic-multifield-for-aem-65) From 6ae852ecf67e4390ed33c604d0b1af3968516bfe Mon Sep 17 00:00:00 2001 From: Michael Heil Date: Fri, 22 Mar 2024 08:13:30 +0100 Subject: [PATCH 5/7] Update LICENSE --- LICENSE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 006f881..a72bc50 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018 Merkle Inc. +Copyright (c) 2018 Merkle Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -18,4 +18,4 @@ 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. \ No newline at end of file +SOFTWARE. From 0fd32a60b57b8de680ecc970e186b9d54bf73584 Mon Sep 17 00:00:00 2001 From: Michael Heil Date: Fri, 31 May 2024 08:47:09 +0200 Subject: [PATCH 6/7] NOISSUE fix unintended move from namics to merkle resource type --- README.md | 2 +- pom.xml | 7 ++----- .../apps/{merkle => namics}/genericmultifield.json | 0 .../genericmultifield/clientlibs/css.json | 0 .../genericmultifield/clientlibs/css/css.txt | 0 .../genericmultifield/clientlibs/css/genericmultifield.css | 0 .../genericmultifield/clientlibs/js.json | 0 .../clientlibs/js/CUI.GenericMultiField.js | 0 .../clientlibs/js/GenericMultifieldDialogHandler.js | 0 .../clientlibs/js/GenericMultifieldHelper.js | 0 .../genericmultifield/clientlibs/js/Namespace.js | 0 .../genericmultifield/clientlibs/js/js.txt | 0 .../genericmultifield/clientlibs/js/validations.js | 0 .../apps/{merkle => namics}/genericmultifield/init.jsp | 0 .../genericmultifield/readonly/readonly.jsp | 0 .../apps/{merkle => namics}/genericmultifield/render.jsp | 0 16 files changed, 3 insertions(+), 6 deletions(-) rename src/main/resources/SLING-INF/apps/{merkle => namics}/genericmultifield.json (100%) rename src/main/resources/SLING-INF/apps/{merkle => namics}/genericmultifield/clientlibs/css.json (100%) rename src/main/resources/SLING-INF/apps/{merkle => namics}/genericmultifield/clientlibs/css/css.txt (100%) rename src/main/resources/SLING-INF/apps/{merkle => namics}/genericmultifield/clientlibs/css/genericmultifield.css (100%) rename src/main/resources/SLING-INF/apps/{merkle => namics}/genericmultifield/clientlibs/js.json (100%) rename src/main/resources/SLING-INF/apps/{merkle => namics}/genericmultifield/clientlibs/js/CUI.GenericMultiField.js (100%) rename src/main/resources/SLING-INF/apps/{merkle => namics}/genericmultifield/clientlibs/js/GenericMultifieldDialogHandler.js (100%) rename src/main/resources/SLING-INF/apps/{merkle => namics}/genericmultifield/clientlibs/js/GenericMultifieldHelper.js (100%) rename src/main/resources/SLING-INF/apps/{merkle => namics}/genericmultifield/clientlibs/js/Namespace.js (100%) rename src/main/resources/SLING-INF/apps/{merkle => namics}/genericmultifield/clientlibs/js/js.txt (100%) rename src/main/resources/SLING-INF/apps/{merkle => namics}/genericmultifield/clientlibs/js/validations.js (100%) rename src/main/resources/SLING-INF/apps/{merkle => namics}/genericmultifield/init.jsp (100%) rename src/main/resources/SLING-INF/apps/{merkle => namics}/genericmultifield/readonly/readonly.jsp (100%) rename src/main/resources/SLING-INF/apps/{merkle => namics}/genericmultifield/render.jsp (100%) diff --git a/README.md b/README.md index 6a3e66f..32a9631 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ Example usage of the Generic Multifield in your component `_cq_dialog.xml` defin name="./title"/> yyyy-MM-dd-z-HH-mm-ss ${maven.build.timestamp} - unknown - unknown - unknown 11 UTF-8 ${encoding} @@ -64,8 +61,8 @@ com.adobe.aem - aem-sdk-api - 2023.12.14697.20231215T125030Z-231200 + uber-jar + 6.5.18 provided diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield.json b/src/main/resources/SLING-INF/apps/namics/genericmultifield.json similarity index 100% rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield.json rename to src/main/resources/SLING-INF/apps/namics/genericmultifield.json diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/css.json b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/css.json similarity index 100% rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/css.json rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/css.json diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/css/css.txt b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/css/css.txt similarity index 100% rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/css/css.txt rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/css/css.txt diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/css/genericmultifield.css b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/css/genericmultifield.css similarity index 100% rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/css/genericmultifield.css rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/css/genericmultifield.css diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js.json b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js.json similarity index 100% rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js.json rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js.json diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/CUI.GenericMultiField.js b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/CUI.GenericMultiField.js similarity index 100% rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/CUI.GenericMultiField.js rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/CUI.GenericMultiField.js diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/GenericMultifieldDialogHandler.js b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/GenericMultifieldDialogHandler.js similarity index 100% rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/GenericMultifieldDialogHandler.js rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/GenericMultifieldDialogHandler.js diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/GenericMultifieldHelper.js b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/GenericMultifieldHelper.js similarity index 100% rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/GenericMultifieldHelper.js rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/GenericMultifieldHelper.js diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/Namespace.js b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/Namespace.js similarity index 100% rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/Namespace.js rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/Namespace.js diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/js.txt b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/js.txt similarity index 100% rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/js.txt rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/js.txt diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/validations.js b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/validations.js similarity index 100% rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/validations.js rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/validations.js diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/init.jsp b/src/main/resources/SLING-INF/apps/namics/genericmultifield/init.jsp similarity index 100% rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/init.jsp rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/init.jsp diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/readonly/readonly.jsp b/src/main/resources/SLING-INF/apps/namics/genericmultifield/readonly/readonly.jsp similarity index 100% rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/readonly/readonly.jsp rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/readonly/readonly.jsp diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/render.jsp b/src/main/resources/SLING-INF/apps/namics/genericmultifield/render.jsp similarity index 100% rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/render.jsp rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/render.jsp From 7ee6e5f2e1d766cb4b37a3b975ad6260fe1bb486 Mon Sep 17 00:00:00 2001 From: Michael Heil Date: Fri, 31 May 2024 08:58:18 +0200 Subject: [PATCH 7/7] NOISSUE prepare read me for new release --- README.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 32a9631..8853703 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Touch UI which lets you create a generic multifield in a dialog. |------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | CI master | [![release and deploy](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/release-and-deploy-release.yml/badge.svg?branch=6.5%2Fmaster)](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/release-and-deploy-release.yml) | | CI develop | [![deploy snapshot](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/deploy-snapshot.yml/badge.svg?branch=6.5%2Fdevelop)](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/deploy-snapshot.yml) | -| Dependency | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.namics.oss.aem/genericmultifield/badge.svg?version=3.2.0)](https://search.maven.org/artifact/com.namics.oss.aem/genericmultifield/3.2.0/bundle) | +| Dependency | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.namics.oss.aem/genericmultifield/badge.svg?version=3.2.1)](https://search.maven.org/artifact/com.namics.oss.aem/genericmultifield/3.2.1/bundle) | * [Generic Multifield for AEM 6.5](#generic-multifield-for-aem-65) @@ -34,7 +34,7 @@ Touch UI which lets you create a generic multifield in a dialog. com.namics.oss.aem genericmultifield - 3.2.0-SNAPHOT + 3.2.1 ``` @@ -214,8 +214,4 @@ Build locally with Maven ``` mvn clean install -PautoInstallBundle -``` - -[maven-central-version]: https://maven-badges.herokuapp.com/maven-central/com.namics.oss.aem/genericmultifield/badge.svg?version=3.2.0 - -[maven-central]: https://search.maven.org/artifact/com.namics.oss.aem/genericmultifield/3.2.0/bundle \ No newline at end of file +``` \ No newline at end of file