From dbe27716dd6ad6c1c8a0e52341bd747dee483547 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 22 Nov 2019 08:31:27 +0100 Subject: [PATCH 1/9] updating poms for 3.0.1-SNAPSHOT development --- api/pom.xml | 2 +- bundle/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- pom.xml | 2 +- ui.apps/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 49696fc0..b7ba85b7 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT aecu.api diff --git a/bundle/pom.xml b/bundle/pom.xml index 5480e56a..f591347a 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT aecu.bundle diff --git a/core/pom.xml b/core/pom.xml index d0f96453..739eb54a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT aecu.core diff --git a/examples/pom.xml b/examples/pom.xml index c38b2113..9a9139dd 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT aecu.examples diff --git a/pom.xml b/pom.xml index 4c82f0cd..f0633b5b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index 67638eeb..a452298c 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT aecu.ui.apps From 76e3877470fd49c2a5f6761ddca83018bd995df4 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 22 Nov 2019 08:34:38 +0100 Subject: [PATCH 2/9] updating develop poms to master versions to avoid merge conflicts --- api/pom.xml | 2 +- bundle/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- pom.xml | 2 +- ui.apps/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index b7ba85b7..1acb0122 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 3.0.1-SNAPSHOT + 3.0.0 aecu.api diff --git a/bundle/pom.xml b/bundle/pom.xml index f591347a..04bde42b 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 3.0.1-SNAPSHOT + 3.0.0 aecu.bundle diff --git a/core/pom.xml b/core/pom.xml index 739eb54a..ef5bf482 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 3.0.1-SNAPSHOT + 3.0.0 aecu.core diff --git a/examples/pom.xml b/examples/pom.xml index 9a9139dd..d77a6096 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 3.0.1-SNAPSHOT + 3.0.0 aecu.examples diff --git a/pom.xml b/pom.xml index f0633b5b..2b555d14 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 3.0.1-SNAPSHOT + 3.0.0 AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index a452298c..b7c5821c 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 3.0.1-SNAPSHOT + 3.0.0 aecu.ui.apps From 237920cfc256956ae01c0dc4a7bed6879448dad7 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 22 Nov 2019 08:34:39 +0100 Subject: [PATCH 3/9] Updating develop poms back to pre merge state --- api/pom.xml | 2 +- bundle/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- pom.xml | 2 +- ui.apps/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 1acb0122..b7ba85b7 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 3.0.0 + 3.0.1-SNAPSHOT aecu.api diff --git a/bundle/pom.xml b/bundle/pom.xml index 04bde42b..f591347a 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 3.0.0 + 3.0.1-SNAPSHOT aecu.bundle diff --git a/core/pom.xml b/core/pom.xml index ef5bf482..739eb54a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 3.0.0 + 3.0.1-SNAPSHOT aecu.core diff --git a/examples/pom.xml b/examples/pom.xml index d77a6096..9a9139dd 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 3.0.0 + 3.0.1-SNAPSHOT aecu.examples diff --git a/pom.xml b/pom.xml index 2b555d14..f0633b5b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 3.0.0 + 3.0.1-SNAPSHOT AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index b7c5821c..a452298c 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 3.0.0 + 3.0.1-SNAPSHOT aecu.ui.apps From 5accb9972c8edcfe857faf16e0ef9c4f2a22bac9 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 22 Nov 2019 08:36:43 +0100 Subject: [PATCH 4/9] 3.0.0 --- HISTORY | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HISTORY b/HISTORY index 8c8bcd47..10b4ae11 100644 --- a/HISTORY +++ b/HISTORY @@ -1,4 +1,4 @@ -??? 2.1.0 +2019-11-22 3.0.0 - Update to Groovy Console 14.0.0 - Groovy Console binding: - ACL testing allows to check rights of your groups From 07aede402a946d4b9ee60b016e6ef33e7a507ce1 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 22 Nov 2019 08:45:16 +0100 Subject: [PATCH 5/9] 3.0.0 --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 83bd7314..109ff878 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=2.0.2-SNAPSHOT +sonar.projectVersion=3.0.1-SNAPSHOT # Encoding of the source code. Default is default system encoding sonar.sourceEncoding=UTF-8 From b599d78a3d7670a3c9a2d6d3159f1e821b8b7281 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Wed, 11 Dec 2019 10:32:46 +0100 Subject: [PATCH 6/9] fixed installation issues on vanilla instances --- ui.apps/src/main/content/META-INF/vault/filter.xml | 12 +++++++++--- .../jcr_root/conf/global/settings/.content.xml | 6 ++++++ .../conf/global/settings/granite/.content.xml | 4 ++++ .../global/settings/granite/operations/.content.xml | 4 ++++ 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100755 ui.apps/src/main/content/jcr_root/conf/global/settings/.content.xml create mode 100755 ui.apps/src/main/content/jcr_root/conf/global/settings/granite/.content.xml create mode 100755 ui.apps/src/main/content/jcr_root/conf/global/settings/granite/operations/.content.xml diff --git a/ui.apps/src/main/content/META-INF/vault/filter.xml b/ui.apps/src/main/content/META-INF/vault/filter.xml index 22e959d1..ace3d927 100644 --- a/ui.apps/src/main/content/META-INF/vault/filter.xml +++ b/ui.apps/src/main/content/META-INF/vault/filter.xml @@ -6,16 +6,22 @@ - + + + + - - + + + + + diff --git a/ui.apps/src/main/content/jcr_root/conf/global/settings/.content.xml b/ui.apps/src/main/content/jcr_root/conf/global/settings/.content.xml new file mode 100755 index 00000000..457768dc --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/conf/global/settings/.content.xml @@ -0,0 +1,6 @@ + + + diff --git a/ui.apps/src/main/content/jcr_root/conf/global/settings/granite/.content.xml b/ui.apps/src/main/content/jcr_root/conf/global/settings/granite/.content.xml new file mode 100755 index 00000000..d575b897 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/conf/global/settings/granite/.content.xml @@ -0,0 +1,4 @@ + + + diff --git a/ui.apps/src/main/content/jcr_root/conf/global/settings/granite/operations/.content.xml b/ui.apps/src/main/content/jcr_root/conf/global/settings/granite/operations/.content.xml new file mode 100755 index 00000000..d575b897 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/conf/global/settings/granite/operations/.content.xml @@ -0,0 +1,4 @@ + + + From 31e8d124c6a7bce5ef8a4c0d9414b8f751caafd9 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Wed, 11 Dec 2019 10:34:35 +0100 Subject: [PATCH 7/9] 3.0.1 --- HISTORY | 3 +++ 1 file changed, 3 insertions(+) diff --git a/HISTORY b/HISTORY index 10b4ae11..ae4890d7 100644 --- a/HISTORY +++ b/HISTORY @@ -1,3 +1,6 @@ +2019-12-11 3.0.1 + - Fixed installation issues on new instances + 2019-11-22 3.0.0 - Update to Groovy Console 14.0.0 - Groovy Console binding: From 4433c54ffdaf2dbc2f6bf1cdb4e7f45a6dc15cb4 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Wed, 11 Dec 2019 10:35:30 +0100 Subject: [PATCH 8/9] updating poms for 3.0.1 branch with snapshot versions --- api/pom.xml | 2 +- bundle/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- pom.xml | 2 +- ui.apps/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index b7ba85b7..17638916 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 3.0.1-SNAPSHOT + 3.0.1-rc-SNAPSHOT aecu.api diff --git a/bundle/pom.xml b/bundle/pom.xml index f591347a..31a3f097 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 3.0.1-SNAPSHOT + 3.0.1-rc-SNAPSHOT aecu.bundle diff --git a/core/pom.xml b/core/pom.xml index 739eb54a..545042bd 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 3.0.1-SNAPSHOT + 3.0.1-rc-SNAPSHOT aecu.core diff --git a/examples/pom.xml b/examples/pom.xml index 9a9139dd..6966cfdf 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 3.0.1-SNAPSHOT + 3.0.1-rc-SNAPSHOT aecu.examples diff --git a/pom.xml b/pom.xml index f0633b5b..0c83bce1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 3.0.1-SNAPSHOT + 3.0.1-rc-SNAPSHOT AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index a452298c..cc716ff8 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 3.0.1-SNAPSHOT + 3.0.1-rc-SNAPSHOT aecu.ui.apps From b811493cd2640d5dc16ee207388dddb3ae47cc77 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Wed, 11 Dec 2019 10:35:58 +0100 Subject: [PATCH 9/9] updating poms for branch'release/3.0.1' with non-snapshot versions --- api/pom.xml | 2 +- bundle/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- pom.xml | 2 +- ui.apps/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 17638916..c7c81728 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 3.0.1-rc-SNAPSHOT + 3.0.1 aecu.api diff --git a/bundle/pom.xml b/bundle/pom.xml index 31a3f097..b1f300b7 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 3.0.1-rc-SNAPSHOT + 3.0.1 aecu.bundle diff --git a/core/pom.xml b/core/pom.xml index 545042bd..f2ee4761 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 3.0.1-rc-SNAPSHOT + 3.0.1 aecu.core diff --git a/examples/pom.xml b/examples/pom.xml index 6966cfdf..d700e30a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 3.0.1-rc-SNAPSHOT + 3.0.1 aecu.examples diff --git a/pom.xml b/pom.xml index 0c83bce1..34f3f962 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 3.0.1-rc-SNAPSHOT + 3.0.1 AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index cc716ff8..014e60d2 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 3.0.1-rc-SNAPSHOT + 3.0.1 aecu.ui.apps