@releng [maven-scm] :prepare release core-cif-components-reactor-0.10.1

adobe · May 4, 2020 · b217796 · b217796
1 parent d248b34
commit b217796
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 33 deletions.
diff --git a/all/pom.xml b/all/pom.xml
@@ -21,15 +21,15 @@
     <parent>
         <groupId>com.adobe.commerce.cif</groupId>
         <artifactId>core-cif-components-parent</artifactId>
-        <version>0.10.1-SNAPSHOT</version>
+        <version>0.10.1</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <artifactId>core-cif-components-all</artifactId>
-    <version>0.10.1-SNAPSHOT</version>
+    <version>0.10.1</version>
     <packaging>content-package</packaging>
 
     <name>AEM CIF Core Components - All</name>
@@ -40,7 +40,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-cif-components</connection>
         <developerConnection>scm:git:[email protected]:adobe/aem-core-cif-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-cif-components</url>
-        <tag>HEAD</tag>
+        <tag>core-cif-components-reactor-0.10.1</tag>
     </scm>
     <organization>
         <name>Adobe</name>

diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
@@ -20,15 +20,15 @@
     <parent>
         <groupId>com.adobe.commerce.cif</groupId>
         <artifactId>core-cif-components-parent</artifactId>
-        <version>0.10.1-SNAPSHOT</version>
+        <version>0.10.1</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <artifactId>core-cif-components-core</artifactId>
-    <version>0.10.1-SNAPSHOT</version>
+    <version>0.10.1</version>
     <packaging>bundle</packaging>
 
     <name>AEM CIF Core Components - Core Bundle</name>
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-cif-components</connection>
         <developerConnection>scm:git:[email protected]:adobe/aem-core-cif-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-cif-components</url>
-        <tag>HEAD</tag>
+        <tag>core-cif-components-reactor-0.10.1</tag>
     </scm>
     <organization>
         <name>Adobe</name>

diff --git a/dispatcher/Dockerfile b/dispatcher/Dockerfile
@@ -31,10 +31,24 @@ RUN ln -s "/tmp/dispatcher/dispatcher-apache2.4-${DISPATCHER_VERSION}.so" "${HTT
     SetHandler dispatcher-handler \n\
 </IfModule>' "${HTTPD_PREFIX}/conf/httpd.conf" > /dev/null
 
+# Enable mod_include
+RUN sed -i 's/#LoadModule include_module modules\/mod_include.so/LoadModule include_module modules\/mod_include.so/g' "${HTTPD_PREFIX}/conf/httpd.conf" > /dev/null && \
+    sed -i 's/#AddOutputFilter INCLUDES .shtml/AddOutputFilter INCLUDES .html/g' "${HTTPD_PREFIX}/conf/httpd.conf" > /dev/null && \
+    sed -i 's/Options Indexes FollowSymLinks/Options Indexes FollowSymLinks Includes/g' "${HTTPD_PREFIX}/conf/httpd.conf" > /dev/null
+
+# Enable mod_rewrite
+RUN sed -i 's/#LoadModule rewrite_module modules\/mod_rewrite.so/LoadModule rewrite_module modules\/mod_rewrite.so/g' "${HTTPD_PREFIX}/conf/httpd.conf" > /dev/null && \
+    sed -i '/<Directory "\/usr\/local\/apache2\/htdocs">/a <IfModule mod_rewrite.c> \n\
+    RewriteEngine On \n\
+    RewriteRule ^(.*)/navigation\..*\.header\.html$ $1/navigation.header.html [L,NC] \n\
+    </IfModule>' "${HTTPD_PREFIX}/conf/httpd.conf" > /dev/null
+
 # Add httpd-dispatcher.conf
 RUN cp /tmp/dispatcher/conf/httpd-dispatcher.conf "${HTTPD_PREFIX}/conf/extra/" && \
     echo 'Include conf/extra/httpd-dispatcher.conf' >> "${HTTPD_PREFIX}/conf/httpd.conf" && \
     cat "${HTTPD_PREFIX}/conf/httpd.conf"
+
+RUN sed -i 's/LogLevel dispatcher:warn/LogLevel dispatcher:debug/g' "${HTTPD_PREFIX}/conf/extra/httpd-dispatcher.conf" > /dev/null
 
 # Add dispatcher.any
 COPY conf/dispatcher.any "${HTTPD_PREFIX}/conf/"

diff --git a/dispatcher/conf/dispatcher.any b/dispatcher/conf/dispatcher.any
@@ -48,9 +48,9 @@
       /rend01
         {
         # Hostname or IP of the render
-        /hostname "aem-hostname"
+        /hostname "mhaack-macbook.local"
         # Port of the render
-        /port "4503"
+        /port "4502"
         # Connect timeout in milliseconds, 0 to wait indefinitely
         # /timeout "0"
         }
@@ -108,6 +108,8 @@
 #     /0027 { /type "allow" /url "/tmp/*"    }
 #     /0028 { /type "allow" /url "/var/*"    }
 
