cleanup code

wcm-io · Nov 27, 2023 · 3f5d395 · 3f5d395
1 parent e421944
commit 3f5d395
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 8 deletions.
diff --git a/...ces/archetype-resources/bundles/core/src/main/java/config/impl/LinkHandlerConfigImpl.java b/...ces/archetype-resources/bundles/core/src/main/java/config/impl/LinkHandlerConfigImpl.java
@@ -28,7 +28,7 @@
 @Component(service = LinkHandlerConfig.class)
 public class LinkHandlerConfigImpl extends LinkHandlerConfig {
 
-  private static final List<Class<? extends LinkType>> DEFAULT_LINK_TYPES = List.of(
+  private static final List<Class<? extends LinkType>> LINK_TYPES = List.of(
       InternalLinkType.class,
       InternalCrossContextLinkType.class,
       ExternalLinkType.class,
@@ -37,7 +37,7 @@ public class LinkHandlerConfigImpl extends LinkHandlerConfig {
   @Override
   @SuppressWarnings("squid:S2384") // returned list is immutable
   public @NotNull List<Class<? extends LinkType>> getLinkTypes() {
-    return DEFAULT_LINK_TYPES;
+    return LINK_TYPES;
   }
 
   @Override

diff --git a/...ources/bundles/core/src/main/webapp/app-root/components/global/page/customfooterlibs.html b/...ources/bundles/core/src/main/webapp/app-root/components/global/page/customfooterlibs.html
@@ -1,3 +1,6 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
 <sly
     data-sly-use.clientLib="#if($optionWcmioHandler=='y')/apps/wcm-io/wcm/ui/clientlibs/sightly/templates/clientlib.html#{else}/libs/granite/sightly/templates/clientlib.html#end"
     data-sly-call="${symbol_dollar}{clientLib.js @ categories=['${projectName}.all']}"

diff --git a/...rces/bundles/core/src/main/webapp/app-root/components/global/xfpage/customfooterlibs.html b/...rces/bundles/core/src/main/webapp/app-root/components/global/xfpage/customfooterlibs.html
@@ -1,3 +1,6 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
 <sly
     data-sly-use.clientLib="#if($optionWcmioHandler=='y')/apps/wcm-io/wcm/ui/clientlibs/sightly/templates/clientlib.html#{else}/libs/granite/sightly/templates/clientlib.html#end"
     data-sly-call="${symbol_dollar}{clientLib.js @ categories=['${projectName}.all']}"

diff --git a/...s/ui.apps/jcr_root/apps/__projectName__/core/components/global/page/customfooterlibs.html b/...s/ui.apps/jcr_root/apps/__projectName__/core/components/global/page/customfooterlibs.html
@@ -1,3 +1,6 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
 <sly
     data-sly-use.clientLib="#if($optionWcmioHandler=='y')/apps/wcm-io/wcm/ui/clientlibs/sightly/templates/clientlib.html#{else}/libs/granite/sightly/templates/clientlib.html#end"
     data-sly-call="${symbol_dollar}{clientLib.js @ categories=['${projectName}.all']}"

diff --git a/...ui.apps/jcr_root/apps/__projectName__/core/components/global/xfpage/customfooterlibs.html b/...ui.apps/jcr_root/apps/__projectName__/core/components/global/xfpage/customfooterlibs.html
@@ -1,3 +1,6 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
 <sly
     data-sly-use.clientLib="#if($optionWcmioHandler=='y')/apps/wcm-io/wcm/ui/clientlibs/sightly/templates/clientlib.html#{else}/libs/granite/sightly/templates/clientlib.html#end"
     data-sly-call="${symbol_dollar}{clientLib.js @ categories=['${projectName}.all']}"

diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
@@ -19,7 +19,7 @@ The wcm.io Maven Archetype for AEM allows you to set up new Maven projects for d
 Features:
 
 * Supports AEM 6.5 (with latest service pack) and AEM as a Cloud Service (AEMaaCS)
-* Supports Java 8 and Java 11
+* Supports Java 11
 * Unit Tests based on JUnit 5 and [AEM Mocks][aem-mock]
 * Supports both Sling-Initial-Content JSON-style project layout and FileVault package layout
 * Based on [CONGA][conga] to manage AEM configuration and package deployment

diff --git a/src/test/resources/projects/alpha65-json-wcmio-caconfig-acscommons-sp/archetype.properties b/src/test/resources/projects/alpha65-json-wcmio-caconfig-acscommons-sp/archetype.properties
@@ -14,7 +14,6 @@ optionJavaVersion=11
 optionAemServicePack=y
 optionAemServicePackAPI=y
 optionSlingInitialContentBundle=y
-optionSlingInitialContentBundleContentPackage=n
 optionEditableTemplates=n
 optionMultiBundleLayout=n
 optionContextAwareConfig=y

diff --git a/...jects/beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend-sp/archetype.properties b/...jects/beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend-sp/archetype.properties
@@ -14,7 +14,6 @@ optionJavaVersion=11
 optionAemServicePack=y
 optionAemServicePackAPI=y
 optionSlingInitialContentBundle=y
-optionSlingInitialContentBundleContentPackage=n
 optionEditableTemplates=y
 optionMultiBundleLayout=y
 optionContextAwareConfig=y

diff --git a/...esources/projects/delta65-filevault-editableTpl-caconfig-frontend-sp/archetype.properties b/...esources/projects/delta65-filevault-editableTpl-caconfig-frontend-sp/archetype.properties
@@ -14,7 +14,6 @@ optionJavaVersion=11
 optionAemServicePack=y
 optionAemServicePackAPI=y
 optionSlingInitialContentBundle=n
-optionSlingInitialContentBundleContentPackage=n
 optionEditableTemplates=y
 optionMultiBundleLayout=n
 optionContextAwareConfig=y

diff --git a/src/test/resources/projects/epsilon65-filevault-editableTpl-sp/archetype.properties b/src/test/resources/projects/epsilon65-filevault-editableTpl-sp/archetype.properties
@@ -14,7 +14,6 @@ optionJavaVersion=11
 optionAemServicePack=y
 optionAemServicePackAPI=y
 optionSlingInitialContentBundle=n
-optionSlingInitialContentBundleContentPackage=n
 optionEditableTemplates=y
 optionMultiBundleLayout=n
 optionContextAwareConfig=n

diff --git a/src/test/resources/projects/gamma65-filevault-wcmio-caconfig-sp/archetype.properties b/src/test/resources/projects/gamma65-filevault-wcmio-caconfig-sp/archetype.properties
@@ -14,7 +14,6 @@ optionJavaVersion=11
 optionAemServicePack=y
 optionAemServicePackAPI=y
 optionSlingInitialContentBundle=n
-optionSlingInitialContentBundleContentPackage=n
 optionEditableTemplates=n
 optionMultiBundleLayout=n
 optionContextAwareConfig=y