You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2020/12/15 05:20:42 UTC

[sling-org-apache-sling-karaf-features] branch master updated: Updating to fix issue with styles not loading for the sling cms karaf feature

This is an automated email from the ASF dual-hosted git repository.

dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git


The following commit(s) were added to refs/heads/master by this push:
     new a126d80  Updating to fix issue with styles not loading for the sling cms karaf feature
a126d80 is described below

commit a126d800e27eb90ec410e914c40ac7f8312735c8
Author: Dan Klco <dk...@apache.org>
AuthorDate: Tue Dec 15 00:20:01 2020 -0500

    Updating to fix issue with styles not loading for the sling cms karaf feature
---
 src/main/feature/feature.xml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 675cb88..355192e 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -21,7 +21,7 @@
   <!-- Apache Sling -->
   <feature name="sling" version="${project.version}">
     <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver.config</config>
-    <bundle>mvn:org.apache.sling/org.apache.sling.api/2.22.0</bundle>
+    <bundle>mvn:org.apache.sling/org.apache.sling.api/2.23.0</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.5.0</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.engine/2.7.2</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.7.0</bundle>
@@ -699,20 +699,22 @@
     <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_cms">classpath:cms/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_cms.config</config>
     <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_cms">classpath:cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_cms.config</config>
     <config external="true" name="org.apache.sling.cms.core.internal.rewriter.ReferenceMappingTransformerFactory">classpath:cms/org.apache.sling.cms.core.internal.rewriter.ReferenceMappingTransformerFactory.config</config>
-    <bundle>mvn:org.apache.sling/org.apache.sling.cms.api/1.0.0</bundle>
-    <bundle>mvn:org.apache.sling/org.apache.sling.cms.core/1.0.0</bundle>
-    <bundle>mvn:org.apache.sling/org.apache.sling.cms.transformer/1.0.0</bundle>
-    <bundle>mvn:org.apache.sling/org.apache.sling.cms.ui/1.0.0</bundle>
-    < ! - - dependencies - - >
+    <bundle>mvn:org.apache.sling/org.apache.sling.cms.api/0.16.3-SNAPSHOT</bundle>
+    <bundle>mvn:org.apache.sling/org.apache.sling.cms.core/0.16.3-SNAPSHOT</bundle>
+    <bundle>mvn:org.apache.sling/org.apache.sling.cms.transformer/0.16.3-SNAPSHOT</bundle>
+    <bundle>mvn:org.apache.sling/org.apache.sling.cms.ui/0.16.3-SNAPSHOT</bundle>
     <feature>webconsole</feature>
+
     <feature version="${project.version}">sling</feature>
     <feature version="${project.version}">sling-caconfig</feature>
+    <feature version="${project.version}">sling-cms-login</feature>
     <feature version="${project.version}">sling-commons-messaging-mail</feature>
     <feature version="${project.version}">sling-distribution</feature>
     <feature version="${project.version}">sling-event</feature>
     <feature version="${project.version}">sling-i18n</feature>
     <feature version="${project.version}">sling-jcr</feature>
     <feature version="${project.version}">sling-models</feature>
+    <feature version="${project.version}">sling-resourcemerger</feature>
     <feature version="${project.version}">sling-rewriter</feature>
     <feature version="${project.version}">sling-scripting-jsp</feature>
     <feature version="${project.version}">sling-servlets</feature>
@@ -724,18 +726,15 @@
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.poi/4.1.2_2</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/3.1.0_2</bundle>
     <bundle dependency="true">mvn:org.jsoup/jsoup/1.13.1</bundle>
-    < ! - - ... - - >
     <bundle>mvn:org.apache.sling/org.apache.sling.fileoptim/0.9.4</bundle>
   </feature>
   <feature name="sling-cms-login" version="${project.version}">
-    <bundle>mvn:org.apache.sling/org.apache.sling.cms.login/1.0.0</bundle>
-    < ! - - dependencies - - >
+    <bundle>mvn:org.apache.sling/org.apache.sling.cms.login/0.16.3-SNAPSHOT</bundle>
     <feature version="${project.version}">sling-cms</feature>
     <feature version="${project.version}">sling-auth-form</feature>
   </feature>
   <feature name="sling-cms-reference" version="${project.version}">
-    <bundle>mvn:org.apache.sling/org.apache.sling.cms.reference/1.0.0</bundle>
-    < ! - - dependencies - - >
+    <bundle>mvn:org.apache.sling/org.apache.sling.cms.reference/0.16.3-SNAPSHOT</bundle>
     <feature version="${project.version}">sling-cms</feature>
   </feature>
   -->