+      /1000 { /type "allow" /url "/conf/*/header*" }  # disable this rule to allow mapped content only
+
       # Enable extensions in non-public content directories, using a regular expression
       /0041
         {
@@ -152,7 +154,7 @@
       # document root of the webserver. When an activation request for some 
       # page is received, only files within the same subtree are affected 
       # by the invalidation.
-      #/statfileslevel "0"
+      /statfileslevel "2"
 
       # Flag indicating whether to cache responses to requests that contain
       # authorization information.
@@ -172,16 +174,20 @@
       # - Request has no "Authorization" header (unless allowAuthorized is 1)
       /rules
         {
-        /0000
-          {
-          # the globbing pattern to be compared against the url
-          # example: *             -> everything
-          #        : /foo/bar.*    -> only the /foo/bar documents
-          #        : /foo/bar/*    -> all pages below /foo/bar
-          #        : /foo/bar[./]* -> all pages below and /foo/bar itself
-          #        : *.html        -> all .html files
-          /glob "*"
-          /type "allow"
+          ## Default allow all items to cache
+          /0000 {
+            /glob "*"
+            /type "allow"
+          }
+          ## Don't cache csrf login tokens
+          /0001 {
+            /glob "/libs/granite/csrf/token.json"
+            /type "deny"
+          }
+          ## Don't cache search page
+          /0002 {
+            /glob "/content/venia/*/search.html"
+            /type "deny"
           }
         }
 

diff --git a/dispatcher/conf/magento-proxy.conf b/dispatcher/conf/magento-proxy.conf
@@ -19,8 +19,8 @@ LoadModule ssl_module modules/mod_ssl.so
 LoadModule proxy_module modules/mod_proxy.so
 LoadModule proxy_connect_module modules/mod_proxy_connect.so
 LoadModule proxy_http_module modules/mod_proxy_http.so
- 
-Define magento_host http://my-magento.cloud
+
+Define magento_host https://adobe-starter.dummycachetest.com
 
 ProxyPass "/magento/graphql" "${magento_host}/graphql"
 ProxyPassReverse "/magento/graphql" "${magento_host}/graphql"
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -21,7 +21,7 @@
     <groupId>com.adobe.commerce.cif</groupId>
     <artifactId>core-cif-components-parent</artifactId>
     <packaging>pom</packaging>
-    <version>0.10.1-SNAPSHOT</version>
+    <version>0.10.1</version>
 
     <name>AEM CIF Core Components - Parent</name>
     <description>Parent POM for AEM CIF Core Components</description>
@@ -31,7 +31,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-cif-components</connection>
         <developerConnection>scm:git:[email protected]:adobe/aem-core-cif-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-cif-components</url>
-        <tag>HEAD</tag>
+        <tag>core-cif-components-reactor-0.10.1</tag>
     </scm>
 
     <organization>

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
     <groupId>com.adobe.commerce.cif</groupId>
     <artifactId>core-cif-components-reactor</artifactId>
     <packaging>pom</packaging>
-    <version>0.10.1-SNAPSHOT</version>
+    <version>0.10.1</version>
 
     <name>AEM CIF Core Components Reactor</name>
     <description>Reactor POM for AEM CIF Core Components</description>
@@ -33,7 +33,7 @@
     <parent>
         <groupId>com.adobe.commerce.cif</groupId>
         <artifactId>core-cif-components-parent</artifactId>
-        <version>0.10.1-SNAPSHOT</version>
+        <version>0.10.1</version>
         <relativePath>parent/pom.xml</relativePath>
     </parent>
 
@@ -55,7 +55,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-cif-components</connection>
         <developerConnection>scm:git:[email protected]:adobe/aem-core-cif-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-cif-components</url>
-        <tag>HEAD</tag>
+        <tag>core-cif-components-reactor-0.10.1</tag>
     </scm>
 
     <build>

diff --git a/react-components/package-lock.json b/react-components/package-lock.json
diff --git a/react-components/package.json b/react-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adobe/aem-core-cif-react-components",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "A collection of React components used in the AEM CIF Core Components project",
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",

diff --git a/react-components/pom.xml b/react-components/pom.xml
@@ -6,14 +6,14 @@
     <parent>
         <groupId>com.adobe.commerce.cif</groupId>
         <artifactId>core-cif-components-parent</artifactId>
-        <version>0.10.1-SNAPSHOT</version>
+        <version>0.10.1</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <artifactId>core-cif-react-components</artifactId>
-    <version>0.10.1-SNAPSHOT</version>
+    <version>0.10.1</version>
     <packaging>pom</packaging>
 
     <name>AEM CIF Core Components - Content Package for React Components</name>

diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
@@ -20,14 +20,14 @@
     <parent>
         <groupId>com.adobe.commerce.cif</groupId>
         <artifactId>core-cif-components-parent</artifactId>
-        <version>0.10.1-SNAPSHOT</version>
+        <version>0.10.1</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <artifactId>core-cif-components-apps</artifactId>
-    <version>0.10.1-SNAPSHOT</version>
+    <version>0.10.1</version>
     <packaging>content-package</packaging>
 
     <name>AEM CIF Core Components - Content Package for apps</name>
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-cif-components</connection>
         <developerConnection>scm:git:[email protected]:adobe/aem-core-cif-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-cif-components</url>
-        <tag>HEAD</tag>
+        <tag>core-cif-components-reactor-0.10.1</tag>
     </scm>
     <organization>
         <name>Adobe</name>