diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 66dca3de..d7cbc5ea 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -26,9 +26,9 @@ jobs: - java: 11 os: windows-latest distribution: temurin - - java: 11 - os: macos-latest - distribution: temurin + #- java: 11 + # os: macos-latest + # distribution: temurin steps: - name: Checkout code diff --git a/changes.xml b/changes.xml index 8495ac66..4588717e 100644 --- a/changes.xml +++ b/changes.xml @@ -23,6 +23,18 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd"> + + + Set hideInNav=true and cq:robotsTags=noindex,nofollow by default for structure element and config editor pages. + + + Update to AEM 6.5 SP21. + + + Update dependencies. + + + Switch frontend to ES6 modules. diff --git a/pom.xml b/pom.xml index 377aa779..27b7e2fe 100644 --- a/pom.xml +++ b/pom.xml @@ -25,13 +25,13 @@ io.wcm.maven io.wcm.maven.parent - 2.1.6 + 2.1.8 io.wcm.maven.archetypes io.wcm.maven.archetypes.aem - 3.8.10 + 3.8.12 maven-archetype wcm.io Maven Archetype for AEM @@ -127,7 +127,9 @@ ${maven.archetype.version} + diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000..25c7e55b --- /dev/null +++ b/renovate.json @@ -0,0 +1,27 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:recommended", + ":semanticCommitsDisabled" + ], + "enabledManagers": [ + "npm", + "nvm", + "maven", + "custom.regex" + ], + "npm": { + "minimumReleaseAge": "3 days" + }, + "customManagers": [ + { + "customType": "regex", + "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}maven{{/if}}", + "fileMatch": ["(^|/)pom\\.xml$"], + "matchStrings": [ + "##\\s??renovate:( datasource=(?[a-z-.]+?))? depName=(?[^\\s]+?)(?: packageName=(?[^\\s]+?))?(?: versioning=(?[^\\s]+?))?(?: extractVersion=(?[^\\s]+?))?\\s+<(.+\\.)?version>(?.+)<\\/(.+\\.)?version>" + ], + "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}maven{{/if}}" + } + ] +} diff --git a/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/templates/admin/configEditor.json b/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/templates/admin/configEditor.json index 16bbe12d..2a2fb66d 100644 --- a/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/templates/admin/configEditor.json +++ b/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/templates/admin/configEditor.json @@ -8,6 +8,8 @@ "jcr:content": { "jcr:primaryType": "cq:PageContent", - "sling:resourceType": "${projectName}/core/components/admin/page/configEditor" + "sling:resourceType": "${projectName}/core/components/admin/page/configEditor", + "hideInNav": true, + "cq:robotsTags": ["noindex","nofollow"] } } diff --git a/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/templates/admin/structureElement.json b/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/templates/admin/structureElement.json index f4d38aef..85d208a8 100644 --- a/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/templates/admin/structureElement.json +++ b/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/templates/admin/structureElement.json @@ -8,6 +8,8 @@ "jcr:content": { "jcr:primaryType": "cq:PageContent", - "sling:resourceType": "${projectName}/core/components/admin/page/structureElement" + "sling:resourceType": "${projectName}/core/components/admin/page/structureElement", + "hideInNav": true, + "cq:robotsTags": ["noindex","nofollow"] } } diff --git a/src/main/resources/archetype-resources/bundles/core/src/test/java/components/CustomCarouselTest.java b/src/main/resources/archetype-resources/bundles/core/src/test/java/components/CustomCarouselTest.java index 7266f5bc..34da49e1 100644 --- a/src/main/resources/archetype-resources/bundles/core/src/test/java/components/CustomCarouselTest.java +++ b/src/main/resources/archetype-resources/bundles/core/src/test/java/components/CustomCarouselTest.java @@ -77,8 +77,8 @@ void testSlideImageUrls() { #end #if ($optionWcmioHandler == 'n') assertEquals(List.of( - "/content/mypage/_jcr_content/myresource/slides/item1.img.png", - "/content/mypage/_jcr_content/myresource/slides/item2.img.png"), + "/content/mypage/_jcr_content/myresource/slides/item1.coreimg.png", + "/content/mypage/_jcr_content/myresource/slides/item2.coreimg.png"), underTest.getSlideImages().stream() .map(Image::getSrc) .collect(Collectors.toList())); diff --git a/src/main/resources/archetype-resources/config-definition/src/main/roles/__projectName__-aem-cms.yaml b/src/main/resources/archetype-resources/config-definition/src/main/roles/__projectName__-aem-cms.yaml index 4cddb476..ac9d8aa1 100644 --- a/src/main/resources/archetype-resources/config-definition/src/main/roles/__projectName__-aem-cms.yaml +++ b/src/main/resources/archetype-resources/config-definition/src/main/roles/__projectName__-aem-cms.yaml @@ -14,7 +14,7 @@ files: #if ( $optionAemVersion == '6.5' && $optionAemServicePack == 'y' ) # AEM Service Pack -- url: mvn:adobe.binary.aem.65.servicepack/aem-service-pkg/6.5.20.0/zip +- url: mvn:adobe.binary.aem.65.servicepack/aem-service-pkg/6.5.21.0/zip dir: packages modelOptions: delayAfterInstallSec: 30 @@ -107,7 +107,7 @@ files: #end #end -# Application #if($optionAemVersion=='cloud')bundles and#{end}packages +# Application #if($optionAemVersion=='cloud')bundles and #{end}packages #if ( $optionAemVersion == "cloud" ) - url: mvn:${groupId}/${rootArtifactId}.core dir: bundles diff --git a/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/.content.xml b/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/.content.xml index 8ea9f2ae..fb94eac6 100644 --- a/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/.content.xml @@ -1,5 +1,5 @@ - - diff --git a/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/.content.xml b/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/.content.xml index f976bb27..18847882 100644 --- a/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/.content.xml @@ -1,5 +1,5 @@ - - - diff --git a/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/.content.xml b/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/.content.xml index d06121a4..f3fa631a 100644 --- a/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/.content.xml @@ -1,5 +1,5 @@ - diff --git a/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/policies/.content.xml b/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/policies/.content.xml index 604fade8..e833edbf 100644 --- a/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/policies/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/policies/.content.xml @@ -1,5 +1,5 @@ - diff --git a/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/policies/_rep_policy.xml b/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/policies/_rep_policy.xml index 1b61126c..3d57d09b 100644 --- a/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/policies/_rep_policy.xml +++ b/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/policies/_rep_policy.xml @@ -1,5 +1,5 @@ - - diff --git a/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/template-types/content/.content.xml b/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/template-types/content/.content.xml index 39ec05a0..6227c635 100644 --- a/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/template-types/content/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/template-types/content/.content.xml @@ -1,5 +1,5 @@ - - - - - - - - - diff --git a/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/templates/_rep_policy.xml b/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/templates/_rep_policy.xml index 1b61126c..3d57d09b 100644 --- a/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/templates/_rep_policy.xml +++ b/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/templates/_rep_policy.xml @@ -1,5 +1,5 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/conf/__projectName__/.content.xml b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/conf/__projectName__/.content.xml index f976bb27..18847882 100644 --- a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/conf/__projectName__/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/conf/__projectName__/.content.xml @@ -1,5 +1,5 @@ - - diff --git a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/conf/__projectName__/en/_sling_configs/.content.xml b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/conf/__projectName__/en/_sling_configs/.content.xml index 5ac088fb..9908fc60 100644 --- a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/conf/__projectName__/en/_sling_configs/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/conf/__projectName__/en/_sling_configs/.content.xml @@ -1,4 +1,4 @@ - diff --git a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/conf/__projectName__/en/_sling_configs/com.adobe.cq.wcm.core.components.internal.DataLayerConfig/.content.xml b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/conf/__projectName__/en/_sling_configs/com.adobe.cq.wcm.core.components.internal.DataLayerConfig/.content.xml index 1f5f66bc..efe417ba 100644 --- a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/conf/__projectName__/en/_sling_configs/com.adobe.cq.wcm.core.components.internal.DataLayerConfig/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/conf/__projectName__/en/_sling_configs/com.adobe.cq.wcm.core.components.internal.DataLayerConfig/.content.xml @@ -1,5 +1,5 @@ - - diff --git a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/conf/__projectName__/settings/cloudconfigs/.content.xml b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/conf/__projectName__/settings/cloudconfigs/.content.xml index 491392d5..a0ac99e3 100644 --- a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/conf/__projectName__/settings/cloudconfigs/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/conf/__projectName__/settings/cloudconfigs/.content.xml @@ -1,3 +1,3 @@ - diff --git a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/.content.xml b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/.content.xml index cb8fd61e..2e0d65c8 100644 --- a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/.content.xml @@ -1,12 +1,14 @@ - + + diff --git a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/__projectName__/.content.xml b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/__projectName__/.content.xml index 1980bb19..8377cbb3 100644 --- a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/__projectName__/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/__projectName__/.content.xml @@ -1,5 +1,5 @@ - diff --git a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/__projectName__/en/.content.xml b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/__projectName__/en/.content.xml index f69fc2e2..4a8cdbda 100644 --- a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/__projectName__/en/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/__projectName__/en/.content.xml @@ -1,5 +1,5 @@ - - - diff --git a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/.content.xml b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/.content.xml index 54084a82..1581aa34 100644 --- a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/.content.xml @@ -1,4 +1,4 @@ - diff --git a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/.content.xml b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/.content.xml index 43adca34..ed972caf 100644 --- a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/.content.xml @@ -1,4 +1,7 @@ - + + + diff --git a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/chicago.jpg/.content.xml b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/chicago.jpg/.content.xml index 000d87d2..b23ab944 100644 --- a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/chicago.jpg/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/chicago.jpg/.content.xml @@ -1,7 +1,9 @@ - - + + xmpMM:OriginalDocumentID="9C4C672A11C813BF532ADA4201EE2112" + xmp:ModifyDate="{Date}2022-08-25T17:27:08.000+02:00"/> - diff --git a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/chicago.jpg/_jcr_content/renditions/original.dir/.content.xml b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/chicago.jpg/_jcr_content/renditions/original.dir/.content.xml index f43e05eb..4d962e6e 100644 --- a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/chicago.jpg/_jcr_content/renditions/original.dir/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/chicago.jpg/_jcr_content/renditions/original.dir/.content.xml @@ -1,5 +1,5 @@ - - - + + xmpMM:OriginalDocumentID="7123030BBD73CA0C3200CFC9673FA8FF" + xmp:ModifyDate="{Date}2022-08-25T17:26:56.000+02:00"/> - diff --git a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/nature.jpg/_jcr_content/renditions/original.dir/.content.xml b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/nature.jpg/_jcr_content/renditions/original.dir/.content.xml index f43e05eb..4d962e6e 100644 --- a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/nature.jpg/_jcr_content/renditions/original.dir/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/nature.jpg/_jcr_content/renditions/original.dir/.content.xml @@ -1,5 +1,5 @@ - - - + + xmpMM:OriginalDocumentID="18F0CD1490F1800A553E9276693A6E83" + xmp:ModifyDate="{Date}2022-08-25T17:26:43.000+02:00"/> - diff --git a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/prague.jpg/_jcr_content/renditions/original.dir/.content.xml b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/prague.jpg/_jcr_content/renditions/original.dir/.content.xml index f43e05eb..4d962e6e 100644 --- a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/prague.jpg/_jcr_content/renditions/original.dir/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/content/dam/__projectName__/prague.jpg/_jcr_content/renditions/original.dir/.content.xml @@ -1,5 +1,5 @@ - - - diff --git a/src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/templates/admin/configEditor/.content.xml b/src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/templates/admin/configEditor/.content.xml index 01323feb..91e59195 100644 --- a/src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/templates/admin/configEditor/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/templates/admin/configEditor/.content.xml @@ -7,5 +7,7 @@ ranking="{Long}120"> + sling:resourceType="${projectName}/core/components/admin/page/configEditor" + hideInNav="{Boolean}true" + cq:robotsTags="[noindex,nofollow]"/> diff --git a/src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/templates/admin/structureElement/.content.xml b/src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/templates/admin/structureElement/.content.xml index 854f3890..2c0ead0b 100644 --- a/src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/templates/admin/structureElement/.content.xml +++ b/src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/templates/admin/structureElement/.content.xml @@ -7,5 +7,7 @@ ranking="{Long}100"> + sling:resourceType="${projectName}/core/components/admin/page/structureElement" + hideInNav="{Boolean}true" + cq:robotsTags="[noindex,nofollow]"/> diff --git a/src/main/resources/archetype-resources/frontend/.nvmrc b/src/main/resources/archetype-resources/frontend/.nvmrc index 2efc7e11..805efa9f 100644 --- a/src/main/resources/archetype-resources/frontend/.nvmrc +++ b/src/main/resources/archetype-resources/frontend/.nvmrc @@ -1 +1 @@ -v20.11.1 \ No newline at end of file +20.14.0 \ No newline at end of file diff --git a/src/main/resources/archetype-resources/frontend/package.json b/src/main/resources/archetype-resources/frontend/package.json index da183cd3..6f7b50d2 100644 --- a/src/main/resources/archetype-resources/frontend/package.json +++ b/src/main/resources/archetype-resources/frontend/package.json @@ -18,23 +18,23 @@ }, "devDependencies": { "aem-clientlib-generator": "1.8.0", - "@babel/core": "7.24.1", + "@babel/core": "7.24.6", "babel-loader": "9.1.3", "babel-plugin-transform-class-properties": "6.24.1", "babel-plugin-transform-es2015-arrow-functions": "6.22.0", - "@babel/preset-env": "7.24.1", - "@babel/register": "7.23.7", + "@babel/preset-env": "7.24.6", + "@babel/register": "7.24.6", "clean-webpack-plugin": "4.0.0", "copy-webpack-plugin": "12.0.2", - "css-loader": "6.10.0", + "css-loader": "7.1.2", "handlebars": "4.7.8", "handlebars-loader": "1.7.3", "html-webpack-plugin": "5.6.0", - "mini-css-extract-plugin": "2.8.1", + "mini-css-extract-plugin": "2.9.0", "node-sass": "9.0.0", "postcss-loader": "8.1.1", - "sass-loader": "14.1.1", - "webpack": "5.90.3", + "sass-loader": "14.2.1", + "webpack": "5.91.0", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", "webpack-merge": "5.10.0" diff --git a/src/main/resources/archetype-resources/frontend/pom.xml b/src/main/resources/archetype-resources/frontend/pom.xml index 555bd531..b661e22a 100644 --- a/src/main/resources/archetype-resources/frontend/pom.xml +++ b/src/main/resources/archetype-resources/frontend/pom.xml @@ -1,7 +1,6 @@ 4.0.0 -#set( $nodeJsVersion = "20.11.1" ) ${groupId} @@ -17,6 +16,11 @@ ${projectName} Frontend + +## renovate: datasource=node-version depName=node + v20.14.0 + + @@ -45,7 +49,7 @@ - ${nodeJsVersion} + ${nodejs.version} ${project.basedir} @@ -74,7 +78,7 @@ process-resources - v${nodeJsVersion} + ${nodejs.version} diff --git a/src/main/resources/archetype-resources/parent/pom.xml b/src/main/resources/archetype-resources/parent/pom.xml index db0845ba..6354e3ef 100644 --- a/src/main/resources/archetype-resources/parent/pom.xml +++ b/src/main/resources/archetype-resources/parent/pom.xml @@ -5,7 +5,8 @@ io.wcm.maven io.wcm.maven.aem-global-parent - 2.1.16 +## renovate: depName=io.wcm.maven:io.wcm.maven.aem-global-parent + 2.1.18 @@ -27,16 +28,18 @@ enabled -#if ( $optionAemVersion != "cloud" or $optionAcsCommons == "y" ) -#end #if ( $optionAemVersion != "cloud" ) - 2.23.4 +## renovate: depName=com.adobe.cq:core.wcm.components.core + 2.25.4 #end #if( $optionAcsCommons == "y" ) - 6.4.0 +## renovate: depName=com.adobe.acs:acs-aem-commons-bundle + 6.6.0 #end +## renovate: depName=org.mockito:mockito-core + 5.12.0 2021-01-01T00:00:00Z @@ -92,11 +95,13 @@ org.apache.sling org.apache.sling.models.api +## renovate: depName=org.apache.sling:org.apache.sling.models.api 1.5.0 org.apache.sling org.apache.sling.models.impl +## renovate: depName=org.apache.sling:org.apache.sling.models.impl 1.6.4 @@ -106,21 +111,25 @@ org.apache.sling org.apache.sling.caconfig.api +## renovate: depName=org.apache.sling:org.apache.sling.caconfig.api 1.3.0 org.apache.sling org.apache.sling.caconfig.spi +## renovate: depName=org.apache.sling:org.apache.sling.caconfig.spi 1.4.0 org.apache.sling org.apache.sling.caconfig.impl +## renovate: depName=org.apache.sling:org.apache.sling.caconfig.impl 1.6.0 org.apache.sling org.apache.sling.models.caconfig +## renovate: depName=org.apache.sling:org.apache.sling.models.caconfig 1.0.2 @@ -132,6 +141,7 @@ io.wcm io.wcm.caconfig.extensions #if ( $optionContextAwareConfigLatest == "y" || $optionAemVersion == "cloud" ) +## renovate: depName=io.wcm:io.wcm.caconfig.extensions 1.9.4 #else @@ -141,11 +151,13 @@ io.wcm io.wcm.caconfig.editor - 1.15.8 +## renovate: depName=io.wcm:io.wcm.caconfig.editor + 1.16.0 io.wcm io.wcm.sling.commons +## renovate: depName=io.wcm:io.wcm.sling.commons 1.6.4 #end @@ -153,62 +165,74 @@ io.wcm io.wcm.sling.models +## renovate: depName=io.wcm:io.wcm.sling.models 1.6.0 io.wcm io.wcm.wcm.commons +## renovate: depName=io.wcm:io.wcm.wcm.commons 1.10.0 io.wcm io.wcm.wcm.parsys +## renovate: depName=io.wcm:io.wcm.wcm.parsys 1.7.4 io.wcm io.wcm.wcm.ui.granite +## renovate: depName=io.wcm:io.wcm.wcm.ui.granite 1.10.4 io.wcm io.wcm.wcm.ui.clientlibs +## renovate: depName=io.wcm:io.wcm.wcm.ui.clientlibs 1.3.0 io.wcm io.wcm.handler.commons +## renovate: depName=io.wcm:io.wcm.handler.commons 2.0.0 io.wcm io.wcm.handler.url +## renovate: depName=io.wcm:io.wcm.handler.url 2.1.0 io.wcm io.wcm.handler.media - 2.0.2 +## renovate: depName=io.wcm:io.wcm.handler.media + 2.0.8 io.wcm io.wcm.handler.link - 2.1.0 +## renovate: depName=io.wcm:io.wcm.handler.link + 2.2.0 io.wcm io.wcm.handler.richtext +## renovate: depName=io.wcm:io.wcm.handler.richtext 2.0.0 io.wcm io.wcm.wcm.core.components - 2.0.2-2.23.2 +## renovate: depName=io.wcm:io.wcm.wcm.core.components + 2.0.4-2.25.4 #end io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem +## renovate: depName=io.wcm.devops.conga.definitions:io.wcm.devops.conga.definitions.aem 2.0.4 @@ -216,18 +240,21 @@ io.wcm io.wcm.testing.aem-mock.junit5 - 5.5.0 +## renovate: depName=io.wcm:io.wcm.testing.aem-mock.junit5 + 5.5.2 #if ( $optionAemVersion == "6.5" && ($optionAemServicePack=="y" || $optionAemServicePackAPI=="y") ) io.wcm io.wcm.testing.logging.logback +## renovate: depName=io.wcm:io.wcm.testing.logging.logback 1.0.0 #else org.apache.sling org.apache.sling.testing.logging-mock +## renovate: depName=org.apache.sling:org.apache.sling.testing.logging-mock 2.0.0 #end @@ -242,11 +269,13 @@ org.apache.sling org.apache.sling.testing.caconfig-mock-plugin +## renovate: depName=org.apache.sling:org.apache.sling.testing.caconfig-mock-plugin 1.5.4 io.wcm io.wcm.testing.wcm-io-mock.caconfig +## renovate: depName=io.wcm:io.wcm.testing.wcm-io-mock.caconfig 1.2.0 #end @@ -254,16 +283,19 @@ io.wcm io.wcm.testing.wcm-io-mock.sling +## renovate: depName=io.wcm:io.wcm.testing.wcm-io-mock.sling 1.2.0 io.wcm io.wcm.testing.wcm-io-mock.wcm +## renovate: depName=io.wcm:io.wcm.testing.wcm-io-mock.wcm 1.2.0 io.wcm io.wcm.testing.wcm-io-mock.handler +## renovate: depName=io.wcm:io.wcm.testing.wcm-io-mock.handler 2.0.0 #end @@ -273,7 +305,7 @@ io.wcm.maven io.wcm.maven.aem-dependencies - #if($optionAemServicePack=="y" || $optionAemServicePackAPI=="y")6.5.20.0000#{else}6.5.0.0005#end + #if($optionAemServicePack=="y" || $optionAemServicePackAPI=="y")6.5.21.0000#{else}6.5.0.0005#end pom import @@ -321,20 +353,20 @@ org.junit junit-bom +## renovate: depName=org.junit:junit-bom 5.10.2 pom import -#set( $mockitoVersion = "5.11.0" ) org.mockito mockito-core - ${mockitoVersion} + ${mockito.version} org.mockito mockito-junit-jupiter - ${mockitoVersion} + ${mockito.version} #if ( $optionIntegrationTests == "y" ) @@ -342,19 +374,22 @@ junit junit +## renovate: depName=junit:junit 4.13.2 #if ( $optionAemVersion == "6.5" ) com.adobe.cq cq-testing-clients-65 +## renovate: depName=com.adobe.cq:cq-testing-clients-65 1.1.1 #else com.adobe.cq aem-cloud-testing-clients - 1.2.3 +## renovate: depName=com.adobe.cq:aem-cloud-testing-clients + 1.2.5 #end