From 299485b317596b39d0e0b01f1a9fedaff1031a92 Mon Sep 17 00:00:00 2001
From: Jan Bevers <jbevers@sdl.com>
Date: Fri, 9 Dec 2016 13:51:36 +0100
Subject: [PATCH 01/42] Added getNamespace method to Localization object

---
 .../webapp/common/api/localization/Localization.java   |  6 ++++++
 .../common/impl/localization/LocalizationImpl.java     | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java
index 76f071ea5..a8c7006f9 100644
--- a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java
+++ b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java
@@ -120,5 +120,11 @@ public interface Localization {
      */
     List<String> getDataFormats();
 
+    /**
+     * Gets the Namespace
+     *
+     * @return
+     */
+    String getNamespace();
 
 }
diff --git a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java
index 8e8f83716..a5422aa1a 100644
--- a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java
+++ b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java
@@ -8,6 +8,7 @@
 import com.sdl.webapp.common.api.localization.Localization;
 import com.sdl.webapp.common.api.localization.SiteLocalization;
 import com.sdl.webapp.common.api.mapping.semantic.config.SemanticSchema;
+import com.sdl.webapp.common.util.TcmUtils;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
@@ -24,6 +25,7 @@ public class LocalizationImpl implements Localization {
 
     private static final String FAVICON_PATH = "/favicon.ico";
     private static final Pattern SYSTEM_ASSETS_PATTERN = Pattern.compile("/system(/v\\d+\\.\\d+)?/assets/.*");
+    private static final String DEFAULT_NAMESPACE = "tcm";
 
     @Getter
     private final String id;
@@ -161,6 +163,14 @@ public List<String> getDataFormats() {
         return Arrays.asList(formats);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getNamespace() {
+        return DEFAULT_NAMESPACE;
+    }
+
     public static final class Builder {
         private final ImmutableList.Builder<SiteLocalization> siteLocalizationsBuilder = ImmutableList.builder();
         private final ImmutableMap.Builder<String, String> configurationBuilder = ImmutableMap.builder();

From 5c84d5017dbd3f7952812bab3834cd6f1b5505d6 Mon Sep 17 00:00:00 2001
From: Jan Bevers <jbevers@sdl.com>
Date: Thu, 15 Dec 2016 10:23:25 +0100
Subject: [PATCH 02/42] Renamed method + use default implementation inside
 Localization interface for getCmUriScheme

---
 .../sdl/webapp/common/api/localization/Localization.java | 8 +++++---
 .../common/impl/localization/LocalizationImpl.java       | 9 ---------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java
index a8c7006f9..86fb4c4fd 100644
--- a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java
+++ b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java
@@ -121,10 +121,12 @@ public interface Localization {
     List<String> getDataFormats();
 
     /**
-     * Gets the Namespace
+     * Gets URI scheme used inside TCM-URIs
      *
-     * @return
+     * @return The URI scheme
      */
-    String getNamespace();
+    default String getCmUriScheme() {
+        return "tcm";
+    }
 
 }
diff --git a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java
index a5422aa1a..abcd4af20 100644
--- a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java
+++ b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java
@@ -25,7 +25,6 @@ public class LocalizationImpl implements Localization {
 
     private static final String FAVICON_PATH = "/favicon.ico";
     private static final Pattern SYSTEM_ASSETS_PATTERN = Pattern.compile("/system(/v\\d+\\.\\d+)?/assets/.*");
-    private static final String DEFAULT_NAMESPACE = "tcm";
 
     @Getter
     private final String id;
@@ -163,14 +162,6 @@ public List<String> getDataFormats() {
         return Arrays.asList(formats);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getNamespace() {
-        return DEFAULT_NAMESPACE;
-    }
-
     public static final class Builder {
         private final ImmutableList.Builder<SiteLocalization> siteLocalizationsBuilder = ImmutableList.builder();
         private final ImmutableMap.Builder<String, String> configurationBuilder = ImmutableMap.builder();

From d3aed6bd05f3b7fb3f74c6bf9dc93d335fc7f781 Mon Sep 17 00:00:00 2001
From: Jan Bevers <jbevers@sdl.com>
Date: Thu, 15 Dec 2016 10:36:37 +0100
Subject: [PATCH 03/42] Removed unused import

---
 .../sdl/webapp/common/impl/localization/LocalizationImpl.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java
index abcd4af20..8e8f83716 100644
--- a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java
+++ b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java
@@ -8,7 +8,6 @@
 import com.sdl.webapp.common.api.localization.Localization;
 import com.sdl.webapp.common.api.localization.SiteLocalization;
 import com.sdl.webapp.common.api.mapping.semantic.config.SemanticSchema;
-import com.sdl.webapp.common.util.TcmUtils;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;

From 7f8d6f69b05364e40810e5cf7c491ac135dc23f7 Mon Sep 17 00:00:00 2001
From: Jan Bevers <jbevers@sdl.com>
Date: Thu, 15 Dec 2016 10:55:46 +0100
Subject: [PATCH 04/42] Fixed code documentation to use more generic CM-URIs

---
 .../com/sdl/webapp/common/api/localization/Localization.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java
index 86fb4c4fd..96eb5c37d 100644
--- a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java
+++ b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java
@@ -121,7 +121,7 @@ public interface Localization {
     List<String> getDataFormats();
 
     /**
-     * Gets URI scheme used inside TCM-URIs
+     * Gets URI scheme used inside CM-URIs
      *
      * @return The URI scheme
      */

From 643f22a7578a0c244ab07ce1f9ae8bcdf226b742 Mon Sep 17 00:00:00 2001
From: Mykola Bilenko <mbilenko@sdl.com>
Date: Tue, 20 Dec 2016 14:37:00 +0200
Subject: [PATCH 05/42] KCWA-238 updated TcmUtils.class with more generic
 methods for different namespaces

---
 dxa-framework/dxa-common-api/pom.xml          |   4 +
 .../com/sdl/webapp/common/util/TcmUtils.java  | 198 ++++++++++++++----
 2 files changed, 166 insertions(+), 36 deletions(-)

diff --git a/dxa-framework/dxa-common-api/pom.xml b/dxa-framework/dxa-common-api/pom.xml
index fc23639bb..1a4cdc6f1 100644
--- a/dxa-framework/dxa-common-api/pom.xml
+++ b/dxa-framework/dxa-common-api/pom.xml
@@ -118,5 +118,9 @@
             <artifactId>httpclient</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dd4t</groupId>
+            <artifactId>dd4t-api</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/util/TcmUtils.java b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/util/TcmUtils.java
index d45b19d2d..1f95f1d12 100644
--- a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/util/TcmUtils.java
+++ b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/util/TcmUtils.java
@@ -2,10 +2,14 @@
 
 import com.sdl.webapp.common.api.model.entity.SitemapItem;
 import lombok.extern.slf4j.Slf4j;
+import org.dd4t.core.util.TCMURI;
+import org.dd4t.core.util.TCMURI.Namespace;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static org.dd4t.core.util.TCMURI.Namespace.TCM;
+
 /**
  * Simple utility functions to process TCM-URIs.
  */
@@ -18,11 +22,11 @@ public final class TcmUtils {
 
     private static final int PAGE_ITEM_TYPE = 64;
 
-    private static final String TCM_S_S = "tcm:%s-%s";
+    private static final String S_S_S = "%s:%s-%s";
 
-    private static final String TCM_S_S_S = "tcm:%s-%s-%s";
+    private static final String S_S_S_S = "%s:%s-%s-%s";
 
-    private static final Pattern PATTERN = Pattern.compile("tcm:(\\d+)-(\\d+)(-(\\d+))?");
+    private static final Pattern PATTERN = Pattern.compile("(\\w+):(\\d+)-(\\d+)(-(\\d+))?");
 
     private TcmUtils() {
     }
@@ -34,7 +38,18 @@ private TcmUtils() {
      * @return TCM URI for publication
      */
     public static String buildPublicationTcmUri(int publicationId) {
-        return buildPublicationTcmUriInternal(String.valueOf(publicationId));
+        return buildPublicationCmUri(TCM, publicationId);
+    }
+
+    /**
+     * Build a publication CM URI looking like <code>namespace:0-ID-1</code>.
+     *
+     * @param namespace CM URI namespace
+     * @param publicationId publication ID
+     * @return TCM URI for publication
+     */
+    public static String buildPublicationCmUri(Namespace namespace, int publicationId) {
+        return buildPublicationCmUriInternal(namespace, String.valueOf(publicationId));
     }
 
     /**
@@ -44,11 +59,22 @@ public static String buildPublicationTcmUri(int publicationId) {
      * @return TCM URI for publication
      */
     public static String buildPublicationTcmUri(String publicationId) {
-        return buildPublicationTcmUriInternal(publicationId);
+        return buildPublicationCmUri(TCM, publicationId);
+    }
+
+    /**
+     * Build a publication CM URI looking like <code>namespace:0-ID-1</code>.
+     *
+     * @param namespace CM URI namespace
+     * @param publicationId publication ID
+     * @return TCM URI for publication
+     */
+    public static String buildPublicationCmUri(Namespace namespace, String publicationId) {
+        return buildPublicationCmUriInternal(namespace, publicationId);
     }
 
-    private static String buildPublicationTcmUriInternal(String publicationId) {
-        return String.format(TCM_S_S_S, 0, publicationId, PUBLICATION_ITEM_TYPE);
+    private static String buildPublicationCmUriInternal(Namespace namespace, String publicationId) {
+        return String.format(S_S_S_S, namespace.getValue(), 0, publicationId, PUBLICATION_ITEM_TYPE);
     }
 
     /**
@@ -59,7 +85,19 @@ private static String buildPublicationTcmUriInternal(String publicationId) {
      * @return TCM URI for template
      */
     public static String buildTemplateTcmUri(String publicationId, String itemId) {
-        return String.format(TCM_S_S_S, publicationId, itemId, TEMPLATE_ITEM_TYPE);
+        return buildTemplateCmUri(TCM, publicationId, itemId);
+    }
+
+    /**
+     * Build a template CM URI looking like <code>namespace:PUB_ID-ITEM_ID-32</code>.
+     *
+     * @param namespace CM URI namespace
+     * @param publicationId publication ID
+     * @param itemId        item ID
+     * @return TCM URI for template
+     */
+    public static String buildTemplateCmUri(Namespace namespace, String publicationId, String itemId) {
+        return String.format(S_S_S_S, namespace.getValue(), publicationId, itemId, TEMPLATE_ITEM_TYPE);
     }
 
     /**
@@ -70,7 +108,19 @@ public static String buildTemplateTcmUri(String publicationId, String itemId) {
      * @return TCM URI for page
      */
     public static String buildPageTcmUri(String publicationId, String itemId) {
-        return String.format(TCM_S_S_S, publicationId, itemId, PAGE_ITEM_TYPE);
+        return buildPageCmUri(TCM, publicationId, itemId);
+    }
+
+    /**
+     * Build a template CM URI looking like <code>namespace:PUB_ID-ITEM_ID-32</code>.
+     *
+     * @param namespace CM URI namespace
+     * @param publicationId publication ID
+     * @param itemId        item ID
+     * @return TCM URI for page
+     */
+    public static String buildPageCmUri(Namespace namespace, String publicationId, String itemId) {
+        return String.format(S_S_S_S, namespace.getValue(), publicationId, itemId, PAGE_ITEM_TYPE);
     }
 
     /**
@@ -81,7 +131,19 @@ public static String buildPageTcmUri(String publicationId, String itemId) {
      * @return short TCM URI
      */
     public static String buildTcmUri(String publicationId, String itemId) {
-        return buildTcmUriInternal(publicationId, itemId);
+        return buildCmUri(TCM, publicationId, itemId);
+    }
+
+    /**
+     * Build a short CM URI looking like <code>namespace:PUB_ID-ITEM_ID</code>.
+     *
+     * @param namespace CM URI namespace
+     * @param publicationId publication ID
+     * @param itemId        item ID
+     * @return short CM URI
+     */
+    public static String buildCmUri(Namespace namespace, String publicationId, String itemId) {
+        return buildCmUriInternal(namespace, publicationId, itemId);
     }
 
     /**
@@ -92,11 +154,23 @@ public static String buildTcmUri(String publicationId, String itemId) {
      * @return short TCM URI
      */
     public static String buildTcmUri(int publicationId, int itemId) {
-        return buildTcmUriInternal(String.valueOf(publicationId), String.valueOf(itemId));
+        return buildCmUri(TCM, publicationId, itemId);
+    }
+
+    /**
+     * Build a short CM URI looking like <code>namespace:PUB_ID-ITEM_ID</code>.
+     *
+     * @param namespace CM URI namespace
+     * @param publicationId publication ID
+     * @param itemId        item ID
+     * @return short CM URI
+     */
+    public static String buildCmUri(Namespace namespace, int publicationId, int itemId) {
+        return buildCmUriInternal(namespace, String.valueOf(publicationId), String.valueOf(itemId));
     }
 
-    private static String buildTcmUriInternal(String publicationId, String itemId) {
-        return String.format(TCM_S_S, publicationId, itemId);
+    private static String buildCmUriInternal(Namespace namespace, String publicationId, String itemId) {
+        return String.format(S_S_S, namespace.getValue(), publicationId, itemId);
     }
 
     /**
@@ -108,7 +182,20 @@ private static String buildTcmUriInternal(String publicationId, String itemId) {
      * @return a TCM URI
      */
     public static String buildTcmUri(String publicationId, String itemId, String itemType) {
-        return buildTcmUriInternal(publicationId, itemId, itemType);
+        return buildCmUri(TCM, publicationId, itemId, itemType);
+    }
+
+    /**
+     * Build a CM URI looking like <code>namespace:PUB_ID-ITEM_ID-ITEM_TYPE</code>.
+     *
+     * @param namespace CM URI namespace
+     * @param publicationId publication ID
+     * @param itemId        item ID
+     * @param itemType      item type
+     * @return a CM URI
+     */
+    public static String buildCmUri(Namespace namespace, String publicationId, String itemId, String itemType) {
+        return buildCmUriInternal(namespace, publicationId, itemId, itemType);
     }
 
     /**
@@ -120,40 +207,53 @@ public static String buildTcmUri(String publicationId, String itemId, String ite
      * @return a TCM URI
      */
     public static String buildTcmUri(int publicationId, int itemId, int itemType) {
-        return buildTcmUriInternal(String.valueOf(publicationId), String.valueOf(itemId), String.valueOf(itemType));
+        return buildCmUri(TCM, publicationId, itemId, itemType);
+    }
+
+    /**
+     * Build a CM URI looking like <code>namespace:PUB_ID-ITEM_ID-ITEM_TYPE</code>.
+     *
+     * @param namespace CM URI namespace
+     * @param publicationId publication ID
+     * @param itemId        item ID
+     * @param itemType      item type
+     * @return a CM URI
+     */
+    public static String buildCmUri(Namespace namespace, int publicationId, int itemId, int itemType) {
+        return buildCmUriInternal(namespace, String.valueOf(publicationId), String.valueOf(itemId), String.valueOf(itemType));
     }
 
-    public static String buildTcmUriInternal(String publicationId, String itemId, String itemType) {
-        return String.format(TCM_S_S_S, publicationId, itemId, itemType);
+    public static String buildCmUriInternal(Namespace namespace, String publicationId, String itemId, String itemType) {
+        return String.format(S_S_S_S, namespace.getValue(), publicationId, itemId, itemType);
     }
 
     /**
-     * Extracts item ID from a valid TCM URI.
+     * Extracts item ID from a valid CM URI.
      *
-     * @param tcmUri tcm uri to process
+     * @param cmUri cm uri to process
      * @return item ID or <code>-1</code> if URI is not valid or null
      */
-    public static int getItemId(String tcmUri) {
-        return extractGroupFromTcm(tcmUri, 2);
+    public static int getItemId(String cmUri) {
+        return extractGroupFromCm(cmUri, 3);
     }
 
     /**
-     * Extracts publication ID from a valid TCM URI.
+     * Extracts publication ID from a valid CM URI.
      *
-     * @param tcmUri tcm uri to process
+     * @param cmUri cm uri to process
      * @return publication ID or <code>-1</code> if URI is not valid or null
      */
-    public static int getPublicationId(String tcmUri) {
-        return extractGroupFromTcm(tcmUri, 1);
+    public static int getPublicationId(String cmUri) {
+        return extractGroupFromCm(cmUri, 2);
     }
 
-    private static int extractGroupFromTcm(String tcmUri, int group) {
+    private static int extractGroupFromCm(String cmUri, int group) {
         int failed = -1;
-        if (tcmUri == null) {
+        if (cmUri == null) {
             return failed;
         }
 
-        Matcher matcher = PATTERN.matcher(tcmUri);
+        Matcher matcher = PATTERN.matcher(cmUri);
         return matcher.matches() ? Integer.parseInt(matcher.group(group)) : failed;
     }
 
@@ -166,8 +266,21 @@ private static int extractGroupFromTcm(String tcmUri, int group) {
      * @return localized TCM URI of an item
      */
     public static String localizeTcmUri(String tcmUri, String publicationTcmUri) {
-        int publicationId = getItemId(publicationTcmUri);
-        return localizeTcmUri(tcmUri, publicationId);
+        return localizeCmUri(TCM, tcmUri, publicationTcmUri);
+    }
+
+    /**
+     * Localizes given CM URI to current publication.
+     * <p>E.g. <code>namespace:1-2-3</code> with publication URI <code>namespace:0-8-1</code> will look like <code>namespace:8-2-3</code>.</p>
+     *
+     * @param namespace         CM URI namespace
+     * @param cmUri             cm uri of item to localize
+     * @param publicationCmUri  CM URI of publication
+     * @return localized CM URI of an item
+     */
+    public static String localizeCmUri(Namespace namespace, String cmUri, String publicationCmUri) {
+        int publicationId = getItemId(publicationCmUri);
+        return localizeCmUri(namespace, cmUri, publicationId);
     }
 
     /**
@@ -179,14 +292,27 @@ public static String localizeTcmUri(String tcmUri, String publicationTcmUri) {
      * @return localized TCM URI of an item
      */
     public static String localizeTcmUri(String tcmUri, int publicationId) {
-        Matcher matcher = PATTERN.matcher(tcmUri);
+        return localizeCmUri(TCM, tcmUri, publicationId);
+    }
+
+    /**
+     * Localizes given CM URI to current publication.
+     * <p>E.g. <code>namespace:1-2-3</code> with publication ID <code>8</code> will look like <code>namespace:8-2-3</code>.</p>
+     *
+     * @param namespace     CM URI namespace
+     * @param cmUri         cm uri of item to localize
+     * @param publicationId publication ID
+     * @return localized CM URI of an item
+     */
+    public static String localizeCmUri(Namespace namespace, String cmUri, int publicationId) {
+        Matcher matcher = PATTERN.matcher(cmUri);
         if (!matcher.matches()) {
-            log.warn("TCM URI {} is not valid", tcmUri);
-            throw new IllegalArgumentException("TCM URI is not valid: " + tcmUri);
+            log.warn("CM URI {} is not valid", cmUri);
+            throw new IllegalArgumentException("CM URI is not valid: " + cmUri);
         }
-        String itemType = matcher.group(4);
-        return itemType == null ? buildTcmUri(publicationId, getItemId(tcmUri)) :
-                buildTcmUri(publicationId, getItemId(tcmUri), Integer.parseInt(itemType));
+        String itemType = matcher.group(5);
+        return itemType == null ? buildCmUri(namespace, publicationId, getItemId(cmUri)) :
+                buildCmUri(namespace, publicationId, getItemId(cmUri), Integer.parseInt(itemType));
 
     }
 

From af225d15e8fcbf5ef63d0a792c93d53239a2b641 Mon Sep 17 00:00:00 2001
From: Jan Bevers <jbevers@sdl.com>
Date: Mon, 19 Dec 2016 12:19:58 +0100
Subject: [PATCH 06/42] KCWA-237 Extend localization object to include URI
 scheme information

---
 .../sdl/webapp/common/api/localization/Localization.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java
index 76f071ea5..96eb5c37d 100644
--- a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java
+++ b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java
@@ -120,5 +120,13 @@ public interface Localization {
      */
     List<String> getDataFormats();
 
+    /**
+     * Gets URI scheme used inside CM-URIs
+     *
+     * @return The URI scheme
+     */
+    default String getCmUriScheme() {
+        return "tcm";
+    }
 
 }

From 59e5e01ff2e44eb8585c4d5162b4f0ae12b87cc5 Mon Sep 17 00:00:00 2001
From: Alexey Zarakovskiy <azarakovskiy@sdl.com>
Date: Thu, 19 Jan 2017 16:45:41 +0100
Subject: [PATCH 07/42] Deprecated MimeUtils.java

---
 .../src/main/java/com/sdl/webapp/common/util/MimeUtils.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/util/MimeUtils.java b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/util/MimeUtils.java
index 9edabb4fc..3fea69774 100644
--- a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/util/MimeUtils.java
+++ b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/util/MimeUtils.java
@@ -9,7 +9,9 @@
 
 /**
  * <p>MimeUtils class.</p>
+ * @deprecated since 1.8, to remove in DXA 2.0
  */
+@Deprecated
 public final class MimeUtils {
 
     static HashMap<String, String> MIME_TYPES = new HashMap<>();

From dbc04220fae9ce2544d7a7f200127d19540899de Mon Sep 17 00:00:00 2001
From: Jan Bevers <jbevers@sdl.com>
Date: Thu, 19 Jan 2017 16:33:49 +0100
Subject: [PATCH 08/42] KCWA-426 Added bmp mime type info

---
 .../src/main/java/com/sdl/webapp/common/util/MimeUtils.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/util/MimeUtils.java b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/util/MimeUtils.java
index 3fea69774..a6098a0f0 100644
--- a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/util/MimeUtils.java
+++ b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/util/MimeUtils.java
@@ -29,6 +29,7 @@ public final class MimeUtils {
         MIME_TYPES.put("au", "audio/basic");
         MIME_TYPES.put("avi", "video/x-msvideo");
         MIME_TYPES.put("bin", "application/octet-stream");
+        MIME_TYPES.put("bmp", "image/bmp");
         MIME_TYPES.put("cab", "application/x-cabinet");
         MIME_TYPES.put("cdf", "application/x-netcdf");
         MIME_TYPES.put("class", "application/java-vm");

From 225b6960cff88c2757abef3147d83118dbcd864e Mon Sep 17 00:00:00 2001
From: Jan Bevers <jbevers@sdl.com>
Date: Tue, 10 Jan 2017 11:51:47 +0100
Subject: [PATCH 09/42] KCWA-361 Added
 BrokerDynamicComponentPresentationProvider

---
 ...rDynamicComponentPresentationProvider.java | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 dxa-framework/dxa-web8-provider/src/main/java/com/sdl/webapp/tridion/BrokerDynamicComponentPresentationProvider.java

diff --git a/dxa-framework/dxa-web8-provider/src/main/java/com/sdl/webapp/tridion/BrokerDynamicComponentPresentationProvider.java b/dxa-framework/dxa-web8-provider/src/main/java/com/sdl/webapp/tridion/BrokerDynamicComponentPresentationProvider.java
new file mode 100644
index 000000000..6f31f11f1
--- /dev/null
+++ b/dxa-framework/dxa-web8-provider/src/main/java/com/sdl/webapp/tridion/BrokerDynamicComponentPresentationProvider.java
@@ -0,0 +1,52 @@
+package com.sdl.webapp.tridion;
+
+import com.sdl.web.api.broker.WebComponentPresentationFactoryImpl;
+import com.sdl.web.api.dynamic.ComponentPresentationAssemblerImpl;
+import com.sdl.web.api.dynamic.WebComponentPresentationFactory;
+import com.sdl.web.api.dynamic.WebComponentPresentationAssembler;
+import lombok.extern.slf4j.Slf4j;
+import org.dd4t.contentmodel.ComponentPresentation;
+import org.dd4t.core.exceptions.ItemNotFoundException;
+import org.dd4t.core.exceptions.SerializationException;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Component
+@Slf4j
+public class BrokerDynamicComponentPresentationProvider extends AbstractBrokerComponentPresentationProvider {
+
+    private static final Map<Integer, WebComponentPresentationFactory> FACTORY_CACHE = new ConcurrentHashMap<>();
+    private static final String ERROR_MESSAGE
+            = "Component Presentation not found for componentId: %d, templateId: %d and publicationId: %d";
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected ComponentPresentation getDynamicComponentPresentationInternal(int componentId, int templateId,
+                                                                            int publicationId)
+            throws ItemNotFoundException, SerializationException {
+        WebComponentPresentationFactory factory = FACTORY_CACHE.get(publicationId);
+        if (factory == null) {
+            factory = new WebComponentPresentationFactoryImpl(publicationId);
+            FACTORY_CACHE.put(publicationId, factory);
+        }
+
+        com.tridion.dcp.ComponentPresentation result = templateId != 0 ?
+                factory.getComponentPresentation(componentId, templateId) :
+                factory.getComponentPresentationWithHighestPriority(componentId);
+
+        if (result == null) {
+            log.info(String.format(ERROR_MESSAGE, componentId, templateId, publicationId));
+            throw new ItemNotFoundException(String.format(ERROR_MESSAGE, componentId, templateId, publicationId));
+        }
+
+        WebComponentPresentationAssembler assembler = new ComponentPresentationAssemblerImpl(publicationId);
+        String assembledContent = assembler.getContent(result.getComponentId(), result.getComponentTemplateId());
+
+        return getComponentPresentation(assembledContent);
+    }
+
+}
\ No newline at end of file

From e1b3941352856da8159cdaa37538abc2fb2c4982 Mon Sep 17 00:00:00 2001
From: Mykola Bilenko <mbilenko@sdl.com>
Date: Thu, 26 Jan 2017 13:04:34 +0200
Subject: [PATCH 10/42] Update version of CIL to use 10.0.0-SNAPSHOT

---
 dxa-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dxa-bom/pom.xml b/dxa-bom/pom.xml
index 5384b9f39..2cec2b240 100644
--- a/dxa-bom/pom.xml
+++ b/dxa-bom/pom.xml
@@ -46,7 +46,7 @@
 
     <properties>
         <dd4t.version>2.1.4-DXA17</dd4t.version>
-        <cd-cil.version>8.5.0-1008</cd-cil.version>
+        <cd-cil.version>10.0.0-SNAPSHOT</cd-cil.version>
 
         <!-- DXA versions -->
         <dxa.version>${project.version}</dxa.version>

From 77e677eb47829d3bc43d08ed2b20a7ddbb83bbc5 Mon Sep 17 00:00:00 2001
From: Alexey Zarakovskiy <azarakovskiy@sdl.com>
Date: Fri, 10 Feb 2017 11:28:09 +0100
Subject: [PATCH 11/42] don't use dd4t in common-api

---
 dxa-framework/dxa-common-api/pom.xml          |   5 -
 .../com/sdl/webapp/common/util/TcmUtils.java  | 112 +++++++++++-------
 2 files changed, 69 insertions(+), 48 deletions(-)

diff --git a/dxa-framework/dxa-common-api/pom.xml b/dxa-framework/dxa-common-api/pom.xml
index 1a4cdc6f1..281e07560 100644
--- a/dxa-framework/dxa-common-api/pom.xml
+++ b/dxa-framework/dxa-common-api/pom.xml
@@ -117,10 +117,5 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.dd4t</groupId>
-            <artifactId>dd4t-api</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/util/TcmUtils.java b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/util/TcmUtils.java
index 1f95f1d12..e60f92bc3 100644
--- a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/util/TcmUtils.java
+++ b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/util/TcmUtils.java
@@ -1,14 +1,17 @@
 package com.sdl.webapp.common.util;
 
 import com.sdl.webapp.common.api.model.entity.SitemapItem;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import org.dd4t.core.util.TCMURI;
-import org.dd4t.core.util.TCMURI.Namespace;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.dd4t.core.util.TCMURI.Namespace.TCM;
+import static com.sdl.webapp.common.util.TcmUtils.Namespace.TCM;
 
 /**
  * Simple utility functions to process TCM-URIs.
@@ -44,7 +47,7 @@ public static String buildPublicationTcmUri(int publicationId) {
     /**
      * Build a publication CM URI looking like <code>namespace:0-ID-1</code>.
      *
-     * @param namespace CM URI namespace
+     * @param namespace     CM URI namespace
      * @param publicationId publication ID
      * @return TCM URI for publication
      */
@@ -52,6 +55,10 @@ public static String buildPublicationCmUri(Namespace namespace, int publicationI
         return buildPublicationCmUriInternal(namespace, String.valueOf(publicationId));
     }
 
+    private static String buildPublicationCmUriInternal(Namespace namespace, String publicationId) {
+        return String.format(S_S_S_S, namespace.getValue(), 0, publicationId, PUBLICATION_ITEM_TYPE);
+    }
+
     /**
      * Build a publication TCM URI looking like <code>tcm:0-ID-1</code>.
      *
@@ -65,7 +72,7 @@ public static String buildPublicationTcmUri(String publicationId) {
     /**
      * Build a publication CM URI looking like <code>namespace:0-ID-1</code>.
      *
-     * @param namespace CM URI namespace
+     * @param namespace     CM URI namespace
      * @param publicationId publication ID
      * @return TCM URI for publication
      */
@@ -73,10 +80,6 @@ public static String buildPublicationCmUri(Namespace namespace, String publicati
         return buildPublicationCmUriInternal(namespace, publicationId);
     }
 
-    private static String buildPublicationCmUriInternal(Namespace namespace, String publicationId) {
-        return String.format(S_S_S_S, namespace.getValue(), 0, publicationId, PUBLICATION_ITEM_TYPE);
-    }
-
     /**
      * Build a template TCM URI looking like <code>tcm:PUB_ID-ITEM_ID-32</code>.
      *
@@ -91,7 +94,7 @@ public static String buildTemplateTcmUri(String publicationId, String itemId) {
     /**
      * Build a template CM URI looking like <code>namespace:PUB_ID-ITEM_ID-32</code>.
      *
-     * @param namespace CM URI namespace
+     * @param namespace     CM URI namespace
      * @param publicationId publication ID
      * @param itemId        item ID
      * @return TCM URI for template
@@ -114,7 +117,7 @@ public static String buildPageTcmUri(String publicationId, String itemId) {
     /**
      * Build a template CM URI looking like <code>namespace:PUB_ID-ITEM_ID-32</code>.
      *
-     * @param namespace CM URI namespace
+     * @param namespace     CM URI namespace
      * @param publicationId publication ID
      * @param itemId        item ID
      * @return TCM URI for page
@@ -137,7 +140,7 @@ public static String buildTcmUri(String publicationId, String itemId) {
     /**
      * Build a short CM URI looking like <code>namespace:PUB_ID-ITEM_ID</code>.
      *
-     * @param namespace CM URI namespace
+     * @param namespace     CM URI namespace
      * @param publicationId publication ID
      * @param itemId        item ID
      * @return short CM URI
@@ -146,6 +149,10 @@ public static String buildCmUri(Namespace namespace, String publicationId, Strin
         return buildCmUriInternal(namespace, publicationId, itemId);
     }
 
+    private static String buildCmUriInternal(Namespace namespace, String publicationId, String itemId) {
+        return String.format(S_S_S, namespace.getValue(), publicationId, itemId);
+    }
+
     /**
      * Build a short TCM URI looking like <code>tcm:PUB_ID-ITEM_ID</code>.
      *
@@ -160,7 +167,7 @@ public static String buildTcmUri(int publicationId, int itemId) {
     /**
      * Build a short CM URI looking like <code>namespace:PUB_ID-ITEM_ID</code>.
      *
-     * @param namespace CM URI namespace
+     * @param namespace     CM URI namespace
      * @param publicationId publication ID
      * @param itemId        item ID
      * @return short CM URI
@@ -169,10 +176,6 @@ public static String buildCmUri(Namespace namespace, int publicationId, int item
         return buildCmUriInternal(namespace, String.valueOf(publicationId), String.valueOf(itemId));
     }
 
-    private static String buildCmUriInternal(Namespace namespace, String publicationId, String itemId) {
-        return String.format(S_S_S, namespace.getValue(), publicationId, itemId);
-    }
-
     /**
      * Build a TCM URI looking like <code>tcm:PUB_ID-ITEM_ID-ITEM_TYPE</code>.
      *
@@ -188,7 +191,7 @@ public static String buildTcmUri(String publicationId, String itemId, String ite
     /**
      * Build a CM URI looking like <code>namespace:PUB_ID-ITEM_ID-ITEM_TYPE</code>.
      *
-     * @param namespace CM URI namespace
+     * @param namespace     CM URI namespace
      * @param publicationId publication ID
      * @param itemId        item ID
      * @param itemType      item type
@@ -198,6 +201,10 @@ public static String buildCmUri(Namespace namespace, String publicationId, Strin
         return buildCmUriInternal(namespace, publicationId, itemId, itemType);
     }
 
+    public static String buildCmUriInternal(Namespace namespace, String publicationId, String itemId, String itemType) {
+        return String.format(S_S_S_S, namespace.getValue(), publicationId, itemId, itemType);
+    }
+
     /**
      * Build a TCM URI looking like <code>tcm:PUB_ID-ITEM_ID-ITEM_TYPE</code>.
      *
@@ -213,7 +220,7 @@ public static String buildTcmUri(int publicationId, int itemId, int itemType) {
     /**
      * Build a CM URI looking like <code>namespace:PUB_ID-ITEM_ID-ITEM_TYPE</code>.
      *
-     * @param namespace CM URI namespace
+     * @param namespace     CM URI namespace
      * @param publicationId publication ID
      * @param itemId        item ID
      * @param itemType      item type
@@ -223,20 +230,6 @@ public static String buildCmUri(Namespace namespace, int publicationId, int item
         return buildCmUriInternal(namespace, String.valueOf(publicationId), String.valueOf(itemId), String.valueOf(itemType));
     }
 
-    public static String buildCmUriInternal(Namespace namespace, String publicationId, String itemId, String itemType) {
-        return String.format(S_S_S_S, namespace.getValue(), publicationId, itemId, itemType);
-    }
-
-    /**
-     * Extracts item ID from a valid CM URI.
-     *
-     * @param cmUri cm uri to process
-     * @return item ID or <code>-1</code> if URI is not valid or null
-     */
-    public static int getItemId(String cmUri) {
-        return extractGroupFromCm(cmUri, 3);
-    }
-
     /**
      * Extracts publication ID from a valid CM URI.
      *
@@ -273,9 +266,9 @@ public static String localizeTcmUri(String tcmUri, String publicationTcmUri) {
      * Localizes given CM URI to current publication.
      * <p>E.g. <code>namespace:1-2-3</code> with publication URI <code>namespace:0-8-1</code> will look like <code>namespace:8-2-3</code>.</p>
      *
-     * @param namespace         CM URI namespace
-     * @param cmUri             cm uri of item to localize
-     * @param publicationCmUri  CM URI of publication
+     * @param namespace        CM URI namespace
+     * @param cmUri            cm uri of item to localize
+     * @param publicationCmUri CM URI of publication
      * @return localized CM URI of an item
      */
     public static String localizeCmUri(Namespace namespace, String cmUri, String publicationCmUri) {
@@ -284,15 +277,13 @@ public static String localizeCmUri(Namespace namespace, String cmUri, String pub
     }
 
     /**
-     * Localizes given TCM URI to current publication.
-     * <p>E.g. <code>tcm:1-2-3</code> with publication ID <code>8</code> will look like <code>tcm:8-2-3</code>.</p>
+     * Extracts item ID from a valid CM URI.
      *
-     * @param tcmUri        tcm uri of item to localize
-     * @param publicationId publication ID
-     * @return localized TCM URI of an item
+     * @param cmUri cm uri to process
+     * @return item ID or <code>-1</code> if URI is not valid or null
      */
-    public static String localizeTcmUri(String tcmUri, int publicationId) {
-        return localizeCmUri(TCM, tcmUri, publicationId);
+    public static int getItemId(String cmUri) {
+        return extractGroupFromCm(cmUri, 3);
     }
 
     /**
@@ -316,6 +307,41 @@ public static String localizeCmUri(Namespace namespace, String cmUri, int public
 
     }
 
+    /**
+     * Localizes given TCM URI to current publication.
+     * <p>E.g. <code>tcm:1-2-3</code> with publication ID <code>8</code> will look like <code>tcm:8-2-3</code>.</p>
+     *
+     * @param tcmUri        tcm uri of item to localize
+     * @param publicationId publication ID
+     * @return localized TCM URI of an item
+     */
+    public static String localizeTcmUri(String tcmUri, int publicationId) {
+        return localizeCmUri(TCM, tcmUri, publicationId);
+    }
+
+    @AllArgsConstructor
+    public enum Namespace {
+        TCM("tcm"),
+        ISH("ish");
+
+        private static final Map<String, Namespace> namespaces = Collections.unmodifiableMap(initialize());
+
+        @Getter
+        private String value;
+
+        private static Map<String, Namespace> initialize() {
+            Map<String, Namespace> result = new HashMap<>();
+            for (Namespace n : Namespace.values()) {
+                result.put(n.value, n);
+            }
+            return result;
+        }
+
+        public static Namespace getNamespaceFor(String value) {
+            return namespaces.get(value);
+        }
+    }
+
     /**
      * Utils for Taxonomies identifiers support.
      */

From d5602cd7cc9b49091a2e44b26c49eac6c6373bec Mon Sep 17 00:00:00 2001
From: Alexey Zarakovskiy <azarakovskiy@sdl.com>
Date: Fri, 10 Feb 2017 13:57:02 +0100
Subject: [PATCH 12/42] dd4t version that uses UDP 10

---
 dxa-bom/pom.xml                               |   2 +-
 .../dd4t-api-2.1.5-DXA18.jar}                 | Bin 40796 -> 42280 bytes
 .../dd4t-api-2.1.5-DXA18.pom}                 |   4 ++--
 .../dd4t-core-2.1.5-DXA18.jar}                | Bin 97690 -> 97691 bytes
 .../dd4t-core-2.1.5-DXA18.pom}                |   2 +-
 .../dd4t-databind-2.1.5-DXA18.jar}            | Bin 35378 -> 35382 bytes
 .../dd4t-databind-2.1.5-DXA18.pom}            |   4 ++--
 .../dd4t-parent-2.1.5-DXA18.pom}              |   7 +++----
 .../dd4t-providers-2.1.5-DXA18.jar}           | Bin 18382 -> 18389 bytes
 .../dd4t-providers-2.1.5-DXA18.pom}           |   4 ++--
 10 files changed, 11 insertions(+), 12 deletions(-)
 rename local-project-repo/org/dd4t/dd4t-api/{2.1.4-DXA17/dd4t-api-2.1.4-DXA17.jar => 2.1.5-DXA18/dd4t-api-2.1.5-DXA18.jar} (62%)
 rename local-project-repo/org/dd4t/dd4t-api/{2.1.4-DXA17/dd4t-api-2.1.4-DXA17.pom => 2.1.5-DXA18/dd4t-api-2.1.5-DXA18.pom} (97%)
 rename local-project-repo/org/dd4t/dd4t-core/{2.1.4-DXA17/dd4t-core-2.1.4-DXA17.jar => 2.1.5-DXA18/dd4t-core-2.1.5-DXA18.jar} (86%)
 rename local-project-repo/org/dd4t/dd4t-core/{2.1.4-DXA17/dd4t-core-2.1.4-DXA17.pom => 2.1.5-DXA18/dd4t-core-2.1.5-DXA18.pom} (99%)
 rename local-project-repo/org/dd4t/dd4t-databind/{2.1.4-DXA17/dd4t-databind-2.1.4-DXA17.jar => 2.1.5-DXA18/dd4t-databind-2.1.5-DXA18.jar} (84%)
 rename local-project-repo/org/dd4t/dd4t-databind/{2.1.4-DXA17/dd4t-databind-2.1.4-DXA17.pom => 2.1.5-DXA18/dd4t-databind-2.1.5-DXA18.pom} (98%)
 rename local-project-repo/org/dd4t/dd4t-parent/{2.1.4-DXA17/dd4t-parent-2.1.4-DXA17.pom => 2.1.5-DXA18/dd4t-parent-2.1.5-DXA18.pom} (98%)
 rename local-project-repo/org/dd4t/dd4t-providers/{2.1.4-DXA17/dd4t-providers-2.1.4-DXA17.jar => 2.1.5-DXA18/dd4t-providers-2.1.5-DXA18.jar} (83%)
 rename local-project-repo/org/dd4t/dd4t-providers/{2.1.4-DXA17/dd4t-providers-2.1.4-DXA17.pom => 2.1.5-DXA18/dd4t-providers-2.1.5-DXA18.pom} (95%)

diff --git a/dxa-bom/pom.xml b/dxa-bom/pom.xml
index 2cec2b240..1f91efcc4 100644
--- a/dxa-bom/pom.xml
+++ b/dxa-bom/pom.xml
@@ -45,7 +45,7 @@
     </developers>
 
     <properties>
-        <dd4t.version>2.1.4-DXA17</dd4t.version>
+        <dd4t.version>2.1.5-DXA18</dd4t.version>
         <cd-cil.version>10.0.0-SNAPSHOT</cd-cil.version>
 
         <!-- DXA versions -->
diff --git a/local-project-repo/org/dd4t/dd4t-api/2.1.4-DXA17/dd4t-api-2.1.4-DXA17.jar b/local-project-repo/org/dd4t/dd4t-api/2.1.5-DXA18/dd4t-api-2.1.5-DXA18.jar
similarity index 62%
rename from local-project-repo/org/dd4t/dd4t-api/2.1.4-DXA17/dd4t-api-2.1.4-DXA17.jar
rename to local-project-repo/org/dd4t/dd4t-api/2.1.5-DXA18/dd4t-api-2.1.5-DXA18.jar
index 37020dbc2e5a8dd38b8dce442b7179552c23c87c..43fb512709ede7fc640a731bc0ee361a46ceb5c4 100644
GIT binary patch
delta 6436
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
JF~l7!{tu2NM05ZE

delta 5062
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
KV1<!;-v0w?uOD3i

diff --git a/local-project-repo/org/dd4t/dd4t-api/2.1.4-DXA17/dd4t-api-2.1.4-DXA17.pom b/local-project-repo/org/dd4t/dd4t-api/2.1.5-DXA18/dd4t-api-2.1.5-DXA18.pom
similarity index 97%
rename from local-project-repo/org/dd4t/dd4t-api/2.1.4-DXA17/dd4t-api-2.1.4-DXA17.pom
rename to local-project-repo/org/dd4t/dd4t-api/2.1.5-DXA18/dd4t-api-2.1.5-DXA18.pom
index 7ab113b72..f01261d71 100644
--- a/local-project-repo/org/dd4t/dd4t-api/2.1.4-DXA17/dd4t-api-2.1.4-DXA17.pom
+++ b/local-project-repo/org/dd4t/dd4t-api/2.1.5-DXA18/dd4t-api-2.1.5-DXA18.pom
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>dd4t-parent</artifactId>
         <groupId>org.dd4t</groupId>
-        <version>2.1.4-DXA17</version>
+        <version>2.1.5-DXA18</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
     <artifactId>dd4t-api</artifactId>
-    <version>2.1.4-DXA17</version>
+    <version>2.1.5-DXA18</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Contains the dd4t interfaces and content model.</description>
diff --git a/local-project-repo/org/dd4t/dd4t-core/2.1.4-DXA17/dd4t-core-2.1.4-DXA17.jar b/local-project-repo/org/dd4t/dd4t-core/2.1.5-DXA18/dd4t-core-2.1.5-DXA18.jar
similarity index 86%
rename from local-project-repo/org/dd4t/dd4t-core/2.1.4-DXA17/dd4t-core-2.1.4-DXA17.jar
rename to local-project-repo/org/dd4t/dd4t-core/2.1.5-DXA18/dd4t-core-2.1.5-DXA18.jar
index 8c981ef9994149755c7cb7689dfa10adcfbb330c..48d32fca3aac8b5724f8a832483e7f26a3165f2a 100644
GIT binary patch
delta 3542
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
OKHwl<A0ip*aDM~L0h4<G

delta 3532
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
MwB)KcNJcr_zl8@I#{d8T

diff --git a/local-project-repo/org/dd4t/dd4t-core/2.1.4-DXA17/dd4t-core-2.1.4-DXA17.pom b/local-project-repo/org/dd4t/dd4t-core/2.1.5-DXA18/dd4t-core-2.1.5-DXA18.pom
similarity index 99%
rename from local-project-repo/org/dd4t/dd4t-core/2.1.4-DXA17/dd4t-core-2.1.4-DXA17.pom
rename to local-project-repo/org/dd4t/dd4t-core/2.1.5-DXA18/dd4t-core-2.1.5-DXA18.pom
index 8d38955d5..8661917f2 100644
--- a/local-project-repo/org/dd4t/dd4t-core/2.1.4-DXA17/dd4t-core-2.1.4-DXA17.pom
+++ b/local-project-repo/org/dd4t/dd4t-core/2.1.5-DXA18/dd4t-core-2.1.5-DXA18.pom
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dd4t-parent</artifactId>
         <groupId>org.dd4t</groupId>
-        <version>2.1.4-DXA17</version>
+        <version>2.1.5-DXA18</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/local-project-repo/org/dd4t/dd4t-databind/2.1.4-DXA17/dd4t-databind-2.1.4-DXA17.jar b/local-project-repo/org/dd4t/dd4t-databind/2.1.5-DXA18/dd4t-databind-2.1.5-DXA18.jar
similarity index 84%
rename from local-project-repo/org/dd4t/dd4t-databind/2.1.4-DXA17/dd4t-databind-2.1.4-DXA17.jar
rename to local-project-repo/org/dd4t/dd4t-databind/2.1.5-DXA18/dd4t-databind-2.1.5-DXA18.jar
index 28f00821921745c9c91c39a9a27e4b718cfd5811..de45e68c8aded1d2ca117a2ce352e1dd9582b38a 100644
GIT binary patch
delta 1972
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
Tr$HXc77$uujH*gke0Bc?PmW6n

delta 1985
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
T=P8g&k|~7E#-l5En=^j^uu&%-

diff --git a/local-project-repo/org/dd4t/dd4t-databind/2.1.4-DXA17/dd4t-databind-2.1.4-DXA17.pom b/local-project-repo/org/dd4t/dd4t-databind/2.1.5-DXA18/dd4t-databind-2.1.5-DXA18.pom
similarity index 98%
rename from local-project-repo/org/dd4t/dd4t-databind/2.1.4-DXA17/dd4t-databind-2.1.4-DXA17.pom
rename to local-project-repo/org/dd4t/dd4t-databind/2.1.5-DXA18/dd4t-databind-2.1.5-DXA18.pom
index bd0f4c7cc..431c2da10 100644
--- a/local-project-repo/org/dd4t/dd4t-databind/2.1.4-DXA17/dd4t-databind-2.1.4-DXA17.pom
+++ b/local-project-repo/org/dd4t/dd4t-databind/2.1.5-DXA18/dd4t-databind-2.1.5-DXA18.pom
@@ -7,11 +7,11 @@
     <parent>
         <artifactId>dd4t-parent</artifactId>
         <groupId>org.dd4t</groupId>
-        <version>2.1.4-DXA17</version>
+        <version>2.1.5-DXA18</version>
     </parent>
 
     <artifactId>dd4t-databind</artifactId>
-    <version>2.1.4-DXA17</version>
+    <version>2.1.5-DXA18</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Contains deserialization functionality of datasources.</description>
     <url>https://github.com/dd4t</url>
diff --git a/local-project-repo/org/dd4t/dd4t-parent/2.1.4-DXA17/dd4t-parent-2.1.4-DXA17.pom b/local-project-repo/org/dd4t/dd4t-parent/2.1.5-DXA18/dd4t-parent-2.1.5-DXA18.pom
similarity index 98%
rename from local-project-repo/org/dd4t/dd4t-parent/2.1.4-DXA17/dd4t-parent-2.1.4-DXA17.pom
rename to local-project-repo/org/dd4t/dd4t-parent/2.1.5-DXA18/dd4t-parent-2.1.5-DXA18.pom
index c3b1dab26..06693c3eb 100644
--- a/local-project-repo/org/dd4t/dd4t-parent/2.1.4-DXA17/dd4t-parent-2.1.4-DXA17.pom
+++ b/local-project-repo/org/dd4t/dd4t-parent/2.1.5-DXA18/dd4t-parent-2.1.5-DXA18.pom
@@ -7,7 +7,7 @@
     <groupId>org.dd4t</groupId>
     <artifactId>dd4t-parent</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.4-DXA17</version>
+    <version>2.1.5-DXA18</version>
     <modules>
         <module>dd4t-api</module>
         <module>dd4t-core</module>
@@ -66,15 +66,14 @@
         <commons-codec.version>1.8</commons-codec.version>
         <commons-lang3.version>3.3.2</commons-lang3.version>
 
-        <spring.version>3.2.0.RELEASE</spring.version>
+        <spring.version>4.3.5.RELEASE</spring.version>
         <logback.version>1.0.13</logback.version>
         <slf4j.version>1.6.4</slf4j.version>
         <joda-time.version>2.2</joda-time.version>
         <guava.version>17.0</guava.version>
         <javax.servlet-api.version>3.0.1</javax.servlet-api.version>
-        <spring.version>3.2.0.RELEASE</spring.version>
         <hibernate.version>4.0.1.Final</hibernate.version>
-        <jackson.version>2.8.3</jackson.version>
+        <jackson.version>2.8.5</jackson.version>
         <woodstox.version>4.4.1</woodstox.version>
         <javax.jms.version>1.1-rev-1</javax.jms.version>
 
diff --git a/local-project-repo/org/dd4t/dd4t-providers/2.1.4-DXA17/dd4t-providers-2.1.4-DXA17.jar b/local-project-repo/org/dd4t/dd4t-providers/2.1.5-DXA18/dd4t-providers-2.1.5-DXA18.jar
similarity index 83%
rename from local-project-repo/org/dd4t/dd4t-providers/2.1.4-DXA17/dd4t-providers-2.1.4-DXA17.jar
rename to local-project-repo/org/dd4t/dd4t-providers/2.1.5-DXA18/dd4t-providers-2.1.5-DXA18.jar
index 77ba4af71f0c77f195582a2b26f78f11a0d52a71..017b5fa1241f90cbbcb04e3a40a9b9475b5ab177 100644
GIT binary patch
delta 1324
zcmX@t&v><;kuSiTnT3l11m0(Rc}?U~W_bsqO&73$`8VYt^lxQB5Fe}%N(fI*U=%~s
zKRKAu2&`dqC*vb_2rHlSI5&i4CHjyB!jhLd#0OzL)d+#g+M4WV1&eL6DrN>VCYRf4
zLKsVIA;wO=W$P&T9Ow|;XJOmlGchnM;$&dZo4nChda}K{SpC`1+j&xk0=4~9>Nf<)
z?=}n2ay@ZV<&<l$m!8&=Q>!<db)Q_fchgzbm7m^!t;%o9<9Hi9(c#CBGiPRgtmyH-
zmdP~DCsXfe;d1ufvIksLG{rv_K2IzXl_~W*beMULre*p>#%X$A3fBHCOi%MMbII5m
zb?~aVMrhBkyLtS!_j-=iU+h_`^1w-2N$HxU4a3#rH?MEgj5K2ObX(K-xuCwhnQcRM
z>JPJ7{9B7HCkYz*y=><@P~Ee28LNba+?LmV5iW-%1AS&}=<Mw@s_{}P_I37RSJRM?
zsN8Y9Z)!}6*rvh+zvC;MY=R=+Zs4!}kX`Vx;+plL6-?fW8P1%3s;MW>*H3zslDwsH
zs*PiiSlzEsIWe8){k+mEF8*zsxOn=qDK9-f>a5SJSpQ^F@M|fbrA)zTi)OxMHwc__
zD_6iXag7DXx;J{>^Cgz{G_|T3HcR~M^SaMHwdH4FMzx%w`R1d-Jt<vXTu*1Wv#T0E
z6cnD7xj#<znWOKz$&$?J?{W^VSWsKfmg?(Zzkbs6q}<4pnzOIJ?$xr9ik%;SuTP)(
zHS?^}wVTQs&0Mc$-(BK#bCRmj=A@d#Qn|j*+j}g7ALKcH_3=`@_4Ri5fyn`udQ(Kd
zo1A;NXM==jkFN1-1;Ia8V;6jQlw@!)gZY+Y{f*Lw+b;Wka$nYkFdqum)cA4kQjg)@
z)%7grS)YaodL`-o|9r>xNVc%-(tT6+MjyI&IcD-*$y*ISzi;8RDVccJ{{sKB6wd{B
zkDM^h(f;~#|F7K74_HsUKU&u}OS&a+@|XF{+h*D78ecp2{Kd_ATRIL~2L7C|W?HG`
z+MQRkemvtaJo=>R>Xf%noA*oi<ez_c{QkQf;~Zg|=;`&2xg2lT+;e!<_?CU0yTdV-
zt?yq>n<G_!GjC6=+=OeJT!S{2$EhA)|HMq+v2#!Ee%sL1+dS?B@9<mJ{L}7~tf7Kr
z{d?QHQ$B_}<)}OP3hzkr|LxIPu_^xNHmjvuYt9|nlcICxQ|FU^Z*|tOi>`h2OVfVY
z2Xj~k=3scw0n8X(ouQJ&lcOBN>dUlGg%o)E1{s(H7?^A`GTUObDWsr`H_*Vyz~uQ;
zEpJ_|b7#(PHoatg#rSGzXMxF<2T#59PwDG^@Y#4)-|M=!r=jM<r(QZ*Cw;tq^ccCC
zSW39NKAkoSZm6o<$q?Yp$RxsyC^(P{24I#1g2}p0ir}(ja*&f9Bo|L{(t|Lhouno|
zaFT>@{yN!07<SH15Jro0421E-IUB+Vc8P*8Ho_SEu89zl64y8g<C<$Ygkk7r31Q^9
tK@HsE7RZZIYD^Y#_m>A1XyD)iy0#36O+n6vf+dYUlN;PU*o2%w0s#7~Gy(ts

delta 1290
zcmccG&v>q%kuSiTnT3l11lY>@JSXxgv#^3_(*-PG{!KXu{aaZO#0M*c62g-c7{$=^
zPYz}@0&CdZ$@qvJ!pi47&JAH%i9Te3u;ir<@j+NmHA0}WwkG>o!D5@NikZQT$>p}1
z5XKT)h_RDz**XgTD(&-p-W+)36%zx)TuufCy~!JGr6;@FNz}*s-!>4bb$?_ZaaB&-
z`mGgjs9M912^UT|EcV$m>xOTvkoBg!{AM5TKevd_6ZhJ_T(R-Q$DQBh<m2NXPcEI-
zq#8WSyYSBI!yDLVbf`X6vV3Rjv#x3JJ<pPghGNy{I%WqhwaTqEwSRZE=cGHw+A!@M
zzgU)fT~Ofp{o-R<jr{qDdN(G$Es9EMdk-@Q{NM3I%}m)_P2prGZ-L~yy!;CSZDDQl
zi+_6To{}sn{CLW~*$jJ*Mr21dH9mIyeYg8mmW6s3r|{OThJkJVo;m9>U0z;bQDs)<
z|9+!$QuiIFZG1W}B(8S2ue#I6wt>I>;L*pC|GC{vBRCzUy$aMcz3W3n)a#`e^R9Ws
zIcejI!|PvdNC^E?dc|q&yYL>Fy<AIuj(0t8-F<QHByYdmEQ6_BJ~KPhx5*!HDa@Mg
zsMEUfk;0Bmt97cArWkRF%~Ih>dZNCnNIyhM^!UQJl`416i1`~#lhl&c665FBN;{RT
zW^#F7yy!E>w{hymZ0GLWY%28p&7tLAe_%nu$=gZ7k*8PAy8gO%myJ~X{P?=v`+0Ks
zGOqQWQe(X(a<%4lnf4UjNUdV+WBfT6&b_Uf&Y8}2M{mVE&y_CQ>#7ASq%@DWZhAIP
zjWtH1JMiQUuFcXaP5(>8HFoWg@H4p8P<BDSO!k4<#qBGzcfYT6s8C~NjgOpWysSL(
zLri^;pXfrBho9{4?{2TiUG(@&|E6;98`V)6o3xdqH~g^8<?fG3{jM&-QoKp!f?m=S
z*0RXjf9orE8&$A&Rd0-6^o=d?O5U&YjM3-k^+{$wFaDF`AEk0}&Wa?DYx8^On%&7V
zttoDqQB-uW>Xh8U^9DS>5-VCRew!u!?8x;B`KV89^_R|M?N2NIU97gE)@%C|lOLzc
z&cFR!R$?XQee_<%1eyKQZrd@5e%kf-&6U_&iiQ3Ut>*GQ|E*Deq~Xb*waZI_kHvFt
z^yM)1eb{CDR$2Ag%ers5rC!Tx^^WX$qI0S{@yWm2nd{i6u6^`trNy!r=CGX00nWJw
zTNKP03n#}rhGp}y7sUom7Ul76IC1L8p;H$E4&F3%Ie6m0g`VlFb+)dsFt$H`&EtH)
zd6(;|hb~^2GhKVH#{Mk_jE|b_*ND|uJ-Vc2y7tBuD#p5oJ6SY1gf8f6oYFt-!}#jy
zQznK0Z$>5&W<+^0`K*)FWE&?*aG^0d(#Z~zU1vM#K^SM9j3EpbXIluv)!7Nc=yr~Q
zFkU-nLl{vmQ4q!s7(>i85h7CU8V6zAbq$9wEZi(1j8ZqKfxF!Tc~Odn$&&8=oS;$*
g6gGvE3*AMT+#M%Rbdv&>6~dFZx=XQfJAukF03lEtL;wH)

diff --git a/local-project-repo/org/dd4t/dd4t-providers/2.1.4-DXA17/dd4t-providers-2.1.4-DXA17.pom b/local-project-repo/org/dd4t/dd4t-providers/2.1.5-DXA18/dd4t-providers-2.1.5-DXA18.pom
similarity index 95%
rename from local-project-repo/org/dd4t/dd4t-providers/2.1.4-DXA17/dd4t-providers-2.1.4-DXA17.pom
rename to local-project-repo/org/dd4t/dd4t-providers/2.1.5-DXA18/dd4t-providers-2.1.5-DXA18.pom
index 066d26b47..8dbaf62b6 100644
--- a/local-project-repo/org/dd4t/dd4t-providers/2.1.4-DXA17/dd4t-providers-2.1.4-DXA17.pom
+++ b/local-project-repo/org/dd4t/dd4t-providers/2.1.5-DXA18/dd4t-providers-2.1.5-DXA18.pom
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dd4t-parent</artifactId>
         <groupId>org.dd4t</groupId>
-        <version>2.1.4-DXA17</version>
+        <version>2.1.5-DXA18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>${project.groupId}:${project.artifactId}</name>
@@ -43,7 +43,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <tridion.version>8.5.0-1008</tridion.version>
+        <tridion.version>10.0.0-SNAPSHOT</tridion.version>
         <java.version>1.8</java.version>
     </properties>
 

From 11afc120a707c06a07287c9a584250fc9deeb9a1 Mon Sep 17 00:00:00 2001
From: Alexey Zarakovskiy <azarakovskiy@sdl.com>
Date: Wed, 20 Sep 2017 16:50:33 +0200
Subject: [PATCH 13/42] TSI-2764 Update CIL to UDP CIL 10.1 (TSI-2649)

---
 dxa-bom/pom.xml                               |   6 +++---
 dxa-framework/dxa-web8-provider/pom.xml       |   2 +-
 .../dd4t-api-2.0.15.2-DXA18.jar}              | Bin 42280 -> 42286 bytes
 .../dd4t-api-2.0.15.2-DXA18.pom}              |   4 ++--
 .../dd4t-core-2.0.15.2-DXA18.jar}             | Bin 97691 -> 97696 bytes
 .../dd4t-core-2.0.15.2-DXA18.pom}             |   2 +-
 .../dd4t-databind-2.0.15.2-DXA18.jar}         | Bin 35382 -> 35385 bytes
 .../dd4t-databind-2.0.15.2-DXA18.pom}         |   4 ++--
 .../dd4t-parent-2.0.15.2-DXA18.pom}           |   2 +-
 .../dd4t-providers-2.0.15.2-DXA18.jar}        | Bin 18389 -> 18397 bytes
 .../dd4t-providers-2.0.15.2-DXA18.pom}        |   6 +++---
 11 files changed, 13 insertions(+), 13 deletions(-)
 rename local-project-repo/org/dd4t/dd4t-api/{2.1.5-DXA18/dd4t-api-2.1.5-DXA18.jar => 2.0.15.2-DXA18/dd4t-api-2.0.15.2-DXA18.jar} (70%)
 rename local-project-repo/org/dd4t/dd4t-api/{2.1.5-DXA18/dd4t-api-2.1.5-DXA18.pom => 2.0.15.2-DXA18/dd4t-api-2.0.15.2-DXA18.pom} (96%)
 rename local-project-repo/org/dd4t/dd4t-core/{2.1.5-DXA18/dd4t-core-2.1.5-DXA18.jar => 2.0.15.2-DXA18/dd4t-core-2.0.15.2-DXA18.jar} (87%)
 rename local-project-repo/org/dd4t/dd4t-core/{2.1.5-DXA18/dd4t-core-2.1.5-DXA18.pom => 2.0.15.2-DXA18/dd4t-core-2.0.15.2-DXA18.pom} (99%)
 rename local-project-repo/org/dd4t/dd4t-databind/{2.1.5-DXA18/dd4t-databind-2.1.5-DXA18.jar => 2.0.15.2-DXA18/dd4t-databind-2.0.15.2-DXA18.jar} (84%)
 rename local-project-repo/org/dd4t/dd4t-databind/{2.1.5-DXA18/dd4t-databind-2.1.5-DXA18.pom => 2.0.15.2-DXA18/dd4t-databind-2.0.15.2-DXA18.pom} (98%)
 rename local-project-repo/org/dd4t/dd4t-parent/{2.1.5-DXA18/dd4t-parent-2.1.5-DXA18.pom => 2.0.15.2-DXA18/dd4t-parent-2.0.15.2-DXA18.pom} (99%)
 rename local-project-repo/org/dd4t/dd4t-providers/{2.1.5-DXA18/dd4t-providers-2.1.5-DXA18.jar => 2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.jar} (83%)
 rename local-project-repo/org/dd4t/dd4t-providers/{2.1.5-DXA18/dd4t-providers-2.1.5-DXA18.pom => 2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.pom} (93%)

diff --git a/dxa-bom/pom.xml b/dxa-bom/pom.xml
index 1f91efcc4..4c5bbed23 100644
--- a/dxa-bom/pom.xml
+++ b/dxa-bom/pom.xml
@@ -45,8 +45,8 @@
     </developers>
 
     <properties>
-        <dd4t.version>2.1.5-DXA18</dd4t.version>
-        <cd-cil.version>10.0.0-SNAPSHOT</cd-cil.version>
+        <dd4t.version>2.0.15.2-DXA18</dd4t.version>
+        <cd-cil.version>10.1.0-SNAPSHOT</cd-cil.version>
 
         <!-- DXA versions -->
         <dxa.version>${project.version}</dxa.version>
@@ -153,7 +153,7 @@
             </dependency>
 
             <dependency>
-                <groupId>com.sdl.web</groupId>
+                <groupId>com.sdl.delivery</groupId>
                 <artifactId>cil</artifactId>
                 <version>${cd-cil.version}</version>
                 <type>pom</type>
diff --git a/dxa-framework/dxa-web8-provider/pom.xml b/dxa-framework/dxa-web8-provider/pom.xml
index 3725e41d6..c750f136e 100644
--- a/dxa-framework/dxa-web8-provider/pom.xml
+++ b/dxa-framework/dxa-web8-provider/pom.xml
@@ -50,7 +50,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.sdl.web</groupId>
+            <groupId>com.sdl.delivery</groupId>
             <artifactId>cil</artifactId>
             <type>pom</type>
         </dependency>
diff --git a/local-project-repo/org/dd4t/dd4t-api/2.1.5-DXA18/dd4t-api-2.1.5-DXA18.jar b/local-project-repo/org/dd4t/dd4t-api/2.0.15.2-DXA18/dd4t-api-2.0.15.2-DXA18.jar
similarity index 70%
rename from local-project-repo/org/dd4t/dd4t-api/2.1.5-DXA18/dd4t-api-2.1.5-DXA18.jar
rename to local-project-repo/org/dd4t/dd4t-api/2.0.15.2-DXA18/dd4t-api-2.0.15.2-DXA18.jar
index 43fb512709ede7fc640a731bc0ee361a46ceb5c4..08c9f5509ae3de0fe66d90fb48aa20180f4bc65c 100644
GIT binary patch
delta 2879
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

delta 2943
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
W0ZC1{v3YQam5_F`nxZCO>ijpfN4shO

diff --git a/local-project-repo/org/dd4t/dd4t-api/2.1.5-DXA18/dd4t-api-2.1.5-DXA18.pom b/local-project-repo/org/dd4t/dd4t-api/2.0.15.2-DXA18/dd4t-api-2.0.15.2-DXA18.pom
similarity index 96%
rename from local-project-repo/org/dd4t/dd4t-api/2.1.5-DXA18/dd4t-api-2.1.5-DXA18.pom
rename to local-project-repo/org/dd4t/dd4t-api/2.0.15.2-DXA18/dd4t-api-2.0.15.2-DXA18.pom
index f01261d71..7c6b6e0f7 100644
--- a/local-project-repo/org/dd4t/dd4t-api/2.1.5-DXA18/dd4t-api-2.1.5-DXA18.pom
+++ b/local-project-repo/org/dd4t/dd4t-api/2.0.15.2-DXA18/dd4t-api-2.0.15.2-DXA18.pom
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>dd4t-parent</artifactId>
         <groupId>org.dd4t</groupId>
-        <version>2.1.5-DXA18</version>
+        <version>2.0.15.2-DXA18</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
     <artifactId>dd4t-api</artifactId>
-    <version>2.1.5-DXA18</version>
+    <version>2.0.15.2-DXA18</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Contains the dd4t interfaces and content model.</description>
diff --git a/local-project-repo/org/dd4t/dd4t-core/2.1.5-DXA18/dd4t-core-2.1.5-DXA18.jar b/local-project-repo/org/dd4t/dd4t-core/2.0.15.2-DXA18/dd4t-core-2.0.15.2-DXA18.jar
similarity index 87%
rename from local-project-repo/org/dd4t/dd4t-core/2.1.5-DXA18/dd4t-core-2.1.5-DXA18.jar
rename to local-project-repo/org/dd4t/dd4t-core/2.0.15.2-DXA18/dd4t-core-2.0.15.2-DXA18.jar
index 48d32fca3aac8b5724f8a832483e7f26a3165f2a..4a8b4316ea94b48a1e92bbc61b2974893c2f488c 100644
GIT binary patch
delta 3306
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

delta 3298
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

diff --git a/local-project-repo/org/dd4t/dd4t-core/2.1.5-DXA18/dd4t-core-2.1.5-DXA18.pom b/local-project-repo/org/dd4t/dd4t-core/2.0.15.2-DXA18/dd4t-core-2.0.15.2-DXA18.pom
similarity index 99%
rename from local-project-repo/org/dd4t/dd4t-core/2.1.5-DXA18/dd4t-core-2.1.5-DXA18.pom
rename to local-project-repo/org/dd4t/dd4t-core/2.0.15.2-DXA18/dd4t-core-2.0.15.2-DXA18.pom
index 8661917f2..232794167 100644
--- a/local-project-repo/org/dd4t/dd4t-core/2.1.5-DXA18/dd4t-core-2.1.5-DXA18.pom
+++ b/local-project-repo/org/dd4t/dd4t-core/2.0.15.2-DXA18/dd4t-core-2.0.15.2-DXA18.pom
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dd4t-parent</artifactId>
         <groupId>org.dd4t</groupId>
-        <version>2.1.5-DXA18</version>
+        <version>2.0.15.2-DXA18</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/local-project-repo/org/dd4t/dd4t-databind/2.1.5-DXA18/dd4t-databind-2.1.5-DXA18.jar b/local-project-repo/org/dd4t/dd4t-databind/2.0.15.2-DXA18/dd4t-databind-2.0.15.2-DXA18.jar
similarity index 84%
rename from local-project-repo/org/dd4t/dd4t-databind/2.1.5-DXA18/dd4t-databind-2.1.5-DXA18.jar
rename to local-project-repo/org/dd4t/dd4t-databind/2.0.15.2-DXA18/dd4t-databind-2.0.15.2-DXA18.jar
index de45e68c8aded1d2ca117a2ce352e1dd9582b38a..bc65d72fa9991d285ec9324d7952127e074d9ab3 100644
GIT binary patch
delta 2046
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
V^XR`NLDrOgkUU!%eK~n!<WFzhSx5i?

delta 2039
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
N2rD*5m!~R}{{sv_Sg!y8

diff --git a/local-project-repo/org/dd4t/dd4t-databind/2.1.5-DXA18/dd4t-databind-2.1.5-DXA18.pom b/local-project-repo/org/dd4t/dd4t-databind/2.0.15.2-DXA18/dd4t-databind-2.0.15.2-DXA18.pom
similarity index 98%
rename from local-project-repo/org/dd4t/dd4t-databind/2.1.5-DXA18/dd4t-databind-2.1.5-DXA18.pom
rename to local-project-repo/org/dd4t/dd4t-databind/2.0.15.2-DXA18/dd4t-databind-2.0.15.2-DXA18.pom
index 431c2da10..ee547004a 100644
--- a/local-project-repo/org/dd4t/dd4t-databind/2.1.5-DXA18/dd4t-databind-2.1.5-DXA18.pom
+++ b/local-project-repo/org/dd4t/dd4t-databind/2.0.15.2-DXA18/dd4t-databind-2.0.15.2-DXA18.pom
@@ -7,11 +7,11 @@
     <parent>
         <artifactId>dd4t-parent</artifactId>
         <groupId>org.dd4t</groupId>
-        <version>2.1.5-DXA18</version>
+        <version>2.0.15.2-DXA18</version>
     </parent>
 
     <artifactId>dd4t-databind</artifactId>
-    <version>2.1.5-DXA18</version>
+    <version>2.0.15.2-DXA18</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Contains deserialization functionality of datasources.</description>
     <url>https://github.com/dd4t</url>
diff --git a/local-project-repo/org/dd4t/dd4t-parent/2.1.5-DXA18/dd4t-parent-2.1.5-DXA18.pom b/local-project-repo/org/dd4t/dd4t-parent/2.0.15.2-DXA18/dd4t-parent-2.0.15.2-DXA18.pom
similarity index 99%
rename from local-project-repo/org/dd4t/dd4t-parent/2.1.5-DXA18/dd4t-parent-2.1.5-DXA18.pom
rename to local-project-repo/org/dd4t/dd4t-parent/2.0.15.2-DXA18/dd4t-parent-2.0.15.2-DXA18.pom
index 06693c3eb..985a67152 100644
--- a/local-project-repo/org/dd4t/dd4t-parent/2.1.5-DXA18/dd4t-parent-2.1.5-DXA18.pom
+++ b/local-project-repo/org/dd4t/dd4t-parent/2.0.15.2-DXA18/dd4t-parent-2.0.15.2-DXA18.pom
@@ -7,7 +7,7 @@
     <groupId>org.dd4t</groupId>
     <artifactId>dd4t-parent</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.5-DXA18</version>
+    <version>2.0.15.2-DXA18</version>
     <modules>
         <module>dd4t-api</module>
         <module>dd4t-core</module>
diff --git a/local-project-repo/org/dd4t/dd4t-providers/2.1.5-DXA18/dd4t-providers-2.1.5-DXA18.jar b/local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.jar
similarity index 83%
rename from local-project-repo/org/dd4t/dd4t-providers/2.1.5-DXA18/dd4t-providers-2.1.5-DXA18.jar
rename to local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.jar
index 017b5fa1241f90cbbcb04e3a40a9b9475b5ab177..3fc594b50505316c683c6380c7858f42c063b8c8 100644
GIT binary patch
delta 1366
zcmccG&v>_=kuSiTnT3l11g3Nvc~9h1W|<74O&73$`8VYt^lxQB5Fe}%N(fI*U=%~s
zKRKAu2&`dqC*vb_2rHlSI5&i4CHjyB!jhLd#0OzL)d+#g+M4WV1&eL6DrN>VCYRf4
zLKsVIA;wO=W$P%|3Uo-(-0%Khm>3vVaWXLIP2OlLJ=xt(qCVRHwt+~U`y=~^t8(JI
z-&%2oDmLuMxV$5CN@uw6?v>t2?%Qr3Qv3JYZ_e!7t(V?rdMJGQY5lzB`J=}lURZix
zoRqCR#pVrf!T$CgJ)*)!mT&I*>oqms3*53_{8`l5${fK9OC{~43vbMhoZZhExi+lg
zE2s9{35omd75Kxamw)W3Pd5>`6rq)T@AiG?ul<|zbBuRA5xP95squ3`b+N144t}E=
zY2{<bcJ2u=-0JsoH{XTmp7g_B1_d@e_xG;o5qlO=oVnPn%wwx)u+;7KI!QSx&65O$
z_`l!i4C|Ir=xFAy^2j=(9D22{O`zt3B!Bbf_Q?kwJ+k&(a=Lb;WoDAi-}=D7IiDu1
zNfh<J)Z;E+7y9>5=%4F_+*>cjJ3o3cRr9ghH6?v6nY&qAMR;Nsue_9TD%YlYqJyxm
zgv{ayPwqzsyBdP$*%lqMaOQRv?sI-*y{bmPL`qcF@WLdQ8#f;b9@kP%o!E8w@7}JN
zT{FB7_r`DH`n<sG`pKTf!q?+UA}`t1FIuIR5fO6Id*jA6PeVSx?sb=)7gJ|zyMLcG
zf0x<K=WeNwo7Qw^?em?@_1JsfDw!ic+IVlxJXb!IW8KBGO*3Z(MU}m7->q=T!&)!Q
z^t*-TgGCz@H6^9fCMZmOw0yVo#hW)XgeIA0aR04~W;XAvo4M;!?RvJ56fdJMz3G<E
z)1vD+=XsslxU5Ib>F@KM)g9()YUgUScSH-l%UsCmcT8Zz58FKE{@9f7>Jn_lyOv1s
zIX{vtoBHcZ{NJ+54@@H8lg!=U@^X33{xaWs+dW&^Y_YJCKP+>nd73QW6*1{+da$1X
z``WNI>jk3o^kVXFGU~+N;eWTzKkxm%I|mGMglwXx*E=S6B!;h7JbUOHv$?jy^GOFM
z?^0ZTFy4$kf4cdS%{dz{{poE#`7wLvTkinH^|SN+ZCA+(m5bzEdYQ4WyU3j<L+@Ty
z(Dl?mQw3(Y<V18moG3Ek!D+p!q>1ms4)+$mT(i)4qrPSTrzG8-|F?zRXg*b0=p6b*
z>lZI94-0dEGcn)63v<hWnY0RsO`&;1xW1q$zaX`!Br~;G^z=rqLk0p27i=fgTfDe)
zq1(%OVe^U(=jB#A+}=lRQhC_J`2XH6yNa_@mAmzQKKwcKMB9DsEKS!LmdsWM>Kv@!
z$js6EESuB5H*D%t*&vy<FL~s8a?kfGTdfWAoL{rp@MKoUH&<<aRh@sKW`CS#t6p`8
zzWz#(J;0lhNrV|u)=WO@BsJN_NfKP(OpbK2gJkvDPI?f=Stnx%gT>hv!f<tVf-t(B
zV<3#z&e;$~luHzZu>-~sb4`SZRJ+DO7<XO6Aq)#QO9-RX4Qk+Sw?JN$Vr8<VyT1ac
g#6t;8q~dQ$W1!>YiEdKBaz}XbR(B~jDJPID04i@jL;wH)

delta 1345
zcmccH&v><;kuSiTnT3l11m0(Rc}?U~W_bsqO&73$`8VYt^lxQB5Fe}%N(fI*U=%~s
zKRKAu2&`dqC*vb_2rHlSI5&i4CHjyB!jhLd#0OzL)d+#g+M4WV1&eL6DrN>VCYRf4
zLKsVIA;wO=W$P&T9Ow|;XJOmlGchnM;$&dZo4nChda|FpSpC`1+j&xk0=4~9>Nf<)
z?=}n2ay@ZV<&<l$m!8&=Q>!<db)Q_fchgzbm7m^!t;%o9<9Hi9(c#CBGiPRgtmyH-
zmdP~DCsXfe;d1ufvIksLG{rv_K2IzXl_~W*beMULre*p>#%X$A3fBHCOi%MMbII5m
zb?~aVMrhBkyLtS!_j-=iU+h_`^1w-2N$HxU4a3#rH?MEgj5K2ObX(K-xuCwhnQcRM
z>JPJ7{9B7HCkYz*y=><@P~Ee28LNba+?LmV5iW-%1AS&}=<Mw@s_{}P_I37RSJRM?
zsN8Y9Z)!}6*rvh+zvC;MY=R=+Zs4!}kX`Vx;+plL6-?fW8P1%3s;MW>*H3zslDwsH
zs*PiiSlzEsIWe8){k+mEF8*zsxOn=qDK9-f>a5SJSpQ^F@M|fbrA)zTi)OxMHwc__
zD_6iXag7DXx;J{>^Cgz{G_|T3HcR~M^SaMHwdH4FMzx%w`R1d-Jt<vXTu*1Wv#T0E
z6cnD7xj#<znWOKz$&$?J?{W^VSWsKfmg?(Zzkbs6q}<4pnzOIJ?$xr9ik%;SuTP)(
zHS?^}wVTQs&0Mc$-(BK#bCRmj=A@d#Qn|j*+j}g7ALKcH_3=`@_4Ri5fyn`udQ(Kd
zo1A;NXM==jkFN1-1;Ia8V;6jQlw@!)gZY+Y{f*Lw+b;Wka$nYkFdqum)cA4kQjg)@
z)%7grS)YaodL`-o|9r>xNVc%-(tT6+MjyI&IcD-*$y*ISzi;8RDVccJ{{sKB6wd{B
zkDM^h(f;~#|F7K74_HsUKU&u}OS&a+@|XF{+h*D78ecp2{Kd_ATRIL~2L7C|W?HG`
z+MQRkemvtaJo=>R>Xf%noA*oi<ez_c{QkQf;~Zg|=;`&2xg2lT+;e!<_?CU0yTdV-
zt?yq>n<G_!GjC6=+=OeJT!S{2$EhA)|HMq+v2#!Ee%sL1+dS?B@9<mJ{L}7~tf7Kr
z{d?QHQ$B_}<)}OP3hzkr|LxIPu_^xNHmjvuYt9|nlcICxQ|FU^Z*|tOi>`h2OVfVY
z2Xj~k=3sa)0L&O&ouQJ&z#Liz#HP@UAv}4nJ6C;hng3aDT`wI^-$0L5As>8oyw5&<
z8dRozDx|>MH^{&wz`$gik=YibO(6wkynzNr1}4v+YI*BwojY@Wv*{({E5=t#I}1#<
zJb3D*e@b8XgU`mZ`d-()Jq<M<KK0VkI_cx>qsPeA#8SfD_35-xa6?t)PKE$)MkWzv
zNbv&6$XZUu-~wiHqLUp&WU-STOiF6<dnZW<hsW6#!tix=f-ojK$3PgLowFf~B$p@%
z;{c2y=b8u+X?Bf+FrK=GLl_QjmJmj*8`QwVZh^cgMag7EcYk?MDTfk<NJZX~MxV+3
L?jCGHP9Q-5q^d!C

diff --git a/local-project-repo/org/dd4t/dd4t-providers/2.1.5-DXA18/dd4t-providers-2.1.5-DXA18.pom b/local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.pom
similarity index 93%
rename from local-project-repo/org/dd4t/dd4t-providers/2.1.5-DXA18/dd4t-providers-2.1.5-DXA18.pom
rename to local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.pom
index 8dbaf62b6..e20b566be 100644
--- a/local-project-repo/org/dd4t/dd4t-providers/2.1.5-DXA18/dd4t-providers-2.1.5-DXA18.pom
+++ b/local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.pom
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dd4t-parent</artifactId>
         <groupId>org.dd4t</groupId>
-        <version>2.1.5-DXA18</version>
+        <version>2.0.15.2-DXA18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>${project.groupId}:${project.artifactId}</name>
@@ -43,7 +43,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <tridion.version>10.0.0-SNAPSHOT</tridion.version>
+        <tridion.version>10.1.0-SNAPSHOT</tridion.version>
         <java.version>1.8</java.version>
     </properties>
 
@@ -59,7 +59,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.sdl.web</groupId>
+            <groupId>com.sdl.delivery</groupId>
             <artifactId>cil</artifactId>
             <version>${tridion.version}</version>
             <type>pom</type>

From 12899a4d6a782d8983d3b130dfa733e63bb3610c Mon Sep 17 00:00:00 2001
From: Alexey Zarakovskiy <azarakovskiy@sdl.com>
Date: Mon, 2 Oct 2017 15:09:14 +0200
Subject: [PATCH 14/42] TSI-2764 Update UDP to 10.1.0-1004 (TSI-2649)

---
 dxa-bom/pom.xml                               |   2 +-
 .../dd4t-api-2.0.15.2-DXA18.jar               | Bin 42286 -> 42286 bytes
 .../dd4t-core-2.0.15.2-DXA18.jar              | Bin 97696 -> 97697 bytes
 .../dd4t-databind-2.0.15.2-DXA18.jar          | Bin 35385 -> 35386 bytes
 .../dd4t-providers-2.0.15.2-DXA18.jar         | Bin 18397 -> 18393 bytes
 .../dd4t-providers-2.0.15.2-DXA18.pom         |   2 +-
 6 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dxa-bom/pom.xml b/dxa-bom/pom.xml
index 4c5bbed23..383f55f52 100644
--- a/dxa-bom/pom.xml
+++ b/dxa-bom/pom.xml
@@ -46,7 +46,7 @@
 
     <properties>
         <dd4t.version>2.0.15.2-DXA18</dd4t.version>
-        <cd-cil.version>10.1.0-SNAPSHOT</cd-cil.version>
+        <cd-cil.version>10.1.0-1004</cd-cil.version>
 
         <!-- DXA versions -->
         <dxa.version>${project.version}</dxa.version>
diff --git a/local-project-repo/org/dd4t/dd4t-api/2.0.15.2-DXA18/dd4t-api-2.0.15.2-DXA18.jar b/local-project-repo/org/dd4t/dd4t-api/2.0.15.2-DXA18/dd4t-api-2.0.15.2-DXA18.jar
index 08c9f5509ae3de0fe66d90fb48aa20180f4bc65c..68e17f6f5a6936b889cef88456cad263b713c8ce 100644
GIT binary patch
delta 1724
zcmYLIe@v5C6z$iqj3Q|xsAC-?wTiT~0;Pb0b24!ZW|2~)qLm8jU|E)IZn9cLot?9k
zLV@!5B~V*hrqM++(zrjige6PN7UtZHW-^^)OHdPIf*2!g*|N3weB1iZIrp6N?!E8J
z>%}SY#VN6@%E(KWh+@ALhe~|1bbfgh^2Z3Kl>~o~$W&ZztYj80lh7&DdS1ysElgl{
zxFw`N;PMGo;yj^NvLD>C#DC|+dN?^HyC6;$a!NL7O=J(n2~;nN3kdbRfv}O!CL91p
zzUH$y5*8$jNzrD;c?~PS6}><UClaMIl}f?tI^<0K%xo+bk;nH*h<u#*u9%2I&Vi&Y
zO`%Sa^+}sR9LZ}z&Mqs9qapLp{Ym&p@t6+ZeO`{l)6`@lEHUjja^}+Z!?7s8fU``6
zGtyOV2yFGY6y2NtCN}skqX<rdW|EvK&4&<7+Uc0Uw7Sb=Jl09bi2S~`3W<vByYkre
zCsTg38{$Nw*#zdST+V`=l&#E)i!|iCN;im{%df*p={gst`U-VWzAXBTNZ9croYt3S
z;Mj_P1$lY%ParRBF(6|uy$vO&Y!O8Jngmv^QB4ZlUGadnF5f0hvR4|A{ls(`k%Q*H
zDe`{x8aV##@gQewvO%UTN2o8W-8n_s^j!`(0c$nLlildcGHp*OvTDy^AyR(^OO@|4
z@nj7*T460T+3+N4-#Ra)Z+NgFX}l@=gpP>V$`%ECJDAKiG#{W-7n+aaRF?e>kikQ(
zAS+t%5+kLDFG2aM)eK@j+640XF)zs0<Lfy-`X6H-Ikkin&b$~#?mLh3(kL-Dp1boE
zd*`HO=_6CNS+B3w=T8_4B8J>5cH?9X9nrb)*V^YQj_t<AT{(n0S1Ox#DTvG3HWQlL
ziU_?zeXXs8>Sx`r5YB`Z%<k3_4-1;CEtSQ!XZ+`vwZm_2FD30-)W6xTCeC>_37E=k
zp4G%pc(xH<_m~OQ9VWt-jy;68I;se>I_n5KJ9iS^@2ntP=SAM_Meeq@mh^(IYC=yJ
z`u-x+dEGV8yN!g?-IauyJ?Q7?LH<h5F48qV<m|rfRA2F-ud3Hd^|4;;f3?>_bq2#e
z4u<?yhJ7@B*srw@x$AxCqv_v4=bZhx*U$avTQpEl`pCe3LT<2u@b$sHgx?I}d#H!7
z=ZPWs_lD4~_>_%ufm4ly@xz#J9mf49hS4`=1asdT!MqzI*jqb_{XQ7QzBdKT@nde6
zANoB%=9iqtJx5RDdps0yV*vh80CVR8TWOz-LG05V#GKh6zI)*q?l(FHe@?)X5cc$k
gFlQlzyfKV-9tv-u_dXNeLbzr;^#4EP`|<jJ074Zn4*&oF

delta 1724
zcmYjQZA?>V80~G#D3UgUZmeUZRx2&V0+y=aoJ<^pS%em;Xr+QWSe7OGl66JY**W_K
z1<K2pKy7K6W?M9K-AA$|?3dZXoSV^1)NO1DYGO<nW)Ze**?OOIv#o#5d7g9L=Q;1~
zz2~OH=cdGRi&-LFBI18uzcD1&NIXd}jZ64yT1D`Oh6kqR))LydJVLin7fDp?gOW7%
zBe#V5cR3UM;$opzvG08H^#AQ)ZcfF{iZcbDicQ+n**$R@)r;bFghdh~VT+`Ia1faI
zQexn!u^?T{NCq>{>sZx|<OSL}kx0YTY9(vzR50yBv%D*zNbQ#rc_;l<F%hML1IbyM
zMUxU6GB$&_GS`5dSyq`sOXeT_lkivNeL8&WF$EkCvNMUW^qgNvnaeo<#isfk$}%<1
z$X5E$V5`0+>psm3NbpT=DU>wbBq>w6x6r87PxB3?&%Z#z{d_42iQm^);HWORrQokW
znf1NXm?9F*rZIQTau(%eY=t2u(Omcp-5~L<sSzh->pj>SD#=IZi_%Ys#9dE7>3DJm
zilgjjkf*j>2YGy}5gu#BO>_z?7eVyTN+GQ^YpKKbRNtl4RojJ4&Ke`U@7G>{<)HO%
zvb<im8cKLaD#)4o0+4CjVVcVtc1@92v)ctFVy^@FZ4c(MJjVmFtlWD@ur!@UsH*+7
z5|Tz*?2r~(9e5=gUVKkR&+uS##zbrK6*??pE83OprD!JG*!BvYI@@*xrwq>LL5AMw
z0C~6_Z(^e2(8uWf)nNs(9%%*n>}U{V+p!It#FzX>-*)Q>&%29xOx$rFlgRi#GWGgQ
zkiC4uwp3PQuoQh{DKdR(G<|3^?POO^)bm+bzQ@FWpKQOUjOqzbq0rA}^ByH}xpxbp
z)mus!6za>~a;hKkJxw?hS2CwhPdqO4<lbzS;?Mn8uk=H2^H)&sa#FwM*AnLfn+42f
zj=(D7#{=65uLP`w+Rj?S_RhV8H##kZhOS1!uC85#ce<(x*9YPE1>w6HY@q(S?mEIi
zH|G8%)Wtn`E`c61>C-(mgn7M~=jw(3V()J1>q783Lp!Lx7{Xk2pPlNXeaL^Q&qj4F
zLmn4{{}MwUT|e@5^uu?hA9HjAJL#Nz0QdS~0CP(Ro2WlJcz}=_Y9@ScXdmHMLwFwA
zVdOkM4E^>n=9QgvkS}twg)nsl`|TsR|M?Nj%^Jnt*G94L>L_yS$B^&MG331_U||@0
zyTj<;4r71$Dcp1H6rRUD0XIdU4@a<fF0zgCY>FaJPZWD*qj>Hm<GA10IP^II%VWqH
hj$zM241ROGo<5COd?VpZd@JGViP(Q%$hQ+s{{YK<gVz86

diff --git a/local-project-repo/org/dd4t/dd4t-core/2.0.15.2-DXA18/dd4t-core-2.0.15.2-DXA18.jar b/local-project-repo/org/dd4t/dd4t-core/2.0.15.2-DXA18/dd4t-core-2.0.15.2-DXA18.jar
index 4a8b4316ea94b48a1e92bbc61b2974893c2f488c..bd0d2357239ead7ed7ada4487103c7f287d28afa 100644
GIT binary patch
delta 2163
zcmZ8idrVVT7{6a{%cHzfKoBaT$k>Dy5X#0BrYIO_c@~B*XnEQyuR@{aHD|=Ru(=4i
zZZ~7ul*zKpXcpGF>m!--9}OFbvX_j+M;sD$Bs#?rHDmXF=XBHY2jA~}zu)&d=iJl7
zPZWbs6n=#UR<2~EzYyp8e!pmTk!W;-thBlkiRST(lHsC3`+{f<D5n49qHSuiBs`ae
zb3imkd<?75UWS*^DrGCFe+hS1=EIfCl$6JH;Eo1c{r^%Ok)@zyO12v9Q#O)stN>r1
zXS(L{*;FKZSsmK%*jK4I`QM;EA5e1J<fLG}m_>91JU=~mL{5vzNwLL>wHUuu@fzAu
zMK~W3C+0b;AbCa=@kr#e;rti55X{ASAmK{&2xBG2RpRZCAsF+~0D`B!o*oE1f*Og&
z84^RN!=Xk(%|#TEsGMah2xyAxXZ@w!kH0f?a+qb9U?pevUjBg<f?Vrk&S0XiVr3+u
zLL05X5}KrO68^U?f>29SPZBV>W(m>EubW|2QfBS#w;t?LFwB68VKkg7W~s|R>qDYB
zs?R21u3(lVoHqVNdcIbomy=psd<eCATO9FN&HISve#IOCx2q_)Q8Pl?IBvBOYT3?5
zBs{F)DXF#CK2J13&LKjb?zrHAn^4F8HnUsCFgN7f^6_B4&kSDNx&~i<b29|GMs~kL
z<fT1R1nBmSk~l$Qp4{lgFlPcWPP|A;ZsCxEZ*PH6SN3~_UO34|@28Se{N<1<06qJ^
z+)q5})8nMw*)w-Zms96b{ZJD!9!oSECjTT<>b1L`NX5)t4MgDi*rJkv(Ch<?@Ti4e
z6~vJJztDB3_77l~E8^*<al`Tm{;CtAgoR*ugf)fv5cmdnRv1>pE!-PnAQHlHNI_T*
zIo_C@jRThWytUxO%0kat;7Dv(CfIRK;Xp1JWzzR9{GJchfJk2mJuIS2#jt=`_=!@8
zl@jv{rGOulkg^Fb%DtsaqyEV%*m>VFSo3DFqhQRS)oXI{in5QE+{@D##%@j<AB~L{
z-z$hON=!5+>V}h2TuG}+Z4N*GqQs;`-OO~XK^uE<bljCPk$fpx_jB?@Tdz&`_4R3e
z!uJW<d%4473Ho0RIjdIQnAU4zM{*6h@u1uzZ{;4mYwS416dFJl%#!B|JB&1en!i~F
zVbTcvLK)x(%x9EC0`m59cm=`na!5xYQfl7I1i|ijd_wq0v*>O%iDx4XK45~42yU7H
zpB9PFa8qi2ml@)4b<7M|2p*b2k07H0HXyiPDQ5h%0<^fAsDMlaVU>{M7OMH(mGIJk
ztMl%a7@Ljmv?`i^Zxzjdxe5x9T2T%82wJNFpDX@^8(?Ww4K1Bf19>RyuYoNHX5ApC
z7G6isU@ep&n0JGM?NE)L6Wd`cf<OzDBB-;#W(4OgG+~q#Oz7#cLM?*3R;WZ!u!ENP
zd<PY?J88Jd4NmQZO(+hkqqS^xRP#d}R3VjEPdj|O9?H;jtDe@%Z-8y+Io3csR5a3l
zwl~u1-!@Vzw26j0n!til*PCdonKo!d&j}lt5rj5V(9sMvMBGfLNNb_gCoME8zz*f8
zX|mIVKiX-nq*glDfmS-s!&Vwz+6GpPI@d<0h;-1|I~_F7RR^t}<)kG(bJFGm+UYU1
zwNvq=8>Dy89Xr@TXP@n$HzB<f3bANkCm0b-cZ$`eZ)igoq#@YTCEi%cGtx!xpsE}2
gcaj(Hco=W#rmw`oZWwyzZOC{7ws@Q_6CXC_AMvM%3;+NC

delta 2146
zcmZ8iX-rgC6n<yk%mBlpz=$j&h?G_Vsfu-~EQ(?fWsy=W!Z57P$i9p-!dNu{j987@
z7ksIN;6hB>#2TEIXEDasw6Qi+tZf>Xq)2NeD$>*jS1P^t+&if$KRDkz-#On|?&Wgq
zh34oBjd%7sQLPi`Pe;e1L*9|%9%AB;p}8K0=K1T?NRbfx8nNpznEz4}Ti0lg`%i^N
z+5lywZdfQ1Rq01~3$0Ey4{bNhk}jw`C8J8mdHnX<Qd3|3KdBR{B^Yu`wG5k>6vO1Y
zV({{OrE4iuG$7d_#$)hT;@fB^#l_r)$p<|_Cl#n!!Azn;9MfKzp7wo0&5Nm*VP2pn
z8SN%b652scupAmqbS`LgSa49Y0BxoiEPt{d^is4I38z6DBvQti>tRzN_`x#<5KMZx
zX%T4sYgvpvAc|2(XXY?!B6I`GS{puBMN2#DA`Xc@bo&eL_nz$&1wpTqOdfNbaZy)L
z<jj1Ph=H2eNDa!zEE-~|FXKa5o!N%7Eat}YSuE!1ic!&*$ghjN*Z%hojUXKH6@(bc
zH)^)iC-ox@3VxcN#)2oZ9x}l{a-INE!@22dRx96=^}DPfT8)&&w42TJSMdZ3zE{e@
zNcm;f#wklZqrxj6v-F^vNmeVc=_%{k-`>lpf#yqEAKGe_cyn}@N)SfW(wrf^lw9d9
zt*G&m^Bcg=d3o1f)?!}kEtVF)dyu6mF{T@9+y&vBA5EioNGDD8XyoQbnCVR0pY4uq
zcXb-r0shkCoQ9r#r}r^W$iNVr=;65sY%{mMHh5!9z|efWSI$*89<lxn!w=k$iW>dZ
z4}sfrvo8fogD1?;BI@vkDAAW5>LthhiZKv`>*Qb)q&{`1JZy&uWl9f^aYM?}0O-fX
zDt#ev7uTm834>sqR#E1_S`U;Iqd{aok65r{Wu-M4Bs?Z1Xf-ss(*siutcM(2ka8yz
z%5W|vJsVna>B`l2U<y^_Yk4rA3d>V@fPYKMl8tah?LiOX$jY{aM%k+nmhYVLU7zma
zo707>|J;5#a<pkx+#B=SeU3-?bl<-n+~u@h?pz!&>6qAmdLS*}gH*r7r1)<#7Nsn)
zoZOK2+hK!sY`Kp$;lR>I-fnFfV_#Ut&sWX*v-@<`6H#$@-gBHkSyW@2_fVJe`I&^@
zb9X#D(30cdMqUX}=|%o<sYrw2MGzw2DTE+8-(e#pQ!9@fiPvZZJ$_k@uoS^(Mo4t=
zaR^9yJOd_@(O5)IhK}7;1Zxo7DFS>`<Zu(LbWtJlP7_39+9?yHqI<#w>FCMY4ncB3
zG2h>wVn{>xPsOkr1A|LoEdmVOS;7PH>s!~?qY|E$SjzR=ONl;h?OG{hA&4x4OaxoY
zAPH;qyTFq&o}N+;8AyFt4*3YiT_C*z-bK&x3dlw9%muPHLm7JdH^U|b{$|L-TGeKF
z4?UO6TyU-hijZovKm}4`7AQea_7+~^<1HkZHm|Pa=_U%OXP^=`BG6ayS`Ag48mxj+
zq!w254);_;A(j}eCbejKRt*%O=Tr^vP+QCUG1rpnH0DArrvmGEy1fp}m^D&ITBR2z
zwH|5_^w)z4vjQ79Xla0Q7Tmz6NNnU(Pb1Ho-ULR>s&C?gKR5AOi>+iX+QvaEA7{eK
z(>HDf3o2jSN~WMO;Wj?I!^U?wY$MevwZ=|L&{j{{N%Pb*eH%F@3T)eW@J$y;Y9<?_
zRA)1veY~061nNm@fo#+{)B-sO?zZq9u695IdRiUiveH`LJNWhU+Yb1@Q6~3v6;s|0
Ty|26nDeptR_RB)@m<j&^2j}47

diff --git a/local-project-repo/org/dd4t/dd4t-databind/2.0.15.2-DXA18/dd4t-databind-2.0.15.2-DXA18.jar b/local-project-repo/org/dd4t/dd4t-databind/2.0.15.2-DXA18/dd4t-databind-2.0.15.2-DXA18.jar
index bc65d72fa9991d285ec9324d7952127e074d9ab3..fee8167ad8bf9b7c5247dd29ac06be52b7ea79fd 100644
GIT binary patch
delta 764
zcmdlvg=yCmCf)#VW)?065D+bQn#ildECQrV7BYi)H{`+8FBK3qS&>l}Ob0Srg6UpH
zQ!ss$(F!WAJo$eM52}fi?U?Mqvh_?xV0sIaIhcOOWCNl%>oPB71T!wO9D*>Wv7KTE
zizM@%-~%)CWKD&@j5PfOQ844Aiz^$LA?R(*1ZMdAdUJyrb0e6T`G6*SPddHxg$EM@
z!(-;j0x7baPems}RO-cDVFjyXO=)5VGrH2hL#%Ge<b$Z0n#~C@e_^3E*fEpOS7?FM
zPX1G24Ax^*xsyc@WX-Q%Iv>k`!B+{yCX*d1H7Bdq3DqAm5Ma1qJE7j<#hnS<E4>yr
zM+mk*TG0G@>-1?lo}K9j_lMvAvC7+H;RKepkIc-uikYFjmIrf%Ht=28es<kgj^&^K
zGM;-Bw_0~f_?eZ($E0$4R{wr3$RDMvy8pU%`A(g-o84g{D(6g2>i-Wk=Ik}x7#1Jk
z&B!Fe42?=Api8&cnSdg5^1C{Fu*(hV^}%#fy$P6}S#JxbcQr^){!*_8W~(;1g6Z4_
zFQ}X+m}YDA1JmJ+PGEXYqdS;>*60JKO`9UX^n|7aF#WkH5ln|SM}q0i&2eB_q$LSV
zSGEL!>2pxNacdr!zoZqceo|W?m>UA6S3v1MZOLHqq;`n%%k61kzD-9wn4Z@GNs6~S
YoWXp>&NZCyIGTK|GnQ>-9Vn>-00RL6ZvX%Q

delta 767
zcmdlrg=yy$Cf)#VW)?065a{SMn#ild+zzBn7BYi)H{`+8FBK3qS&>l}Ob0Srg6UpH
zQ!ss$(F!WAJgJoj)xgPiOm<+&dL|<<y@kmfOuu8Y0nwXvnHMsG85da&K^W86PO*bU
zlKD>Xff;(Trb1vwntp;Pm~qm@l?}`g^tNUKGyHwMxxtLN5lqZ{K$E>Eo!<GvgNcFR
zG4o`B6xq$Eq7xx1_2RCuf>pAnG%<r2UFqK;R<~sGLDWpm=7gBPuuvQ9n91iWv_NVn
z|EVwr>oKa_$s!1{=KJ;y*Gqw+R|&)>lN~BGCyRCQ)r+3k$kl8hz;MBKLcK+SS;fLd
z9DJ9&UOq@^Uzh$~D^gD=cwznhZ@uexba^e(;W^E&X63S0bJ+@m(`+}G%w&J@Wn1)r
zmaS>+HEmyF>+*K*YME>2rcXcKu+}uY>;2nfwLYtp?NYNfo_<)A{_m;1*D@dPfNjsX
z1H2iTM3_O5$qJ6m$vf&yK+!q*eVskn@rL#KU^=<p1WeDWw*}L?8>A<Ht=9vy)f!yE
zbY6oORL&Djvp4#I>4-)rFg>@?9ZWxO^a0amO%Y&vVp9T`{?e2PrX!jo!St5qI4~{R
zk_4u!T7tmzc_`ncH4n^R+6qz6*cJ%pheGL<Q2K9MGFUvh9isk9dm5N;+Yt|@=XXF-
b<DCv?Fkh*24JSOFCSUK2Wm{1P3?T*pziT0X

diff --git a/local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.jar b/local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.jar
index 3fc594b50505316c683c6380c7858f42c063b8c8..4dd27f1b1e02ae876e4d67c358bde34d915b44f7 100644
GIT binary patch
delta 1295
zcmccH&v>(+kvG7bnT3l11f<KICi1E<O93g9h0Gw{4S6v2O9eztR%Fxz(?N{JAbN8L
z<70L(Baib0H<)25`iKS0kdr#h2WC9c2!%-5m>ggQi~P4NVFocKm)UB8>BY8S<0jv<
zbrSqg=H%U!?Xu%N69dCCP6h_O$s28@C;PdJ)t?Q$?I&$0Q0x9ke$9&hSZmK<PS-TX
z!ifQwo4i(3m~Pu#cw=k$w#g3K|MtecKkGSt!nc(k3g3R5IWx2S_>U)+-Uqv~m8aOe
z<4xGlzGF!j=S-RJ@0N#O41BL*XLDd@7`LBpK}qJZ^KLTVpIv*F+;Z);X-s{SmwLvH
z_xu+QUq2~ZKlgKwi<6YM%G14vnFIb;{61!;tgWYbveWp3TweaZMS^dvB^UMzCO?k#
z6H&dUU3;CeqWfb`1gG0P_Pgc!dW#><$<WKabL^N)w4w5qxXm**PVDt!b7Pd-AiQ?k
z&gK}Ihzo|RCN_kGTFdQv(0sl?BGzUOZ=b=ck6zrj1e%SHR@DDmyr|--L~eqp|D>Md
z@^ztqn?nCwFXY~ODc<nYms3*;owuIoW;(t-YAs9gx`RHM29KwmyX(=gQtXT@^QtAK
zj}&$kEw`zD(o@JbtxZKHNyKVZjee<=xUAti)y@r{pDHiWa!#Gtb@*^|*G#TcOCPG~
zM7FX9%zj;R?%>RP{TWlX)b}q~#VH{c$`zEOlWlqR58LCwcK6AzKcCJopB{Ko?f0D(
zIWY@-1J7>H3{I>$8a&n7aA9I|*|N{Es!iDin^V%(O__H0*WFlw%r&;+t7cWt5-A9b
z=<zx>ZKn4GkB^t{FZ}T+$>eAT^DW2y_pctvO^R5yuH^n|M!}hrcxoO-p4)k|KD251
zq@q=v%AEoKE8j5+^>i+b%y{~4TFLh<7oPYX(@XeReTz-*_lbZ0COu*)t_!S>Xc)ZF
z`ucPKueYBBSTx=pt?Rob-4Zza%Y5r?_iSaeudU7a^~6eda)o2bMwQp+m(4kMCv$63
zaqEqu;)7ME`R;sb{hM*&eZRpiJDxXtejVee-(|bE(d4uh&#jpMbG)C;yR56p`)`wN
z$?rY#b5$36eKwa<J-`0xw)GCJd-C>Mf1Oe0aVL0(XZqr!cBgC&m3CIVw!Ay#W4O~D
z5vRjJFXTKP3f0_n=NElhXL?6!`Z=j8;op-!Tj+;P`k$ZP%DiHZxP6H0`bYO+S(Af7
zTA<v?`wYvfbLGH%S_Q<W(2OBGd9OQHeQ=roS#Mo09Z%mtk5wTbe099fK7JbX?d<vB
z5B_?A1_nU}CL4`RHyfD-6_oMv1sWI`m^^=~<*loA?#%hkrk9K_7@J%*zEs*-V6x@G
zQ!o8f`nn%{HlEe@y6)|1sQK`zmyXs+A8#K$My@8767H@~r;UOeZdLAN2=HcP5@F_I
zV273-lQo@8K*h)81SflN)?VbK52iJpq$j_3k_5B4o$bK1kFztFp5z=0raw97faye+
zXfVAWO3S(?f%#3Y@nHIiYXq3Kce4W1HEs}d4!H&Kq7)yK72W;ifdvg}xPhDs1xp%z
NCilC0u!%W=1ORMnC^i59

delta 1288
zcmccF&v>_=kvG7bnT3l11g3NvP2^Q!o(!Z+7BYi)H{`+8FBK3qS&>l>Ob0O<gXqm2
zjE~vDj6BX0++c>K=pz;|Lr&^2ADHn(BNQTKV{(8MEb`y7gc-z`TxP2UrWf0SjhlSa
z)=99n)5yDM?sxw$ObiUGI2jo9CU3Nrp6ul=R)01$+W)qJNS*s5`-rP@;=A8kafT{3
z?8vyhBXde;xbW_k-bwD;ZXZ(n_uFsI?AxuE-e!6zeEMnqyyp3%#~)r;dS9HBtvto%
z4R68z_8mQ<!bX;F?)vLBHQx)|vS0jJ)Y-}$!3#?z?WGHE%#NJh&l$Nktl}%D_S^}H
z`|TC@!>5<mf9y#&5x5kgm3;5^edn+JoAYywcRdlhJg2Ggb3t{ntJ@BKqZ(=DW5;&x
z2{GL2_i{Jih3KC2!(IjjHaz$DuILea7E+wK*sRQBt7x#)?e#iIIVsJP1cms&-{=hM
zmQm<v=C1O{I-(qUwXaQ}=7S`E^XB%+2OT}K_FQthcBExyQoYUJz`!}5Cag&m^}p2P
zE?*b=_fY7c>xJA~FU31QdNEb=vD!5yeJ+{1SzASTVivEwlyNH8rg@@+u&#v6;s{Uf
zM+UnZg6G*59kX!eb{6h)eq_C>M!!T#RMzmqB$pdE9|<1UQcj)Nb@=bzu9;mkybt%r
zZ{qsA!0h_Tp2fn~<4PjyFWD_xrIry9a?*R_#x+kvKELjDmz@_=XKTBEpEZA%+0Ex}
zsgIl1bZ71Joz3;wd)_LUBR|@BZ_PYcK9ytL#j{N_X9h);y>8#FaLL13FU<72h311r
z8x%DqrPC%TOntO`xAVoDH#3ALnPzbRt&3(h@2s1->r(A{wvZGrqc6Sbme1?cqB-Yz
zo!YppN6qQ)^PSZl=4xu^YP5Gm3%$!+$mw@XV8ajFJm&t`l<(>iY{k2lNbos7k}RA0
z>r4FKvdRxkBHxqD-QV(ZdCvYa-+J3UTiI-}u#!J4bEkQlEZ-F|>1%qhp8@;Yur=!i
zqVx1(@^3Qg#NXk6x6VKB{k}T~4042Q>Z7MSCU+!;uU9;K=o_=Sw!-sC2Pf}RTz)X#
zj6Hw4`I5~!8!!FoZ9n-jd*@s40LAsQ^ZjjC$qJQ=<Xw81v9G(xohL)@URBWb)IU=N
zX1L@;bUmCXGU35#y{e>%@4^oE7QS4w(0HT1W&fun-JSoph23aARaxj9`bFy(G=K6k
zFmQk}s5jri3v<gR$2&UIi=N)db;v+~;ezdidW#o#E_8c2FKk}X;k?{xhuiz8O)3w2
z82{hfWmj=_s&co!&xb#Uo@l$Tou%nI!;;zRK%Im28<{zJpJj8}_l8Y<DjOuT_9c&8
zPwx4CWvjJep7U!K8=lPS_~xpuud4Ge)a;M*Y}Km{(br$G2Y53wi7*2T3^quKG5La%
z^kfGoNl>vdImXEzoTcYE>4WJDP9|WQ-PsOIdpJ9T=|1OJF#XOs2TaGhM1$$wP+HP8
z3Cyo^jR(^YTqD4=wVM@~u5g2xv(GJv7p2IUEbH#C01qah3#)+G6o_G9Nn@bnWCM5I
N$vfSp*rc35!T^5;E^7b)

diff --git a/local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.pom b/local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.pom
index e20b566be..0c675944a 100644
--- a/local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.pom
+++ b/local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.pom
@@ -43,7 +43,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <tridion.version>10.1.0-SNAPSHOT</tridion.version>
+        <tridion.version>10.1.0-1004</tridion.version>
         <java.version>1.8</java.version>
     </properties>
 

From 6dafdc6884873310f49ced19d2dcd8781bccdd3b Mon Sep 17 00:00:00 2001
From: Alexey Zarakovskiy <azarakovskiy@sdl.com>
Date: Tue, 3 Oct 2017 11:41:51 +0200
Subject: [PATCH 15/42] TSI-2764 Update UDP to 10.1.0-1001 (TSI-2649)

---
 build.gradle                                  |   3 +++
 dxa-bom/pom.xml                               |   4 ++--
 dxa-framework/dxa-web8-provider/pom.xml       |   2 +-
 dxa-webapp/pom.xml                            |   2 +-
 .../dd4t-api-2.0.15.2-DXA18.jar               | Bin 42286 -> 42286 bytes
 .../dd4t-core-2.0.15.2-DXA18.jar              | Bin 97697 -> 97697 bytes
 .../dd4t-databind-2.0.15.2-DXA18.jar          | Bin 35386 -> 35385 bytes
 .../dd4t-providers-2.0.15.2-DXA18.jar         | Bin 18393 -> 18390 bytes
 .../dd4t-providers-2.0.15.2-DXA18.pom         |   4 ++--
 9 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 73df81aa0..62b4ee609 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,6 +64,9 @@ task prepareArchetype(dependsOn: buildFramework) << {
     XmlUtil.serialize rootTo, to.newPrintWriter()
 
     println 'POMs for Archetype have been changed (parent tag moved from archetype itself to its pom)'
+
+    def iml = new File("${project.projectDir}/dxa-webapp/target/generated-sources/archetype/src/main/resources/archetype-resources/__artifactId__.iml")
+    iml.delete()
 }
 
 task buildArchetype(type: MavenBuildTask, dependsOn: prepareArchetype) {
diff --git a/dxa-bom/pom.xml b/dxa-bom/pom.xml
index 383f55f52..3f46baeee 100644
--- a/dxa-bom/pom.xml
+++ b/dxa-bom/pom.xml
@@ -46,7 +46,7 @@
 
     <properties>
         <dd4t.version>2.0.15.2-DXA18</dd4t.version>
-        <cd-cil.version>10.1.0-1004</cd-cil.version>
+        <cd-cil.version>10.1.0-1001</cd-cil.version>
 
         <!-- DXA versions -->
         <dxa.version>${project.version}</dxa.version>
@@ -153,7 +153,7 @@
             </dependency>
 
             <dependency>
-                <groupId>com.sdl.delivery</groupId>
+                <groupId>com.sdl.web</groupId>
                 <artifactId>cil</artifactId>
                 <version>${cd-cil.version}</version>
                 <type>pom</type>
diff --git a/dxa-framework/dxa-web8-provider/pom.xml b/dxa-framework/dxa-web8-provider/pom.xml
index c750f136e..3725e41d6 100644
--- a/dxa-framework/dxa-web8-provider/pom.xml
+++ b/dxa-framework/dxa-web8-provider/pom.xml
@@ -50,7 +50,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.sdl.delivery</groupId>
+            <groupId>com.sdl.web</groupId>
             <artifactId>cil</artifactId>
             <type>pom</type>
         </dependency>
diff --git a/dxa-webapp/pom.xml b/dxa-webapp/pom.xml
index 958bbd510..bb3d236b8 100644
--- a/dxa-webapp/pom.xml
+++ b/dxa-webapp/pom.xml
@@ -20,7 +20,7 @@
 
     <properties>
         <dxa-bom.version>1.8.0-SNAPSHOT</dxa-bom.version>
-        <dxa-release-branch>release/1.7</dxa-release-branch>
+        <dxa-release-branch>release/1.8</dxa-release-branch>
         <java-version>1.8</java-version>
     </properties>
 
diff --git a/local-project-repo/org/dd4t/dd4t-api/2.0.15.2-DXA18/dd4t-api-2.0.15.2-DXA18.jar b/local-project-repo/org/dd4t/dd4t-api/2.0.15.2-DXA18/dd4t-api-2.0.15.2-DXA18.jar
index 68e17f6f5a6936b889cef88456cad263b713c8ce..d5c5df0d93e8cf0ab04d23f2761414f1a4b2c7fa 100644
GIT binary patch
delta 1728
zcmYLIe^AqP7~XdqG32%j)Mybmr^v=8FvnCdlY|Izz!)--$pkg%yzcrXts!bobBv7v
z<HIk3xv^1Rb$aToKdPg@ygD+=(+kpyx<kG5yhFTBsH>~(eZJNHd7k%qp3nQfpYMHk
zZc2D=N+_*1ip0wV@!#?K62CN4<cxt~oM1*l@CS)Z$*qr<%)(_8I{8{BQn2#{N$e+X
z8R_>p1EErw&({j}om-mx@0@rKC#PU%g{gc_!6vQA?7lFG>LuX@LY+uY*euE=90W$c
z6y<OvEQ*&>V$F;TYF2(Tc7ZldAjo7&rJOZ*WlZ(hTs#$(CH9MnyqEljkceEyfn+?M
zMxCOYQnrFPQrCf;SzeYvLl&O=lkkE3AsxQ`lnjYS>8V6ma>lRZ%xCO}V^MqtXSot*
zB&*#J*qW~?x;OIxHuxs15KfYMlAI~^aR?^OOk7|Z?PW3^YQ<zke_vOPL`CjxS^WBw
zY2VxR2?D`f5_49qU?EPzR^=o_oAO?u8$>@aG~lFUqYG301zIRy6n;V^;&=v5`?Irf
zY(>9-Jh$x!kf%%Z$e2rSLCGsy0@1uEhPB?PB8Ba)xJO%;SMrnWReEGUGF?XGp!si#
zyj8OnPGCnO$eG$)kQvKi>dWeOO;I+p-T^0QtpWLMH~O+{+arps-gAhLG`^3e%J-Q>
zWQ{aiVJ)`U@FeP9`A|aN@L*HQL`&=m9Tu=vZF2T%D3xt)eVtC7Z9RfhIrf)9hTd)m
zS=ok{7%e^YF_gdB%^>C@Eg+vB^?__ZwuuwP{$uQ2r-tx?Ge3^eyUt@GNsJf|d_L`E
zubninkY!g|9++~?I^9m4;ga5PQLn3EH%`{lF|7-KuYInf_<n4{l}D&`rLzT>oVc`O
z8=<+QkkH51*E))+e!~4c;cP_C>~0P52(L*y(pf@h)_;CkC;ZmVQqr!){OL{=an7@q
z$8=`%tRa5FQ%QK;V<uF2O@wXUJ%l&C)r2`+4TN1?y9n=gRS<6UA@BAfcgt5t`iAZr
zLQgmP{><0;J+;t#jD#~iRfO5S=;!D~{z`8>>1sc6cK;5lulUhd*=MEtXdm{!+Gn9U
zi(wxJL;fnmKI(q#*WQoZ^?vkG5A39K&H>!(#{u*$9Bd?gbZ|c*H`GM<($HSQuZHkF
zRKwWw#4!9j!{}FZ%0{{1sb<2&5zM!a;Qkjz&^K)qbKe}ryc?s~TQi3J-WkKb(>&${
zFt<AZ{Z0V$i%;X8W2f;w?(?`M2!A+;x%0v8w9l3h_UQ>>&RhuJy<i;o8ykl|&tq{I
idj`UovlvF+7{NOaM>f-YpN*6duAK<~|1bG=qVXRP!fIjw

delta 1728
zcmYLIZA_DA6z$uVQ6y~!;#kK>ts*V0Kq;W$oJ^F#EK<tH&`Je$uq;dVC96f$**Qxo
z6etg00=1=OGio#=Z?+#>!jdIs3-e<}Gnvk@C8&upLCgYd*|N3wyxaQcoO{lB?!C{O
zrx&Ni7pKMYN|QvoLKOY2I#leFr%93`kT*^+qayf&M5g9)q9v>4G6<bQZIGzgrv-8B
zF1Ld8hg=?^TAVA?D)zlw9{=y0Xb&f+Vi&}TLQch|tnuuTIF9ONaXz6zVkB&mWDyPm
z`EMkd90^O(<%CEx(}I?j-Hu$Kl@p25m|Cr5^_>c)d1@}2;uW#|QX(J6zbhu9RB#}v
zPbX6+eq+KG5J%#AkTWYwV`#|2vwspkRz9J__nuQAv6zxbgvF=+O3r-h0XVg)FX60I
z<BV*L8v<MV9Yy!0y@3s`q!+@8(@v2yt^E*!SvM0Em`;C*j3;_28T{|-E0HMAx~GU<
ze=7M0yD>&2nu}x3iX;}~WNdY24BwdjGTnebn^%vMvJEaw^%dx$d{y{4k+9<hIBhS^
z!m$<o0`k(<A3>hqW<<tPatBIw=`x7!6)CJ7lZF(wr~DypUA9x0WUnwHd)|Brk%N}M
zDe`{RIynC7SdcR{Ss*jDN2o8W+cizuwA~Ik0c#b=Z+p;}W!M%evS#mLA=2;(mMYtC
zmXI~lWQDcVY{QeNd-I%(zTv^fgo)<J6FMSdt6P=qtzaVC)bb9Uy3leIr!wuYgA5&N
z16kFIm&lhK{tU`rZ59yA(Poe@j(I_L9N)-EBL6Y=kyA%F>CBBH|G;@%B8w1H)7iUU
zv$s!Lk`}LAtA1?GvKS0ihP+8*K5xvaWH(RN&@sIWf3N+nqUe5X!j(;^ccriemy)==
zeJi1*y^zo=)YsdKseZ=2op3g+WOlcXcv#Tn?I|p#BmF<Wv;%%iM+s@yBmS)p4ROx1
zMZgqh^Q<L)!n2d`hQ~sv=`<6zcJ3v--C0SP*;P;2)wPT8L03891~2k%FLHOhb)@Ha
zR}p%;(f4Pe&h4pz-eV%1>8T*h=tVzAFY=drcayI5A!qkhQ+?TozUn?J)yMj<|JA-)
zs?!<vaWLesGVG)6$9`@7$ld5iAML=abj~?|d;K(kzJ-Ggq>m0BAmoM`311u9NBHd!
zzK3QQd!87Ee}5SLicZ-m7dX{K7(0Ub))Cx)as+*oM=|%kQOvtJioJDX*zbce?0ZYV
zY(M69`=Q_WV}9{z+;i+SzQ-d0HwWMk2QYU&u!Hv59K=37LCl#8;=31&<9=h~@aF|A
k4q;D!2y>P~$eY4==b`W>dhfI0ZG`J4LjV6uu1z%j1Fz9B^Z)<=

diff --git a/local-project-repo/org/dd4t/dd4t-core/2.0.15.2-DXA18/dd4t-core-2.0.15.2-DXA18.jar b/local-project-repo/org/dd4t/dd4t-core/2.0.15.2-DXA18/dd4t-core-2.0.15.2-DXA18.jar
index bd0d2357239ead7ed7ada4487103c7f287d28afa..0a2d45cdcedb3c9625361cc54dccb864b2f0975e 100644
GIT binary patch
delta 2036
zcmZ8hX-r&I7=7Qoc>~O_6c{N>DbOOO?1ib0SZFItfVMD27AXufY@J~phGnKK+NQKk
zYicaM;EQbxVu?``G;|EFp+8U)gEd&R8dFLl!C*-@qBXSG67jw7-mzAGaL@hDIp1>M
zy)*on8-C3B81}MCH6#D^muC+6M6<`FMK{dKyXz6SJbF%E_-IIYR$BL>nEq2rtF7IV
z^i&q!0nzAq54Pj_13ZtbTCt7BH}R7S4R2JaDUbVrhL*PG|E0R1*nyHcMH;SaY=mGl
zgSX~CUGoL39?8?J4%aW(7pXY)U(;C)sQC&dDOez7kpg~CPtRXa(qc+dESTGc{)1cw
zuG3to5FRJxndC^GX)Y0o0yb3mcpqr_I295uy()y28CS8FLxJEsO*|l2^Y&07PzAOU
zjWZ~QQ15RnBGgLw0piMw+)99L%K+;upMK))kxOGN!)VpK$t%j06mu1mT#QwaWL!ct
zhw0-}W{CA~T{xjO>n{;7`_d+&S>3(F`pa1pZk_n^b&g@q`7=yB?;o?-<(vI3(R`Ah
zOTbFuJ(BRZqKBm4`Qm&fsa38aR9ZzGiC9f1iRKUU3IVrjC|IbwLfRO$wh=0_@d2@i
zw5*X@!5yna6X+Zv)I|4`3J;)(y|Hvu!7vL-K59nG?`rhqcei*8<#q^gT{-#&QJ415
z5uiIcO>APkX*S1`VJ-*AHu(;z`Sl@A=x&FNuG}{bo;b+)K|T3^KM%S5FmmRzGb9o=
zF+;k&cli!!a_&pL4{CyDVu>bm_CBHX^LIRuidp(40D;FNi@yv+y9S=YuPmPShZu7F
zQ@ywA?*hYImp<%HeoPrI%sXL=xUPi<SW{dLf^j@paV!jO;?aobA|Mop6vZgW^TOn8
z9Izzjl>knxEcWjLo_IsDpabU=-`WR73i+vviv>^%i1H24&m#K%6<AlW$ICN?Yo!p2
zV7(MlWgzY-gR4qU`OeJz`i-BUse~e}@3#FVzZWJRNKP(I)_tC$yO@$(BG@aTMD9t5
ztb#CMu@XY$-0v6x-;}Uyl%hr>Xi?K?gclHeYJ_wI5})L@<Es`TO_HO%N;)$+>-j3k
zL9kc__}XQDkDCe;j+h`0ccUiAMzCUnd<2Dk5F%8VrOD((r_7Lx;72oLAqcI8yeGmV
z)l`VKuid-*)zp?=L-U`gq4}@XKq300YoP!^S1sT#h%oL34{NFY<vQ4pnz!qq9Ko_1
z<k!;^{Gc9+k^0LG42Pf=BjbnQAc8;(lp<)hz^e$REHvR(D^y|RxE1OV+_geA0z(5W
z@lgX6D;ufZ<OUOsP=;b{6Rl-$qMGR@s6lFbGwtwHGgM+^shQR)Y=H`ljJD7YRjsri
zODnBD*-EKk8?`%aU_sY{jkcQI2CWzwZvzv8U^@jpcBms_JDnoEol-;X)U}}ljHqer
zpb3BKptVvv>0D<!={PH$)LzyFR&;&UMW={#(Aj$(G|#+)R?l(L5+6Eg^BWG+&*V5v
z#W&m_qnn=CU^kt8xtrdEj2<vx(SaT)LU6N3sxG}AA*&a5BIxgxE~^~*wpY4-@>31y
WgER!vJ<UWg*ass|Uh1CL!2AzdCYCM$

delta 2036
zcmZ8iYfMvT7(Q=LTP_6^sK`YGl(CFE2pe+(UVs2PsK{UlrR8SJopNdAvT1@EU0fzR
zVJFipj7gSl30qhbj=>*nOBUjSvN^MeBqJnD;*D%BAX74S&ilQcbN$ipIq&m4@8vt+
z*A6|^3_aC&8xHVlPfq#xJNET^NAR2FC3%Qfo^FNW^5jKj5h5V=1$jMyV)|0cYfGCY
z{<$oI9U{>25hUXJ6TFP8r|Kn&Zxtp~I>D&&Bp#oA>zY~{|Cj2LDg`C8s$ICQ@u6ai
z8N77==~~F=Q;|H&C*%4J|0;=h{%bm~15cq$%?jqrS>(XR=cgAgsi~Nn6${X0p#O*_
z9oH#MkQfpz=b6y3JX4xDB=Y$n@$-YA7oxRDI8(KOyuvt(JnSk2*K{#}V9m=-i$Lqw
z%rp-FNJf3UrI1m}A%~bNH*5z3E!+F~4a)Av-5b6<%5$9FQ!sgiJL4m-W0J3<R4kb$
zHbR5xW0Izs_3z{mMr}*I%)rcRTbX8c&m!-mWR1Oh>d&_|9CyKo<6;D#$ZgIISsyaZ
z7kN1hEEhav34bem%=(=x%2Tsir8-9KDvM?jtLZe;{9#^Z;BFOx`I@V&jS*`rqr&P}
zm_4v*jnxWhUu7CU$1tPDyC$``0S)}^#S<!yn^z0r(|RGJ-d)(!<RzBcz}I>8#5+t~
z+&9ZW^64pNlVVIW+3p;7#aFQ@XUJ1nAJm9lZLr0e^RB@i2e~+q%3k0vgU*c@Irr5$
z76~4oX5Bu#a-TIh`)#T>YW%08m}dXXBSxjp-FHJOa`9JR1a40(J_?X*I@pYFSvu<j
zk!<@Xd+yaf0FJvQzu4Wvs5(TPbHH|KT@Nc*Q(E<hG2B>bG#KvS)<_pZAqa<*q;Saf
zz~p>1@GRyL3l6L-^<{v-yn&g}j&n-y9fU%aa@D1Ue5eLQc?Rg?5&d`=)-j8CqZp!;
z#Nv7};9ZhZO5nQMT{$zsH?5MWD~Ce;%C+gkzZb+EN=PV7NFGf}aV8}ei?(uj1Fc~d
z5G*c~L!grT10&#_5|@l})Mx}fYC4SY3W6_<kcL3!<6U;V)nb@QcC=N<d!{sWu>!IY
zEK~sAc7@;TqJqWaCWywT5ffw~ST;c(f`VQM6wAys*%>qBVEAV<WFiQvgxqJs<CP>t
z+xM=gN0nqttD^j;swn@BDkwmIL^b3i=&T0(1rf(w;BhtC_tn7bsCmBzN)ar%Kwd5F
z;3u_Egw$UyU^oiZ7#TYXM-cc~pcp};1>Qt3X`zHWtWbfGlUArj@W2X{2n=;p;<Gvu
ztLw>ba)I%BC_%Blfoj<rNHf&{RY)Z^Qio?6p&TQNjZ~|k3Cb`s(nK9<o2eg5GgY5x
zCMuwX?2Z<&pliN`TFq*OW{ixrf(b!@jX<{zYM9tYQ>3*KHP}Y3P3>SrO=~+PyxC5*
zc6QKQ=R0Ve<qoo!bb=LK-*wUyVRo9m$4+_X>{LD5K_xzQQ1hFP(QC3FBk^q)NbjN@
z8|b3hm%8XAq<4b>i}rUzA%Z*Ia&`Ikh?zaG8$n->d{~vp4?T4Je0u@^wM6-x?nl=^
NFAP7sse9i7^FJ)$TAcs@

diff --git a/local-project-repo/org/dd4t/dd4t-databind/2.0.15.2-DXA18/dd4t-databind-2.0.15.2-DXA18.jar b/local-project-repo/org/dd4t/dd4t-databind/2.0.15.2-DXA18/dd4t-databind-2.0.15.2-DXA18.jar
index fee8167ad8bf9b7c5247dd29ac06be52b7ea79fd..ca363e450647bd7ac41544af76b7c74c6eb48c82 100644
GIT binary patch
delta 767
zcmdlrg=yy$Cf)#VW)?065NL{Yp2(}h+z6yh7BYi)H{`+8FBK3qS&>l}Ob0Srg6UpH
zQ!ss$(F!WAJgJoj)xgPiOm<+&dL|<<y@kmfOuu8Y0nwXvnHMsG85da&K^W86PO*bU
zlKD>Xff;(Trb1vwntp;Pm~qm@l?}`g^tNUKGyHwMxxtLN5lqZ{K$E>Eo!<GvgNcFR
zG4o`B6xq$Eq7xx1_2RCuf>pAnG%<r2UFqK;R<~sGLDWpm=7gBPuuvQ9n91iWv_NVn
z|EVwr>oKa_$s!1{=FCC!`ch!%RRXceWQR)4$zol6^`a*>avd@dV7OpAq2A)foeAAt
zK`#`v9x3pZ73}@CPSsoKW7LQDYi~ae4fhQ4XkGaK&|ERkYaw@aK1hiCVH1$%Iooyl
z=}pHEJGQ4y{M2c=^<ZVYwfL*guRGYYmrZ*9z4vyE+VMT1*()++GB23^4>Z>NYPiwV
zKERuiNrV{`nXKU0oV=sX1QeZ<-`ClL9dB5#52lmrO~CZ5dRs8PyFq&L*LpoLTdlzr
zOy@OtLFGKbG<%~Tn2u<40@HIF-NE$pMjtS3))WDzCpIO3=`T%*U^=2X5=?Jtjsw%8
zElFUyswD_apNH~ITJymCrL7S4jBSBnekhb)38nwGC4<G2+ac<&w5NgjwjJ?cdVU8a
cHQwoP2J@9V*Koq)Y4Y{XShf{)zz|{p0QBn_^#A|>

delta 761
zcmdlvg=yCmCf)#VW)?065D+bQn#ildECQrV7BYi)H{`+8FBK3qS&>l}Ob0Srg6UpH
zQ!ss$(F!WAJo$eM52}fi?U?Mqvh_?xV0sIaIhcOOWCNl%>oPB71T!wO9D*>Wv7KTE
zizM@%-~%)CWKD&@j5PfOQ844Aiz^$LA?R(*1ZMdAdUJyrb0e6T`G6*SPddHxg$EM@
z!(-;j0x7baPems}RO-cDVFjyXO=)5VGrH2hL#%Ge<b$Z0n#~C@e_^3E*fEpOS7?FM
zPX1G24Ax^*xsyc@WX-Q%Iv>k`!B+{yCX*d1H7Bdq$<=eO^jg>)A=v(CLG$aa)2Hcp
zcBUWPAAbMGDsPX46Ij|lGBf8YW`^=w9?TWmz;|K$*>ztzmVf@sc<xc$YTYT}XI2&;
zlgjB?{rkBff0VB3{_EQ1J9XM_c87(ioHIG8|3A=}v)6EASbTstBa;X-Jo>yr(Fg{U
z57udcVsi4kI(x9Q4eIs5bW*(un4Vd03#NB9NKgJ!uLowUHn@W6+y*bGoF|xOYxD!t
z;f+pUdQPJ|n10si1Ex)zBEa;7rUWqkxhWA$hc`!p>CMe?U|OUl2~1bE1cB*uP`+_%
z9+<zR6|8<zTOgPl0;N|#=|64BVDY4Oi1N$rX<)uhM?9FG*8xd~w>zA{e8tW+obU*m
Ne62H<ZDk!OZ~*>!{R;p9

diff --git a/local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.jar b/local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.jar
index 4dd27f1b1e02ae876e4d67c358bde34d915b44f7..e1843f820e23abfc52d6bc3d0e451e0d7c33c664 100644
GIT binary patch
delta 550
zcmccF&v>n$kvG7bnT3l11ll5<C-SN=w*o1Xh0Gw{4S6v2O9eztR%Fxz(?N{JAbN8L
z<70L(Baib0H<)25`iKS0kdr#h2WC9c2!%-5m>ggQi~P4NVFocKm)UB8>BY8S<0jv<
zbrLL%boQRwutDVw69dCSP6h_O$s28@CwsYzZH~3eXR3cNPp4-aKeP4veTGeW{`m@L
zH}N%_UAKQeY3K72Z?ES4IsA9+-n*xtTyg17ulvc***o8A2Pm$;{oc=ZnXJ%vk-SSc
zGdA`Y`S*C}-K+95PyI7hz`XUs29b3?AKL}3@c6EM|Jst0Y3FC(m_Fxt<;LDW_14|e
z4o_G7sMNY8@}DihTL2PL9H5Z$&g+`TI62NST!c^4H}r$QUZ8<Nn1RU_Ba=-=CIORA
zI!1y$cfm<|vV)T(C{QQIIN5{6<~iv@<xIddyR#jb_HcFv(|yjdVEUbN4w#O0i3ZcV
zp|qrH5}04-8V{x)xJH0!Yd0$}UEu~XXP;XTFG_$;mUZ`6fVsUK7~@qyYzm5cC|J_y
T={VWIU3c<McPTbuCy*!rg)PTf

delta 536
zcmccC&v>(+kvG7bnT3l11f<KICi1E<O93g9h0Gw{4S6v2O9eztR%Fxz(?N{JAbN8L
z<70L(Baib0H<)25`iKS0kdr#h2WC9c2!%-5m>ggQi~P4NVFocKm)UB8>BY8S<0jv<
zbrSqg=H%U!?Xu%N69dCCP6h_O$s28@C)Ya)Z;rAnVyeIJzTe=M9nYIRzm9S2vfbNg
za@vaLR?Po7-p}S;*45<wx5>8T_a6DVs*Aloo6D)5U;lL5dWY6MdHb!u&M5P^6THJS
zeeqGdQ?`amJ1bsW-ktI>-06;p)8U{Oavl$bYHqsoi@vNgy(2aKoK%(Y?@6C6^us3o
z&rfe<UNJ}9KE!qXBjNk7z~TS}miHN!Rp%y0JBEvVJ9|F(gTG#&fkBXg$wnj7%|@m{
zlaDz@g8g^aNqVxalO!lyCr3KjgT-b$=|kmAz%+}q9hi1?b_Ubk&aq(nwQ~-bj&g|x
z(>tKFm}?T4U+o$Xrti8&fN2XiD==N^1~F&1TM#cwm`;{*_ve7Sz0h5Z$;WZBuAT1W
NZSGQRVosoB000SxzxDtC

diff --git a/local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.pom b/local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.pom
index 0c675944a..e3d9ee8d6 100644
--- a/local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.pom
+++ b/local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.pom
@@ -43,7 +43,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <tridion.version>10.1.0-1004</tridion.version>
+        <tridion.version>10.1.0-1001</tridion.version>
         <java.version>1.8</java.version>
     </properties>
 
@@ -59,7 +59,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.sdl.delivery</groupId>
+            <groupId>com.sdl.web</groupId>
             <artifactId>cil</artifactId>
             <version>${tridion.version}</version>
             <type>pom</type>

From 0f0224f3f09189e1d6d9ec9cf0069f83ea67466a Mon Sep 17 00:00:00 2001
From: Will Price <willpricework@gmail.com>
Date: Fri, 29 Sep 2017 14:37:26 +0300
Subject: [PATCH 16/42] More efficient processing for non published assets,
 including allowing versioning - see issue #75

(cherry picked from commit bb66aa5)
---
 .../common/api/localization/Localization.java | 10 ++++++++
 .../interceptor/StaticContentInterceptor.java | 17 +++++++++++---
 .../localization/LocalizationFactoryImpl.java |  5 +++-
 .../impl/localization/LocalizationImpl.java   | 23 +++++++++++++++++--
 4 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java
index 96eb5c37d..cad012826 100644
--- a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java
+++ b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/localization/Localization.java
@@ -32,6 +32,16 @@ public interface Localization {
      */
     boolean isStaticContent(String url);
 
+    /**
+     * Determines if the specified URL refers to static content within the webapp
+     *
+     * @return {@code true} if the specified URL refers to static content within the webapp, {@code false} otherwise.
+     * @param url a {@link java.lang.String} object.
+     */
+    default boolean isNonPublishedAsset(String url) {
+        return false;
+    }
+
     /**
      * <p>isDefault.</p>
      *
diff --git a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/interceptor/StaticContentInterceptor.java b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/interceptor/StaticContentInterceptor.java
index bbfc114f7..bdeaf5d0e 100644
--- a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/interceptor/StaticContentInterceptor.java
+++ b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/interceptor/StaticContentInterceptor.java
@@ -8,6 +8,7 @@
 import com.sdl.webapp.common.api.localization.Localization;
 import com.sdl.webapp.common.util.MimeUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.joda.time.Hours;
 import org.joda.time.Weeks;
 import org.slf4j.Logger;
@@ -27,6 +28,7 @@
 import java.io.OutputStream;
 import java.lang.management.ManagementFactory;
 import java.net.URL;
+import java.util.regex.Pattern;
 
 /**
  * Static content interceptor. This interceptor checks if the request is for static content, and if it is, it sends
@@ -38,6 +40,7 @@ public class StaticContentInterceptor extends HandlerInterceptorAdapter {
     private static final Logger LOG = LoggerFactory.getLogger(StaticContentInterceptor.class);
     private static final String CACHE_CONTROL_WEEK = "public, max-age=" + Weeks.ONE.toStandardSeconds().getSeconds();
     private static final String CACHE_CONTROL_HOUR = "public, max-age=" + Hours.ONE.toStandardSeconds().getSeconds();
+    private static final Pattern SYSTEM_VERSION_PATTERN = Pattern.compile("/system/v\\d+\\.\\d+/");
 
     @Autowired
     private ContentProvider contentProvider;
@@ -89,9 +92,10 @@ private static void fallbackForContentProvider(ServletServerHttpRequest req, Str
 
     /**
      * {@inheritDoc}
+     * @throws IOException
      */
     @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException {
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
         final String requestPath = webRequestContext.getRequestPath();
         LOG.trace("preHandle: {}", requestPath);
 
@@ -103,12 +107,16 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
             final ServletServerHttpResponse res = new ServletServerHttpResponse(response);
 
             try {
+                if (localization.isNonPublishedAsset(requestPath))
+                {
+                    fallbackForContentProvider(req, removeVersionNumber(requestPath), res);
+                }
                 StaticContentItem staticContentItem = null;
 
                 try {
                     staticContentItem = contentProvider.getStaticContent(requestPath, localization.getId(), localization.getPath());
                 } catch (StaticContentNotFoundException e) {
-                    fallbackForContentProvider(req, requestPath, res);
+                    fallbackForContentProvider(req, removeVersionNumber(requestPath), res);
                 }
 
                 if (staticContentItem != null) {
@@ -131,7 +139,10 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
             res.close();
             return false;
         }
-
         return true;
     }
+
+    protected static String removeVersionNumber(String path) {
+        return SYSTEM_VERSION_PATTERN.matcher(path).replaceFirst("/system/");
+    }
 }
diff --git a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationFactoryImpl.java b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationFactoryImpl.java
index d4d7635f9..2c587bc2f 100644
--- a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationFactoryImpl.java
+++ b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationFactoryImpl.java
@@ -125,14 +125,16 @@ private boolean loadVersionFromProperties(String id, String path, LocalizationIm
             return false;
         }
         builder.setVersion(assetsVersion);
+        builder.setHtmlDesignPublished(false);
         return true;
-}
+    }
 
     private boolean loadVersionFromBroker(String id, String path, LocalizationImpl.Builder builder) throws LocalizationFactoryException {
         try {
             StaticContentItem item = contentProvider.getStaticContent(VERSION_PATH, id, path);
             try (final InputStream in = item.getContent()) {
                 builder.setVersion(objectMapper.readTree(in).get("version").asText());
+                builder.setHtmlDesignPublished(true);
                 return true;
             }
         } catch (StaticContentNotFoundException e) {
@@ -153,6 +155,7 @@ private boolean loadVersionFromWebapp(String id, String path, LocalizationImpl.B
 
         try (final InputStream in = new FileInputStream(file)) {
             builder.setVersion(objectMapper.readTree(in).get("version").asText());
+            builder.setHtmlDesignPublished(false);
             return true;
         } catch (IOException e) {
             throw new LocalizationFactoryException("Exception while reading configuration of localization: [" + id +
diff --git a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java
index 8e8f83716..33c864ea0 100644
--- a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java
+++ b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java
@@ -41,6 +41,9 @@ public class LocalizationImpl implements Localization {
     @Getter
     private final String version;
 
+    @Getter
+    private final boolean isHtmlDesignPublished;
+
     @Getter
     private final List<SiteLocalization> siteLocalizations;
 
@@ -67,7 +70,7 @@ private LocalizationImpl(Builder builder) {
         this.default_ = builder.default_;
         this.staging = builder.staging;
         this.version = builder.version;
-
+        this.isHtmlDesignPublished = builder.htmlDesignPublished;
         this.siteLocalizations = builder.siteLocalizationsBuilder.build();
         this.configuration = builder.configurationBuilder.build();
         this.resources = builder.resourcesBuilder.build();
@@ -96,11 +99,21 @@ public boolean isStaticContent(String url) {
         if (url.startsWith(mediaRoot)) {
             return true;
         }
-
         final String p = path.equals("/") ? url : url.substring(path.length());
         return p.equals(FAVICON_PATH) || SYSTEM_ASSETS_PATTERN.matcher(p).matches();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isNonPublishedAsset(String url) {
+        if (!this.isHtmlDesignPublished && SYSTEM_ASSETS_PATTERN.matcher(url).matches()){
+            return true;
+        }
+        return false;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -173,6 +186,7 @@ public static final class Builder {
         private boolean default_;
         private boolean staging;
         private String version;
+        private boolean htmlDesignPublished;
 
         private Builder() {
         }
@@ -207,6 +221,11 @@ public Builder setVersion(String version) {
             return this;
         }
 
+        public Builder setHtmlDesignPublished(boolean htmlDesignPublished) {
+            this.htmlDesignPublished = htmlDesignPublished;
+            return this;
+        }
+
         public Builder addSiteLocalizations(Iterable<? extends SiteLocalization> siteLocalizations) {
             this.siteLocalizationsBuilder.addAll(siteLocalizations);
             return this;

From c531b802c97c442bee67d950ca7dfdc6d0c99322 Mon Sep 17 00:00:00 2001
From: Will Price <willpricework@gmail.com>
Date: Fri, 29 Sep 2017 13:08:42 +0300
Subject: [PATCH 17/42] Added base URL to urls in sitemap

---
 .../webapp/common/controller/SiteMapXmlController.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/controller/SiteMapXmlController.java b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/controller/SiteMapXmlController.java
index ca0db6f2c..f255adace 100644
--- a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/controller/SiteMapXmlController.java
+++ b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/controller/SiteMapXmlController.java
@@ -42,17 +42,17 @@ public SiteMapXmlController(WebRequestContext webRequestContext, NavigationProvi
         this.markup = markup;
     }
 
-    private static void writeSitemapItemsXml(Collection<SitemapItem> items, StringBuilder builder) {
+    private static void writeSitemapItemsXml(Collection<SitemapItem> items, StringBuilder builder, String baseUrl) {
         for (SitemapItem item : items) {
             if ("Page".equals(item.getType()) && item.getUrl().startsWith("/")) {
                 builder.append("<url>");
-                builder.append("<loc>").append(item.getUrl()).append("</loc>");
+                builder.append("<loc>").append(baseUrl).append(item.getUrl()).append("</loc>");
                 if (item.getPublishedDate() != null) {
                     builder.append("<lastmod>").append(item.getPublishedDate()).append("</lastmod>");
                 }
                 builder.append("</url>");
             } else {
-                writeSitemapItemsXml(item.getItems(), builder);
+                writeSitemapItemsXml(item.getItems(), builder, baseUrl);
             }
         }
     }
@@ -62,7 +62,7 @@ private static void writeSitemapItemsXml(Collection<SitemapItem> items, StringBu
      *
      * @throws NavigationProviderException If an error occurs so that the navigation data cannot be retrieved.
      */
-    @RequestMapping(value = "/sitemap.xml", produces = MediaType.APPLICATION_XML_VALUE)
+    @RequestMapping(value = {"/sitemap.xml", "{path}/sitemap.xml"}, produces = MediaType.APPLICATION_XML_VALUE)
     @ResponseBody
     public String handleGetSiteMapXml(HttpServletResponse response) throws NavigationProviderException {
         LOG.trace("handleGetSiteMapXml");
@@ -72,7 +72,7 @@ public String handleGetSiteMapXml(HttpServletResponse response) throws Navigatio
         StringBuilder builder = new StringBuilder();
         builder.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
         builder.append("<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\">");
-        writeSitemapItemsXml(navigationModel.getItems(), builder);
+        writeSitemapItemsXml(navigationModel.getItems(), builder, webRequestContext.getBaseUrl());
         builder.append("</urlset>");
 
         return builder.toString();

From da323bf7aa3de25fb284724d64fc43b47dcb4612 Mon Sep 17 00:00:00 2001
From: Will Price <willpricework@gmail.com>
Date: Fri, 29 Sep 2017 10:31:54 +0300
Subject: [PATCH 18/42] Recognise resources and config paths as static content,
 so they can be served over HTTP to the browser

---
 .../sdl/webapp/common/impl/localization/LocalizationImpl.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java
index 33c864ea0..e2c6e1669 100644
--- a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java
+++ b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java
@@ -24,6 +24,7 @@ public class LocalizationImpl implements Localization {
 
     private static final String FAVICON_PATH = "/favicon.ico";
     private static final Pattern SYSTEM_ASSETS_PATTERN = Pattern.compile("/system(/v\\d+\\.\\d+)?/assets/.*");
+    private static final Pattern SYSTEM_RESOURCES_PATTERN = Pattern.compile("/system(/v\\d+\\.\\d+)?/(resources|config)/.*");
 
     @Getter
     private final String id;
@@ -100,6 +101,9 @@ public boolean isStaticContent(String url) {
             return true;
         }
         final String p = path.equals("/") ? url : url.substring(path.length());
+        if (SYSTEM_RESOURCES_PATTERN.matcher(p).matches()) {
+            return true;
+        }
         return p.equals(FAVICON_PATH) || SYSTEM_ASSETS_PATTERN.matcher(p).matches();
     }
 

From 6918394933a98f0e2e64b64746f6372c79628d4d Mon Sep 17 00:00:00 2001
From: Will Price <willpricework@gmail.com>
Date: Fri, 29 Sep 2017 13:19:59 +0300
Subject: [PATCH 19/42] Fixed sporadic issue when a version number is on the
 link tcm uri. This was breaking the parsing of the uri

---
 .../sdl/webapp/tridion/linking/AbstractTridionLinkResolver.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dxa-framework/dxa-tridion-provider/src/main/java/com/sdl/webapp/tridion/linking/AbstractTridionLinkResolver.java b/dxa-framework/dxa-tridion-provider/src/main/java/com/sdl/webapp/tridion/linking/AbstractTridionLinkResolver.java
index ecdecebd2..23122d887 100644
--- a/dxa-framework/dxa-tridion-provider/src/main/java/com/sdl/webapp/tridion/linking/AbstractTridionLinkResolver.java
+++ b/dxa-framework/dxa-tridion-provider/src/main/java/com/sdl/webapp/tridion/linking/AbstractTridionLinkResolver.java
@@ -63,7 +63,7 @@ public String resolveLink(String uri, int publicationId, boolean isBinary) {
         }
 
         final int itemId = Integer.parseInt(parts[1]);
-        final int itemType = parts.length > 2 ? Integer.parseInt(parts[2]) : 16;
+        final int itemType = parts.length > 2 && !parts[2].startsWith("v") ? Integer.parseInt(parts[2]) : 16;
 
         switch (itemType) {
             case 16:

From a77520353c801934410c03f0964a2167c54458f4 Mon Sep 17 00:00:00 2001
From: Alexey Zarakovskiy <azarakovskiy@sdl.com>
Date: Thu, 19 Jan 2017 18:05:33 +0100
Subject: [PATCH 20/42] TSI-2256, TSI-1991, TSI-2126 fixed getXUrl() methods in
 WebRequestContext

(cherry picked from commit aa0b4fa)
---
 .../webapp/common/api/WebRequestContext.java  | 105 +-----
 .../common/controller/PageController.java     |   4 +-
 .../common/impl/WebRequestContextImpl.java    | 316 +++++-------------
 .../impl/WebRequestContextImplTest.java       |  59 +++-
 4 files changed, 144 insertions(+), 340 deletions(-)

diff --git a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/WebRequestContext.java b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/WebRequestContext.java
index 3fd986599..4bac7f75c 100644
--- a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/WebRequestContext.java
+++ b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/WebRequestContext.java
@@ -1,12 +1,9 @@
 package com.sdl.webapp.common.api;
 
-import com.sdl.webapp.common.api.contextengine.ContextEngine;
 import com.sdl.webapp.common.api.localization.Localization;
 import com.sdl.webapp.common.api.model.PageModel;
 import com.sdl.webapp.common.api.model.RegionModel;
 
-import javax.servlet.ServletRequest;
-
 /**
  * Provides information relevant for the current request.
  */
@@ -14,54 +11,28 @@ public interface WebRequestContext {
 
     /**
      * Gets the base URL for the current request. The base URL consists of the protocol, server name, and port number.
-     * It does not include the context path of the web application.
+     * It does not include the context path of the web application. Does not end with a slash.
      *
      * @return The base URL for the current request.
      */
     String getBaseUrl();
 
     /**
-     * Sets the base URL for the current request.
-     *
-     * @param baseUrl The base URL for the current request.
-     * @deprecated since 1.5, will be removed in 2.0
-     */
-    @Deprecated
-    void setBaseUrl(String baseUrl);
-
-    /**
-     * Gets the context path of the web application.
+     * Gets the context path of the web application in a servlet container. For root applications return an empty string.
+     * Does not end with a slash.
      *
      * @return The context path of the web application.
      */
     String getContextPath();
 
-    /**
-     * Sets the context path of the web application.
-     *
-     * @param contextPath The context path of the web application.
-     * @deprecated since 1.5, will be removed in 2.0
-     */
-    @Deprecated
-    void setContextPath(String contextPath);
-
     /**
      * Gets the request path of the current request. This path is relative to the context path of the web application.
-     * If the current request is an include, this returns the path of the original request.
+     * If the current request is an include, this returns the path of the original request. Does not end with a slash.
      *
      * @return The request path of the current request.
      */
     String getRequestPath();
 
-    /**
-     * Sets the request path of the current request.
-     *
-     * @param requestPath The request path of the current request.
-     * @deprecated since 1.5, will be removed in 2.0
-     */
-    @Deprecated
-    void setRequestPath(String requestPath);
-
     /**
      * Gets the full URL of the current request, consisting of the base URL, context path and request path.
      *
@@ -71,12 +42,6 @@ public interface WebRequestContext {
 
     boolean isContextCookiePresent();
 
-    /**
-     * @deprecated since 1.5, will be removed in 2.0
-     */
-    @Deprecated
-    void setContextCookiePresent(boolean present);
-
     /**
      * Gets the localization of the current request.
      *
@@ -84,15 +49,6 @@ public interface WebRequestContext {
      */
     Localization getLocalization();
 
-    /**
-     * Sets the localization of the current request.
-     *
-     * @param localization a {@link com.sdl.webapp.common.api.localization.Localization} object.
-     * @deprecated since 1.5, will be removed in 2.0
-     */
-    @Deprecated
-    void setLocalization(Localization localization);
-
     /**
      * Checks if the web application is in preview mode (when XPM is enabled).
      *
@@ -142,39 +98,6 @@ public interface WebRequestContext {
      */
     void popContainerSize();
 
-    /**
-     * Gets the contextengine of the current request.
-     *
-     * @return The contextengine of the current request.
-     * @deprecated since 1.5, will be removed in 2.0
-     */
-    @Deprecated
-    ContextEngine getContextEngine();
-
-    /**
-     * @deprecated since 1.5, will be removed in 2.0
-     */
-    @Deprecated
-    boolean isNoLocalization();
-
-    /**
-     * @deprecated since 1.5, will be removed in 2.0
-     */
-    @Deprecated
-    void setNoLocalization(boolean value);
-
-    /**
-     * @deprecated since 1.6, use {@link #getPage()}
-     */
-    @Deprecated
-    String getPageId();
-
-    /**
-     * @deprecated since 1.5, will be removed in 2.0
-     */
-    @Deprecated
-    void setPageId(String value);
-
     /**
      * Return the current page model.
      *
@@ -187,32 +110,12 @@ public interface WebRequestContext {
 
     boolean isDeveloperMode();
 
-    /**
-     * @deprecated since 1.5, will be removed in 2.0
-     */
-    @Deprecated
-    void setDeveloperMode(boolean value);
-
     boolean isInclude();
 
-    /**
-     * @deprecated since 1.5, will be removed in 2.0
-     */
-    @Deprecated
-    void setInclude(boolean value);
-
     RegionModel getParentRegion();
 
     void pushParentRegion(RegionModel value);
 
     void popParentRegion();
 
-    /**
-     * <p>Current servlet request.</p>
-     *
-     * @return a {@link javax.servlet.ServletRequest} object.
-     * @deprecated since 1.5, will be removed in 2.0
-     */
-    @Deprecated
-    ServletRequest getServletRequest();
 }
diff --git a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/controller/PageController.java b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/controller/PageController.java
index 074697e38..ee08247e8 100644
--- a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/controller/PageController.java
+++ b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/controller/PageController.java
@@ -139,7 +139,7 @@ public String handleGetPage(HttpServletRequest request, HttpServletResponse resp
         request.setAttribute(MEDIAHELPER, mediaHelper);
         request.setAttribute(SCREEN_WIDTH, mediaHelper.getScreenWidth());
         request.setAttribute(SOCIALSHARE_URL, webRequestContext.getFullUrl());
-        request.setAttribute(CONTEXTENGINE, webRequestContext.getContextEngine());
+        request.setAttribute(CONTEXTENGINE, context);
 
         final MvcData mvcData = page.getMvcData();
         log.trace("Page MvcData: {}", mvcData);
@@ -249,7 +249,7 @@ public String handleNotFoundException(HttpServletRequest request, HttpServletRes
         request.setAttribute(MEDIAHELPER, mediaHelper);
         request.setAttribute(SCREEN_WIDTH, mediaHelper.getScreenWidth());
         request.setAttribute(SOCIALSHARE_URL, webRequestContext.getFullUrl());
-        request.setAttribute(CONTEXTENGINE, webRequestContext.getContextEngine());
+        request.setAttribute(CONTEXTENGINE, context);
 
         response.setStatus(SC_NOT_FOUND);
         return this.viewNameResolver.resolveView(pageModel.getMvcData(), "Page");
diff --git a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/WebRequestContextImpl.java b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/WebRequestContextImpl.java
index ccd6f4aae..1363e4cb7 100644
--- a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/WebRequestContextImpl.java
+++ b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/WebRequestContextImpl.java
@@ -30,7 +30,7 @@
 import java.util.Stack;
 
 /**
- * <p>This implementation gets information about the display width etc. from the Ambient Data Framework.</p>
+ * This implementation gets information about the display width etc. from the Ambient Data Framework.
  */
 @Slf4j
 @Primary
@@ -40,14 +40,33 @@ public class WebRequestContextImpl implements WebRequestContext {
 
     private final UrlPathHelper urlPathHelper = new UrlPathHelper();
 
+    @Getter(lazy = true)
+    private final Boolean noLocalization = noLocalization();
+
     @Autowired
     private MediaHelper mediaHelper;
 
-    @Getter
     @Autowired
     private HttpServletRequest servletRequest;
 
-    @Getter
+    @Getter(lazy = true)
+    private final boolean include = include();
+
+    @Getter(lazy = true)
+    private final String contextPath = contextPath();
+
+    @Getter(lazy = true)
+    private final String requestPath = requestPath();
+
+    @Getter(lazy = true)
+    private final String baseUrl = baseUrl();
+
+    @Getter(lazy = true)
+    private final boolean developerMode = developerMode();
+
+    @Getter(lazy = true)
+    private final boolean contextCookiePresent = contextCookiePresent();
+
     @Autowired
     private ContextEngine contextEngine;
 
@@ -63,25 +82,8 @@ public class WebRequestContextImpl implements WebRequestContext {
     @Autowired(required = false)
     private UnknownLocalizationHandler unknownLocalizationHandler;
 
-    private SettableField<Boolean> include = new SettableField<>();
-
-    private SettableField<String> contextPath = new SettableField<>();
-
-    private SettableField<String> requestPath = new SettableField<>();
-
-    private SettableField<String> baseUrl = new SettableField<>();
-
-    private SettableField<Boolean> developerMode = new SettableField<>();
-
-    private SettableField<Boolean> contextCookiePresent = new SettableField<>();
-
-    private SettableField<Localization> localization = new SettableField<>();
-
-    private SettableField<Boolean> noLocalization = new SettableField<>();
-
-    @Getter
-    @Setter
-    private String pageId;
+    @Getter(lazy = true)
+    private final Localization localization = localization();
 
     @Getter
     @Setter
@@ -91,97 +93,11 @@ public class WebRequestContextImpl implements WebRequestContext {
 
     private Stack<Integer> containerSizeStack = new Stack<>();
 
-    @Override
-    public String getBaseUrl() {
-        if (this.baseUrl.isSet) {
-            return this.baseUrl.value;
-        }
-        String newValue = baseUrl();
-        setBaseUrl(newValue);
-        return newValue;
-    }
-
-    @Override
-    public void setBaseUrl(String baseUrl) {
-        this.baseUrl.value = baseUrl;
-        this.baseUrl.isSet = true;
-    }
-
-    @Override
-    public String getContextPath() {
-        if (contextPath.isSet) {
-            return contextPath.value;
-        }
-        String newValue = contextPath();
-        setContextPath(newValue);
-        return newValue;
-    }
-
-    @Override
-    public void setContextPath(String contextPath) {
-        this.contextPath.value = contextPath;
-        this.contextPath.isSet = true;
-    }
-
-    @Override
-    public String getRequestPath() {
-        if (requestPath.isSet) {
-            return requestPath.value;
-        }
-        String newValue = requestPath();
-        setRequestPath(newValue);
-        return newValue;
-    }
-
-    @Override
-    public void setRequestPath(String requestPath) {
-        this.requestPath.value = requestPath;
-        this.requestPath.isSet = true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public String getFullUrl() {
         return getBaseUrl() + getContextPath() + getRequestPath();
     }
 
-    @Override
-    public boolean isContextCookiePresent() {
-        if (this.contextCookiePresent.isSet) {
-            return this.contextCookiePresent.value;
-        }
-        boolean value = contextCookiePresent();
-        setContextCookiePresent(value);
-        return value;
-    }
-
-    @Override
-    public void setContextCookiePresent(boolean present) {
-        this.contextCookiePresent.value = present;
-        this.contextCookiePresent.isSet = true;
-    }
-
-    @Override
-    public Localization getLocalization() {
-        if (localization.isSet) {
-            return localization.value;
-        }
-        Localization value = localization();
-        setLocalization(value);
-        return value;
-    }
-
-    @Override
-    public void setLocalization(Localization localization) {
-        this.localization.value = localization;
-        this.localization.isSet = true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public boolean isPreview() {
         // Should return true if the request is from XPM (NOTE currently always true for staging as we cannot reliably
@@ -191,122 +107,68 @@ public boolean isPreview() {
 
     @Override
     public ScreenWidth getScreenWidth() {
-        return screenWidth();
+        int width = isContextCookiePresent() ? getDisplayWidth() : Width.MAX_WIDTH;
+
+        if (width < mediaHelper.getSmallScreenBreakpoint()) {
+            return ScreenWidth.EXTRA_SMALL;
+        }
+
+        if (width < mediaHelper.getMediumScreenBreakpoint()) {
+            return ScreenWidth.SMALL;
+        }
+
+        if (width < mediaHelper.getLargeScreenBreakpoint()) {
+            return ScreenWidth.MEDIUM;
+        }
+
+        return ScreenWidth.LARGE;
     }
 
     @Override
     public int getMaxMediaWidth() {
-        return maxMediaWidth();
+        return (int) Math.max(1.0, getPixelRatio()) * Math.min(getDisplayWidth(), Width.MAX_WIDTH);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public int getContainerSize() {
         return containerSizeStack.peek();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void pushContainerSize(int containerSize) {
+        int size = containerSize;
         if (containerSize == 0) {
-            containerSize = mediaHelper.getGridSize();
+            size = mediaHelper.getGridSize();
         }
         if (!containerSizeStack.isEmpty()) {
             int parentContainerSize = containerSizeStack.peek();
-            containerSize = containerSize * parentContainerSize / mediaHelper.getGridSize();
+            size = containerSize * parentContainerSize / mediaHelper.getGridSize();
         }
-        containerSizeStack.push(containerSize);
+        containerSizeStack.push(size);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void popContainerSize() {
         containerSizeStack.pop();
     }
 
-    @Override
-    public boolean isNoLocalization() {
-        if (noLocalization.isSet) {
-            return noLocalization.value;
-        }
-        return getLocalization() == null;
-    }
-
-    @Override
-    public void setNoLocalization(boolean value) {
-        this.noLocalization.value = value;
-        this.noLocalization.isSet = true;
-    }
-
-    @Override
-    public boolean isDeveloperMode() {
-        if (developerMode.isSet) {
-            return developerMode.value;
-        }
-        boolean value = developerMode();
-        setDeveloperMode(value);
-        return value;
-    }
-
-    @Override
-    public void setDeveloperMode(boolean value) {
-        this.developerMode.value = value;
-        this.developerMode.isSet = true;
-    }
-
-    @Override
-    public boolean isInclude() {
-        if (include.isSet) {
-            return include.value;
-        }
-
-        boolean newValue = include();
-        setInclude(newValue);
-        return newValue;
-    }
-
-    @Override
-    public void setInclude(boolean value) {
-        include.value = value;
-        include.isSet = true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public RegionModel getParentRegion() {
         return parentRegionStack.isEmpty() ? null : parentRegionStack.peek();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void pushParentRegion(RegionModel parentRegion) {
         parentRegionStack.push(parentRegion);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void popParentRegion() {
         parentRegionStack.pop();
     }
 
     private String baseUrl() {
-        String baseUrl = servletRequest.getRequestURL().toString();
-        if (baseUrl.endsWith("/")) {
-            baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
-        }
-        return baseUrl;
+        return servletRequest.getRequestURL().toString().replaceFirst(servletRequest.getRequestURI() + "$", "");
     }
 
     private String contextPath() {
@@ -314,7 +176,7 @@ private String contextPath() {
     }
 
     private String requestPath() {
-        return urlPathHelper.getOriginatingRequestUri(servletRequest);
+        return urlPathHelper.getPathWithinApplication(servletRequest);
     }
 
     private boolean developerMode() {
@@ -333,32 +195,35 @@ private boolean contextCookiePresent() {
         return false;
     }
 
+    private boolean noLocalization() {
+        return getLocalization() == null;
+    }
+
     private Localization localization() {
-        Localization localization = null;
+        Localization resolveLocalization = null;
         try {
-            localization = localizationResolver.getLocalization(getFullUrl());
+            resolveLocalization = localizationResolver.getLocalization(getFullUrl());
         } catch (LocalizationResolverException e) {
             if (unknownLocalizationHandler != null) {
                 log.info("Localization is not resolved for {}, Localization handler is set, trying to resolve using it", getFullUrl());
-                localization = unknownLocalizationHandler.handleUnknown(e, servletRequest);
-                if (localization == null) {
+                resolveLocalization = unknownLocalizationHandler.handleUnknown(e, servletRequest);
+                if (resolveLocalization == null) {
                     log.info("Unknown Localization handler is set but localization wasn't resolved with it, fallback");
-                    LocalizationNotResolvedException fallbackException =
-                            unknownLocalizationHandler.getFallbackException(e, servletRequest);
+                    LocalizationNotResolvedException fallbackException = unknownLocalizationHandler.getFallbackException(e, servletRequest);
                     if (fallbackException != null) {
                         throw fallbackException;
                     }
                     log.info("Fallback exception from Unknown Localization Handler is null, fallback to default handling");
                 }
             }
-            if (localization == null) {
+            if (resolveLocalization == null) {
                 throw new LocalizationNotFoundException("Localization not found", e);
             }
         }
         if (log.isTraceEnabled()) {
-            log.trace("Localization for {} is: [{}] {}", getFullUrl(), localization.getId(), localization.getPath());
+            log.trace("Localization for {} is: [{}] {}", getFullUrl(), resolveLocalization.getId(), resolveLocalization.getPath());
         }
-        return localization;
+        return resolveLocalization;
     }
 
     public boolean include() {
@@ -366,62 +231,43 @@ public boolean include() {
     }
 
     private int displayWidth() {
-        Integer displayWidth = contextEngine.getClaims(BrowserClaims.class).getDisplayWidth();
-        if (displayWidth == null) {
-            return Width.defaultWidth;
-        }
-
-        // NOTE: The context engine uses a default browser width of 800, which we override to 1024
-        if (displayWidth == 800 && contextCookiePresent()) {
-            return Width.defaultWidth;
+        BrowserClaims claims = contextEngine.getClaims(BrowserClaims.class);
+        if (claims == null) {
+            return Width.DEFAULT_WIDTH;
         }
 
-        return displayWidth;
-    }
-
-    private ScreenWidth screenWidth() {
-        int width = isContextCookiePresent() ? getDisplayWidth() : Width.maxWidth;
-
-        if (width < mediaHelper.getSmallScreenBreakpoint()) {
-            return ScreenWidth.EXTRA_SMALL;
+        Integer resolveDisplayWidth = claims.getDisplayWidth();
+        if (resolveDisplayWidth == null) {
+            return Width.DEFAULT_WIDTH;
         }
 
-        if (width < mediaHelper.getMediumScreenBreakpoint()) {
-            return ScreenWidth.SMALL;
-        }
-
-        if (width < mediaHelper.getLargeScreenBreakpoint()) {
-            return ScreenWidth.MEDIUM;
+        // NOTE: The context engine uses a default browser width of 800, which we override to 1024
+        if (resolveDisplayWidth == 800 && contextCookiePresent()) {
+            return Width.DEFAULT_WIDTH;
         }
 
-        return ScreenWidth.LARGE;
-    }
-
-    private int maxMediaWidth() {
-        return (int) Math.max(1.0, getPixelRatio()) * Math.min(getDisplayWidth(), Width.maxWidth);
+        return resolveDisplayWidth;
     }
 
     private double pixelRatio() {
-        Double pixelRatio = contextEngine.getClaims(DeviceClaims.class).getPixelRatio();
-        if (pixelRatio == null) {
-            pixelRatio = 1.0;
-            log.debug("Pixel ratio ADF claim not available - using default value: {}", pixelRatio);
-        }
-        return pixelRatio;
-    }
-
-    private interface Width {
+        DeviceClaims claims = contextEngine.getClaims(DeviceClaims.class);
 
-        int defaultWidth = 1024;
+        Double resolvePixelRatio;
+        if (claims == null || (resolvePixelRatio = claims.getPixelRatio()) == null) {
+            resolvePixelRatio = 1.0;
+            log.debug("Pixel ratio ADF claim not available - using default value: {}", resolvePixelRatio);
+        }
 
-        int maxWidth = 1024;
+        return resolvePixelRatio;
     }
 
-    //todo dxa2 replace with @Getter(lazy=true)
-    private static class SettableField<T> {
+    private class Width {
+
+        static final int DEFAULT_WIDTH = 1024;
 
-        T value;
+        static final int MAX_WIDTH = 1024;
 
-        boolean isSet;
+        private Width() {
+        }
     }
 }
diff --git a/dxa-framework/dxa-common-impl/src/test/java/com/sdl/webapp/common/impl/WebRequestContextImplTest.java b/dxa-framework/dxa-common-impl/src/test/java/com/sdl/webapp/common/impl/WebRequestContextImplTest.java
index 646f3fb66..b23ec701d 100644
--- a/dxa-framework/dxa-common-impl/src/test/java/com/sdl/webapp/common/impl/WebRequestContextImplTest.java
+++ b/dxa-framework/dxa-common-impl/src/test/java/com/sdl/webapp/common/impl/WebRequestContextImplTest.java
@@ -17,13 +17,13 @@
 import org.springframework.test.util.ReflectionTestUtils;
 
 import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertSame;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -38,11 +38,17 @@ public class WebRequestContextImplTest {
     @Mock
     private LocalizationResolver localizationResolver;
 
+    @Mock
+    private HttpServletRequest servletRequest;
+
     @Before
     public void init() {
-        doReturn("Hello").when(webRequestContext).getFullUrl();
+        when(servletRequest.getRequestURL()).thenReturn(new StringBuffer("http://localhost:8080/context/publication/request"));
+        when(servletRequest.getRequestURI()).thenReturn("/context/publication/request");
+        when(servletRequest.getContextPath()).thenReturn("/context");
     }
 
+
     @Test(expected = LocalizationNotFoundException.class)
     public void shouldThrowExceptionIfNoLocalizationFoundWithSpecialHandler() throws Exception {
         //given
@@ -139,4 +145,53 @@ public void shouldThrowExceptionIfNoLocalizationFoundWithoutSpecialHandler() thr
         //then
         // exception
     }
+
+    @Test
+    public void shouldReturnContextPath() {
+        //when
+        String contextPath = webRequestContext.getContextPath();
+
+        //then
+        assertEquals("/context", contextPath);
+    }
+
+    @Test
+    public void shouldReturnRequestPath_RelativeToContext() {
+        //when
+        String requestPath = webRequestContext.getRequestPath();
+
+        //then
+        assertEquals("/publication/request", requestPath);
+    }
+
+    @Test
+    public void shouldReturnBaseUrl() {
+        //when
+        String baseUrl = webRequestContext.getBaseUrl();
+
+        //then
+        assertEquals("http://localhost:8080", baseUrl);
+    }
+
+    @Test
+    public void shouldReturnFullUrl() {
+        //when
+        String fullUrl = webRequestContext.getFullUrl();
+
+        //then
+        assertEquals("http://localhost:8080/context/publication/request", fullUrl);
+    }
+
+    @Test
+    public void shouldBeAwareOfRootRequests() {
+        //given
+        when(servletRequest.getRequestURL()).thenReturn(new StringBuffer("http://localhost:8080/"));
+        when(servletRequest.getRequestURI()).thenReturn("/");
+
+        //when
+        String baseUrl = webRequestContext.getBaseUrl();
+
+        //then
+        assertEquals("http://localhost:8080", baseUrl);
+    }
 }
\ No newline at end of file

From d044d09bce29524983a74bb6a13a29a357fe730f Mon Sep 17 00:00:00 2001
From: mborysenko <mborysenko@sdl.com>
Date: Wed, 4 Oct 2017 14:13:00 +0200
Subject: [PATCH 21/42] Added base URL to urls in sitemap. Restored leading
 slash

(cherry picked from commit 8e59bc3)
---
 .../com/sdl/webapp/common/controller/SiteMapXmlController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/controller/SiteMapXmlController.java b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/controller/SiteMapXmlController.java
index f255adace..88fbcd66f 100644
--- a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/controller/SiteMapXmlController.java
+++ b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/controller/SiteMapXmlController.java
@@ -62,7 +62,7 @@ private static void writeSitemapItemsXml(Collection<SitemapItem> items, StringBu
      *
      * @throws NavigationProviderException If an error occurs so that the navigation data cannot be retrieved.
      */
-    @RequestMapping(value = {"/sitemap.xml", "{path}/sitemap.xml"}, produces = MediaType.APPLICATION_XML_VALUE)
+    @RequestMapping(value = {"/sitemap.xml", "/{path}/sitemap.xml"}, produces = MediaType.APPLICATION_XML_VALUE)
     @ResponseBody
     public String handleGetSiteMapXml(HttpServletResponse response) throws NavigationProviderException {
         LOG.trace("handleGetSiteMapXml");

From 327335cea689762bcf7121f5efdac6650845ceeb Mon Sep 17 00:00:00 2001
From: mborysenko <mborysenko@sdl.com>
Date: Wed, 4 Oct 2017 14:17:09 +0200
Subject: [PATCH 22/42] More efficient processing for non published assets,
 including allowing versioning. Simplified return statement

(cherry picked from commit 94fdaf8)
---
 .../webapp/common/impl/localization/LocalizationImpl.java    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java
index e2c6e1669..bd1072f8e 100644
--- a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java
+++ b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/localization/LocalizationImpl.java
@@ -112,10 +112,7 @@ public boolean isStaticContent(String url) {
      */
     @Override
     public boolean isNonPublishedAsset(String url) {
-        if (!this.isHtmlDesignPublished && SYSTEM_ASSETS_PATTERN.matcher(url).matches()){
-            return true;
-        }
-        return false;
+        return !this.isHtmlDesignPublished && SYSTEM_ASSETS_PATTERN.matcher(url).matches();
     }
 
     /**

From a6d41d8472ea84ab1e7364f84a6ee6f6dce040a2 Mon Sep 17 00:00:00 2001
From: Alexey Zarakovskiy <azarakovskiy@sdl.com>
Date: Thu, 5 Oct 2017 13:34:49 +0200
Subject: [PATCH 23/42] TSI-2764 add dependency on missing JSR303 validator
 (TSI-2649)

---
 dxa-bom/pom.xml                         | 5 +++++
 dxa-framework/dxa-web8-provider/pom.xml | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/dxa-bom/pom.xml b/dxa-bom/pom.xml
index 3f46baeee..ffc94633a 100644
--- a/dxa-bom/pom.xml
+++ b/dxa-bom/pom.xml
@@ -749,6 +749,11 @@
                 <artifactId>annotations</artifactId>
                 <version>13.0</version>
             </dependency>
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-validator</artifactId>
+                <version>5.3.4.Final</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/dxa-framework/dxa-web8-provider/pom.xml b/dxa-framework/dxa-web8-provider/pom.xml
index 3725e41d6..72df7e1e9 100644
--- a/dxa-framework/dxa-web8-provider/pom.xml
+++ b/dxa-framework/dxa-web8-provider/pom.xml
@@ -54,6 +54,10 @@
             <artifactId>cil</artifactId>
             <type>pom</type>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>xalan</groupId>

From f8cfe32203ec93b4883ac053773591f035df3f0a Mon Sep 17 00:00:00 2001
From: Alexey Zarakovskiy <azarakovskiy@sdl.com>
Date: Thu, 19 Oct 2017 11:21:16 +0200
Subject: [PATCH 24/42] TSI-2807 UDP 10.1.0-1003 version, RC2

---
 dxa-bom/pom.xml                               |   4 ++--
 .../dd4t-api-2.0.15.3-DXA18.jar}              | Bin 42286 -> 42286 bytes
 .../dd4t-api-2.0.15.3-DXA18.pom}              |   4 ++--
 .../dd4t-core-2.0.15.3-DXA18.jar}             | Bin 97697 -> 97697 bytes
 .../dd4t-core-2.0.15.3-DXA18.pom}             |   2 +-
 .../dd4t-databind-2.0.15.3-DXA18.jar}         | Bin 35385 -> 35388 bytes
 .../dd4t-databind-2.0.15.3-DXA18.pom}         |   4 ++--
 .../dd4t-parent-2.0.15.3-DXA18.pom}           |   2 +-
 .../dd4t-providers-2.0.15.3-DXA18.jar}        | Bin 18390 -> 18390 bytes
 .../dd4t-providers-2.0.15.3-DXA18.pom}        |   4 ++--
 10 files changed, 10 insertions(+), 10 deletions(-)
 rename local-project-repo/org/dd4t/dd4t-api/{2.0.15.2-DXA18/dd4t-api-2.0.15.2-DXA18.jar => 2.0.15.3-DXA18/dd4t-api-2.0.15.3-DXA18.jar} (70%)
 rename local-project-repo/org/dd4t/dd4t-api/{2.0.15.2-DXA18/dd4t-api-2.0.15.2-DXA18.pom => 2.0.15.3-DXA18/dd4t-api-2.0.15.3-DXA18.pom} (96%)
 rename local-project-repo/org/dd4t/dd4t-core/{2.0.15.2-DXA18/dd4t-core-2.0.15.2-DXA18.jar => 2.0.15.3-DXA18/dd4t-core-2.0.15.3-DXA18.jar} (86%)
 rename local-project-repo/org/dd4t/dd4t-core/{2.0.15.2-DXA18/dd4t-core-2.0.15.2-DXA18.pom => 2.0.15.3-DXA18/dd4t-core-2.0.15.3-DXA18.pom} (99%)
 rename local-project-repo/org/dd4t/dd4t-databind/{2.0.15.2-DXA18/dd4t-databind-2.0.15.2-DXA18.jar => 2.0.15.3-DXA18/dd4t-databind-2.0.15.3-DXA18.jar} (84%)
 rename local-project-repo/org/dd4t/dd4t-databind/{2.0.15.2-DXA18/dd4t-databind-2.0.15.2-DXA18.pom => 2.0.15.3-DXA18/dd4t-databind-2.0.15.3-DXA18.pom} (98%)
 rename local-project-repo/org/dd4t/dd4t-parent/{2.0.15.2-DXA18/dd4t-parent-2.0.15.2-DXA18.pom => 2.0.15.3-DXA18/dd4t-parent-2.0.15.3-DXA18.pom} (99%)
 rename local-project-repo/org/dd4t/dd4t-providers/{2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.jar => 2.0.15.3-DXA18/dd4t-providers-2.0.15.3-DXA18.jar} (84%)
 rename local-project-repo/org/dd4t/dd4t-providers/{2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.pom => 2.0.15.3-DXA18/dd4t-providers-2.0.15.3-DXA18.pom} (95%)

diff --git a/dxa-bom/pom.xml b/dxa-bom/pom.xml
index ffc94633a..7a3a47693 100644
--- a/dxa-bom/pom.xml
+++ b/dxa-bom/pom.xml
@@ -45,8 +45,8 @@
     </developers>
 
     <properties>
-        <dd4t.version>2.0.15.2-DXA18</dd4t.version>
-        <cd-cil.version>10.1.0-1001</cd-cil.version>
+        <dd4t.version>2.0.15.3-DXA18</dd4t.version>
+        <cd-cil.version>10.1.0-1003</cd-cil.version>
 
         <!-- DXA versions -->
         <dxa.version>${project.version}</dxa.version>
diff --git a/local-project-repo/org/dd4t/dd4t-api/2.0.15.2-DXA18/dd4t-api-2.0.15.2-DXA18.jar b/local-project-repo/org/dd4t/dd4t-api/2.0.15.3-DXA18/dd4t-api-2.0.15.3-DXA18.jar
similarity index 70%
rename from local-project-repo/org/dd4t/dd4t-api/2.0.15.2-DXA18/dd4t-api-2.0.15.2-DXA18.jar
rename to local-project-repo/org/dd4t/dd4t-api/2.0.15.3-DXA18/dd4t-api-2.0.15.3-DXA18.jar
index d5c5df0d93e8cf0ab04d23f2761414f1a4b2c7fa..c9febbd4ce73bf9710bf9be98906d8932cd3964e 100644
GIT binary patch
delta 2361
zcmYLJcU03?6wY7-Fi}Cl6fH)OJz^3Olq!M>5>^5zB16GZYY(-85CqB;LKp&%C3`7V
zD>a6C9967}gE|mL5v}NvaSmb;s|MRz`^&ww%|GA0_xtX8dGFWW&1mmtumi<REq$8i
z=NTGQ!nR;~P#|go=raTO!-7e1ghyWl7(%xJ%$V}|Ofz!aMUVVS*N6BhU4(juaLP9$
zJ#x0ezkR3%B!g~7jxh|UbY|pym;o7M=z%}USgdJF_)G!#TbYi46%<l&)m5eg9RzBv
z$(d9@JYh||`>6$z=ro!I;qka6JfB0XbOu4r(Jj*g<DkLU3^2GHIvVq4m_Q}fl9|iV
zkQv&e(PreO4P7VZ`~~=m`x=smKH;F^ov9%m7=wAwfEk|`gG`9oSultZ4|7-x<QO34
zKZA6$#SWa{rll(~de-NG>9)?qK!9zZCO~ZMx`23Xrv-%Sy?r3|^>rNLQ2&egyvc(E
zfi{gcs7EsVXOTuai_CY>R&8=xqYasdMd6U3Vmaqv*Af>ytkvmy5{wqvGGvlJ8$fNu
zil=C}uY8EcTu%XNB&#1`wv*Q+8n$b-7@DI{EfQOSm~8YNh2GwNQ=Jn01z6^2Ko=yD
zILSxI*&|(uOkI#JmTL=kM58Yx1zM8zq1~Xh*dRluAxw%%Z#GhOHRog#@eVpJh}?@z
zL)0Oh*E>3Z2~_pgFw9nOi@+<fe&-PuM{|YZHqC6^MqQy48kwKOC9#c$WNG{^$T}9E
zidhZ`+p%(GVlqZ%Cs8+1v-j$~KValTvIHZN)NL3!^GzW}eA1VIL9#P!HAzI7f$w7^
z!;QtKW~f*&t%cZSu1eduR4;^=p1$_;t-eglNWU+om6waYY<uZE(K$Y5(f;V*!D`tY
zL+{fmiRx6fxmU^=``4TN4@PG;ywQ<#ngrJCUz8>ECZGB^_fxe$xs-LPEP74QJX-D1
z38|7i34XD=peI@>H})zi=6>?-Pv#q$@U*zC;{xxwPfUI9lV>Y?(*6!j8`=2Ob!evJ
zB9}haK<rmN)}u`JfR|Evf@ig$t6z{RbU)5k2Ddur7@PbQ=X6-rwXmY>#g_7ASEQ=#
zwWB*rX9#*X7s^Yvt9uU23emH?X2g{hgyrjgaine<@BP!D_*s$5>!%mR-0L@WyjHSf
z+P?Xsk9X4T)pL$Ltd+l^Ym?Y4A)QB>v+U?L<W`n(nyz#tL7usm{pTFfp6NM<jOy)2
z9`^1ydD--$^JmrJQQ@iQ&g%P>zwK4V^Lm!rsJ~k$W!2pcFLS?=82`ZEbzt?CZ>PoD
zH6QZuesa^yxo9Y_qtCmePj#cpZ*xqrx$|T9`NLzCzup^sy*u8lW$|6k<fV3<SjGpz
zp6jVcb*g4F*u$d+4n98j+YNubS1csEvQ3R|ugkmYtomTYxx}r1&WgNpEpE*AZ5L_E
zo~z%c7_yKym)e~Bf?UnENsEi??l%`1Y2{YW?s(z2p*2y*ZI@c<S*NFNq8|%eqv%fZ
zUluSJ6`YdmpzeNuc$QCv`?KMK!00s>+&T@$6{-)D4=%i%JMx=ix=u}Qny37bPiGtJ
z_wVz%8@yDh*`ZI1G821V`Mym#vm@Yd+P`0OmgZ|NR$G+O$XENMPS>qNUIjQx_#MG~
zQHOwkLco{oN?>y&d;woHGGr@uu)THTwrX*&utzAmFML2=?Q?-EYL_E|#}%Ek0<bm5
z3D7RbluYDsLBq~n2`I^R1uUHM@8o)bZ!BL0IMBi+339ypEmTbNXxX`@L_5#&Ki(@3
z`S`rmz~7<xU-GPgrz@6Ep(%+_m;;}s@B_T7kN{fc2LLAJM*{Ze2Ld`2gaZ~7gaVEf
z_yRf?qF!DY2(=#-t_NIPBn4hkgms@#zUIja_XlHqzZkG@zdxW&G1ik6qy9$m28dgi
zpe~^#2>cr*SeI8C2L3mtIRCBE5b!Mt&Lbm1(C-$(d92HDkL0oth~F*4I@aauATOgF
z_j+88bzLi>Kvz={14ysj1h}PgGw82X;(1tA;hb4j$PZVo1Ko-P5uj^0uoY0Z8qX)J
z8uwRLV_lP)P|)wLi2~id8r;*i7UxT=#d&|BQ1gE~)rEt;s1E(%I_&RJk9*eE<9Uot
zp<4s;RSnp8yuk<RxHaN=>~F+AgN+iX>(Ye#)i&Y0;}mN8dNkvlb<OL+S2v?x+!73V
d%`Hm-2U<J<7q<HT|4B}2^=JL}nr^p7{R82&bO8VW

delta 2361
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

diff --git a/local-project-repo/org/dd4t/dd4t-api/2.0.15.2-DXA18/dd4t-api-2.0.15.2-DXA18.pom b/local-project-repo/org/dd4t/dd4t-api/2.0.15.3-DXA18/dd4t-api-2.0.15.3-DXA18.pom
similarity index 96%
rename from local-project-repo/org/dd4t/dd4t-api/2.0.15.2-DXA18/dd4t-api-2.0.15.2-DXA18.pom
rename to local-project-repo/org/dd4t/dd4t-api/2.0.15.3-DXA18/dd4t-api-2.0.15.3-DXA18.pom
index 7c6b6e0f7..1a778bed7 100644
--- a/local-project-repo/org/dd4t/dd4t-api/2.0.15.2-DXA18/dd4t-api-2.0.15.2-DXA18.pom
+++ b/local-project-repo/org/dd4t/dd4t-api/2.0.15.3-DXA18/dd4t-api-2.0.15.3-DXA18.pom
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>dd4t-parent</artifactId>
         <groupId>org.dd4t</groupId>
-        <version>2.0.15.2-DXA18</version>
+        <version>2.0.15.3-DXA18</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
     <artifactId>dd4t-api</artifactId>
-    <version>2.0.15.2-DXA18</version>
+    <version>2.0.15.3-DXA18</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Contains the dd4t interfaces and content model.</description>
diff --git a/local-project-repo/org/dd4t/dd4t-core/2.0.15.2-DXA18/dd4t-core-2.0.15.2-DXA18.jar b/local-project-repo/org/dd4t/dd4t-core/2.0.15.3-DXA18/dd4t-core-2.0.15.3-DXA18.jar
similarity index 86%
rename from local-project-repo/org/dd4t/dd4t-core/2.0.15.2-DXA18/dd4t-core-2.0.15.2-DXA18.jar
rename to local-project-repo/org/dd4t/dd4t-core/2.0.15.3-DXA18/dd4t-core-2.0.15.3-DXA18.jar
index 0a2d45cdcedb3c9625361cc54dccb864b2f0975e..095e9be5dbdccf6f9b3468ed79374a1c170f624c 100644
GIT binary patch
delta 3031
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
CZdAtr

delta 3031
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
IOFoGF4K8MY>i_@%

diff --git a/local-project-repo/org/dd4t/dd4t-core/2.0.15.2-DXA18/dd4t-core-2.0.15.2-DXA18.pom b/local-project-repo/org/dd4t/dd4t-core/2.0.15.3-DXA18/dd4t-core-2.0.15.3-DXA18.pom
similarity index 99%
rename from local-project-repo/org/dd4t/dd4t-core/2.0.15.2-DXA18/dd4t-core-2.0.15.2-DXA18.pom
rename to local-project-repo/org/dd4t/dd4t-core/2.0.15.3-DXA18/dd4t-core-2.0.15.3-DXA18.pom
index 232794167..219385b0e 100644
--- a/local-project-repo/org/dd4t/dd4t-core/2.0.15.2-DXA18/dd4t-core-2.0.15.2-DXA18.pom
+++ b/local-project-repo/org/dd4t/dd4t-core/2.0.15.3-DXA18/dd4t-core-2.0.15.3-DXA18.pom
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dd4t-parent</artifactId>
         <groupId>org.dd4t</groupId>
-        <version>2.0.15.2-DXA18</version>
+        <version>2.0.15.3-DXA18</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/local-project-repo/org/dd4t/dd4t-databind/2.0.15.2-DXA18/dd4t-databind-2.0.15.2-DXA18.jar b/local-project-repo/org/dd4t/dd4t-databind/2.0.15.3-DXA18/dd4t-databind-2.0.15.3-DXA18.jar
similarity index 84%
rename from local-project-repo/org/dd4t/dd4t-databind/2.0.15.2-DXA18/dd4t-databind-2.0.15.2-DXA18.jar
rename to local-project-repo/org/dd4t/dd4t-databind/2.0.15.3-DXA18/dd4t-databind-2.0.15.3-DXA18.jar
index ca363e450647bd7ac41544af76b7c74c6eb48c82..1139c5635858a69f4ce6fcd455374cd47262eaf5 100644
GIT binary patch
delta 1872
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
CJPUUK

delta 1862
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

diff --git a/local-project-repo/org/dd4t/dd4t-databind/2.0.15.2-DXA18/dd4t-databind-2.0.15.2-DXA18.pom b/local-project-repo/org/dd4t/dd4t-databind/2.0.15.3-DXA18/dd4t-databind-2.0.15.3-DXA18.pom
similarity index 98%
rename from local-project-repo/org/dd4t/dd4t-databind/2.0.15.2-DXA18/dd4t-databind-2.0.15.2-DXA18.pom
rename to local-project-repo/org/dd4t/dd4t-databind/2.0.15.3-DXA18/dd4t-databind-2.0.15.3-DXA18.pom
index ee547004a..7e7cad4fe 100644
--- a/local-project-repo/org/dd4t/dd4t-databind/2.0.15.2-DXA18/dd4t-databind-2.0.15.2-DXA18.pom
+++ b/local-project-repo/org/dd4t/dd4t-databind/2.0.15.3-DXA18/dd4t-databind-2.0.15.3-DXA18.pom
@@ -7,11 +7,11 @@
     <parent>
         <artifactId>dd4t-parent</artifactId>
         <groupId>org.dd4t</groupId>
-        <version>2.0.15.2-DXA18</version>
+        <version>2.0.15.3-DXA18</version>
     </parent>
 
     <artifactId>dd4t-databind</artifactId>
-    <version>2.0.15.2-DXA18</version>
+    <version>2.0.15.3-DXA18</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Contains deserialization functionality of datasources.</description>
     <url>https://github.com/dd4t</url>
diff --git a/local-project-repo/org/dd4t/dd4t-parent/2.0.15.2-DXA18/dd4t-parent-2.0.15.2-DXA18.pom b/local-project-repo/org/dd4t/dd4t-parent/2.0.15.3-DXA18/dd4t-parent-2.0.15.3-DXA18.pom
similarity index 99%
rename from local-project-repo/org/dd4t/dd4t-parent/2.0.15.2-DXA18/dd4t-parent-2.0.15.2-DXA18.pom
rename to local-project-repo/org/dd4t/dd4t-parent/2.0.15.3-DXA18/dd4t-parent-2.0.15.3-DXA18.pom
index 985a67152..6ef042c50 100644
--- a/local-project-repo/org/dd4t/dd4t-parent/2.0.15.2-DXA18/dd4t-parent-2.0.15.2-DXA18.pom
+++ b/local-project-repo/org/dd4t/dd4t-parent/2.0.15.3-DXA18/dd4t-parent-2.0.15.3-DXA18.pom
@@ -7,7 +7,7 @@
     <groupId>org.dd4t</groupId>
     <artifactId>dd4t-parent</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.15.2-DXA18</version>
+    <version>2.0.15.3-DXA18</version>
     <modules>
         <module>dd4t-api</module>
         <module>dd4t-core</module>
diff --git a/local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.jar b/local-project-repo/org/dd4t/dd4t-providers/2.0.15.3-DXA18/dd4t-providers-2.0.15.3-DXA18.jar
similarity index 84%
rename from local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.jar
rename to local-project-repo/org/dd4t/dd4t-providers/2.0.15.3-DXA18/dd4t-providers-2.0.15.3-DXA18.jar
index e1843f820e23abfc52d6bc3d0e451e0d7c33c664..0c2a7c4ebc02ade608b3c5f658af343938da5fe1 100644
GIT binary patch
delta 1163
zcmccC&v>n$kvG7bnT3l11Y9G6C-SN=y8tPZh0Gw{4S6v2O9eztR%Fxz(?N{JAbN8L
z<70L(Baib0H<)25`iKS0kdr#h2WC9c2!%-5m>ggQi~P4NVFocKm)UB8>BY8S<0jv<
zbrLj)2=;cCekAaQiGg7uCj*1t<c+q{lj|LY>nn0|&W1+&-!>4bbAMzXaZyfux9;2)
zEn$Zkl`TdWG=$fyl?6{f(wFo7klMfBGS8otEi9>)66&b=ch2(u&L0x<*KHQjnRzLu
zYw`mAYQ_YmX;ZqNs8q~}X+M52v!tS-SoOJ%*?~)~a%)ZPIn$0kQEmxaEgB>1xKhaE
z#n)diUY6DW5jY>==A^epQ7P@<L&g>Lb83@kPgE72@Z^Y;1^@T*?HL@^VQu+~e|lI?
zPnHyZJf-dh!=B?2*-=dkA3Oe*bxAduBYd=_^VW?S8i$vwn3<a_D#<uBsc~X^^&6Ly
zu6c^m>|!N7Sx1yZulBK-Rs83+;nJUf?)Pzts})OGb2|>stY4z@H!yHcQIFY%E_IJ%
zi~RSmsynFl@Ait;sF(Q?mQ|@<Gy6o(cQd(v_tLZ6y6#|zmO-l8yqgmlgpaPYW!orn
ztgHFKt$CZ?%nUrG5s@*;pkw0u6`%G7WQLTu+@7X#=Zx5SgK3gl-61k^av^7?9QVms
z_IFa~4EC)%{nB{m?EcnNU+DRpXVt6*$3Rv6qsKN)3qHHvT&}djWZ%vmzrGcSisc%;
zc1wNCl-rfHuXHw7s`s>0ce+0EN^dcq``+lGPvdUZtHzpBUtG(7&*ZQCbVtCoJDZm@
zbRS9zG1_(}r^)5R{C9k=)2AQibd$co_v`UGwmjj#Mx{%C2l8^9U$WqV_UWSfV_((@
z?U^#g*j2-G$Di}X-v#o0O6L3w`<BO9?a%G|EhU9nY=3(0gNfa5{<Sn0_)TNE<=kU)
zcwJEZpVjyE_~RNL#l3mHVy~mbR?q)ClV9JxyfN)<S6_V2a#x|Vom$gU{@$E&c~<n=
zw)}Mh!FhTS`8W5)?%N>#t$MF=&o+Kr>*e+P44caQ^A*l+`qpfA-9EkP*7Fi?ujc)E
z{CDl%yQiN_T6x2|f70XYMYqEjINjTJe{PkJwaPoqnB|ur*2q8YlbAGT|Mxk0r+#QF
zmT@gyrWv#GdF_%THh0(8L{GjHX_uZ9S1k7Qs9Dkfw>s<Cr!Ic<Y-L997in15<X~`R
z2WE_||INH7M>|I7pVSEb;I9{GuqDL6WQ&o(CZi1@1!cT^fd)nfCeNR0dFyJOJ9B=s
z=_TU}#wJ&duT6gBXbaA1XPu-c+d4^ta`@y(Cws8iY$tuFoC%m_akc}~uFlS2y4yJx
zOuu%{0n<?~(O`N9looSM0`sd~<H7V@*9b6e;bsM<OWh#m>~;&{faUJVqV6Faz#;(R
IqeAyo0IeVWIRF3v

delta 1163
zcmccC&v>n$kvG7bnT3l11ll5<C-SN=w*o1Xh0Gw{4S6v2O9eztR%Fxz(?N{JAbN8L
z<70L(Baib0H<)25`iKS0kdr#h2WC9c2!%-5m>ggQi~P4NVFocKm)UB8>BY8S<0jv<
zbrLL%boQRwutDVw69dCSP6h_O$s28@C)Ya)*H`4`oDIG0Cv7ND>;6c7&5Hh5YtLX#
z*EGh$i2;|JyjE10ZrfaVV{7=f$qw58_Qt(G>p6YGx0N0W-+r7qGqd~nk0+Mi2fMPB
zr`WvXP1w)AV@Vh1OquWRmWN*qe6M0>b6{r}x1Vl7N#?QhZZhAWU3-??a_zNgOnsA=
zdd7|S{1*<_Uq2~3_j8Ynla#m0)4hk81O8Y1K4zw@t*3ah)A)m2UjDvCf^V!P7xoG!
zKaTYiQN5;Jd!4bO`(sW7r`tUCyXE?NiyzL((96AZ?3hcmq4Jfu%`-Mm?Db-EW0cz<
zyms2o<`|iX3x=yEHiU#)%k6s5e7-;;)@BZGpTVk+Ufj0?n(K{^R{UDLsN$(aZi1-)
zq@LsQb)kQoLjPPZ<lcHI-tg0xQ&S3^x1Q)`I=($>ElcsbgFcxCkEflx>(Q`M?2Ih)
zswJh56m}FXx2b;8Q^+>0O+_Y2#A;QIeyNnWtl>J<&JCZRDlgG;PMz3w_;7RAOs-Q)
zAFAm@wz3AyeqD0z;LLpe`WaKU^e<S&DIpfh6_lfsZF%(%+vC7?_sOq6pUy9z9(Ymh
z_nj3vF$;VH&u-5QPOLc^Jk{E8VPbRHvd^)qP1yyTQ_|K=nRfTr-B^LlHMZibW>wD;
zDF}?{@j5nbruPJokC*Q+{P8Hs<Y)%-Eyw-$uO7%videR;<o;?#!I_hIY92<`pWAse
zv}yUIqE(#AodN$V-!TgHbS{j{c=~Qy$@eW6p7<TpOZZrQi%stLiGThkJz^=Y3#^Z5
z7`)N?`g8xUx1R)9G~OMp>$@f05;*(IeCuuZY-O{rt<CuL#7cK^g=5J^mDlH&%{g}`
zb8Av@>y4t~gH@;b?tE(foAF?tPR}-eX6yC!`wW}%{PPvgZsKb;yKet{($424-d@f7
zbNKJty?0MPx#H5FUiXuqvv<DL4p3Zw`@Ns-GFhSTB6*i?W^C*)^6&A`yI19Bp8991
zfO+eM4I=A)KDG;5;qhJj{<S3~)6UPnF@4VQ%8k8$>aDw_9iFcEQK@xH<UboMYjQBO
zu>&(kUe`Rv$<dAx`kKC>AN=(K4Gh8zOtu)AY%($lC@ACQ3p6k?FnRt|%Uf6L+?n&6
zO)nW=FgCerd};C{M_X`CJL@Dp+15!Cl*1=SI@yE8W;^La<xIddi?bb=c6D|J)7{Ro
zVEVOl4w#N|i3Za<ptP845}04@8V{!Lx<-I$3pXn;UFrrgXSZ7r2P}6_7IhEd02Tod
J9~HW%0st}Z2|EA)

diff --git a/local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.pom b/local-project-repo/org/dd4t/dd4t-providers/2.0.15.3-DXA18/dd4t-providers-2.0.15.3-DXA18.pom
similarity index 95%
rename from local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.pom
rename to local-project-repo/org/dd4t/dd4t-providers/2.0.15.3-DXA18/dd4t-providers-2.0.15.3-DXA18.pom
index e3d9ee8d6..e42d478ab 100644
--- a/local-project-repo/org/dd4t/dd4t-providers/2.0.15.2-DXA18/dd4t-providers-2.0.15.2-DXA18.pom
+++ b/local-project-repo/org/dd4t/dd4t-providers/2.0.15.3-DXA18/dd4t-providers-2.0.15.3-DXA18.pom
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dd4t-parent</artifactId>
         <groupId>org.dd4t</groupId>
-        <version>2.0.15.2-DXA18</version>
+        <version>2.0.15.3-DXA18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>${project.groupId}:${project.artifactId}</name>
@@ -43,7 +43,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <tridion.version>10.1.0-1001</tridion.version>
+        <tridion.version>10.1.0-1003</tridion.version>
         <java.version>1.8</java.version>
     </properties>
 

From 29abaa935f62ffdb51591d9aee34d8535896571c Mon Sep 17 00:00:00 2001
From: Paul Adams <majiccode@gmail.com>
Date: Tue, 21 Nov 2017 10:01:10 +0000
Subject: [PATCH 25/42] Updated doc links in readme.md

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2ed3f0343..46861efb4 100644
--- a/README.md
+++ b/README.md
@@ -30,8 +30,7 @@ If you encounter any issues with the Digital Experience Accelerator, please reac
 
 Documentation
 -------------
-Documentation can be found online in the SDL documentation portal: http://docs.sdl.com/sdldxa
-
+Documentation can be found online in the SDL documentation portal: https://docs.sdl.com/SDLDXA18
 
 Repositories
 ------------

From 05c782236065a58c99298a767d4fb90e0d275a32 Mon Sep 17 00:00:00 2001
From: Alexey Zarakovskiy <azarakovskiy@sdl.com>
Date: Tue, 21 Nov 2017 13:43:02 +0100
Subject: [PATCH 26/42] Set CIL version 10.1.0-1012

---
 dxa-bom/pom.xml                               |   2 +-
 .../dd4t-api-2.0.15.3-DXA18.jar               | Bin 42286 -> 42285 bytes
 .../dd4t-core-2.0.15.3-DXA18.jar              | Bin 97697 -> 97696 bytes
 .../dd4t-databind-2.0.15.3-DXA18.jar          | Bin 35388 -> 35386 bytes
 .../dd4t-providers-2.0.15.3-DXA18.jar         | Bin 18390 -> 18389 bytes
 .../dd4t-providers-2.0.15.3-DXA18.pom         |   2 +-
 6 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dxa-bom/pom.xml b/dxa-bom/pom.xml
index 7a3a47693..d06a5f01d 100644
--- a/dxa-bom/pom.xml
+++ b/dxa-bom/pom.xml
@@ -46,7 +46,7 @@
 
     <properties>
         <dd4t.version>2.0.15.3-DXA18</dd4t.version>
-        <cd-cil.version>10.1.0-1003</cd-cil.version>
+        <cd-cil.version>10.1.0-1012</cd-cil.version>
 
         <!-- DXA versions -->
         <dxa.version>${project.version}</dxa.version>
diff --git a/local-project-repo/org/dd4t/dd4t-api/2.0.15.3-DXA18/dd4t-api-2.0.15.3-DXA18.jar b/local-project-repo/org/dd4t/dd4t-api/2.0.15.3-DXA18/dd4t-api-2.0.15.3-DXA18.jar
index c9febbd4ce73bf9710bf9be98906d8932cd3964e..1f86c55097998519b9ee49514ec4e449c08a9eb8 100644
GIT binary patch
delta 1772
zcmY*YZA?>V813x^0ZE&IPS!C}tCf}_v{poLOa_QB%U6L8tyED5%d%zB0Ue0CRcC=h
zf%5VtP+MrH*%p?OX8za`_Ge}bIy0l0Ot-NmsEIK_%p&Y7TkmsjmW`x2=XuU~pO2UO
zempCknw82bOnk&@iSW1Ujb@Kb%@>3rV}ci=IVHjGY5|yv+d^pJQV1PlY~YpbldKr_
zBe$CJ54a5YrCY^V$-eE7#r~%cb8t#FC5;z-N;YGSWe=q>6t76P5gK?SVLhKtI0OuR
z#iwzUSdLhU3lC;m(z4>);RRYbiA2p*Dg~?Uk~7V!1;G`PM-4;}c|Z1;l!!vkfh0YZ
zK$Sw<<933y#BT<<xTYwQnk+r@C*dQ-V>*2ISved}661-m*rZ=bSxh<t#iINi${H2U
zL~rOof^ED))<f#oFu^y;*-&D%Go;LFPa{#Tn-daDmwK6m$Egt{gnrvx0Y^#tUAeIS
zOu~0|W28i~5W^g0Ynh*mX6w@;Lv{Myv_a^Dj9Q$G&UB)yCo2`1FS0KY3A8*9rR{}z
zD7M_6L0-)J9^|<KBRuB9JILsZRzP$wML^nO(olx&FL^*y7nh2i>}5uHKPtZrOQZR3
zvNTt2g5s@;0=Zb74l-vsL3LTp-dXah_q9OrSt~()-H*B~#rA|O8x9;7Ee9`PsN%!r
zJV~SVR!GYYHhdB_uYVX#ci31L7i<WBLMJ3_eXD}K>5peSnvT+`siu=Sm1chxWccki
zkf&SmC58%*e~QdsZDtVj$p(<mPPsw$yt|zUd(WX03bSbk-p74M4nNh<97;Z&$Hxo*
z&@Zz`{x}vMrZN1}OPD99Vg9qKbt$EmM_2S!24l4$<B~CR+GwabYL~IOvlUb>)tMo@
zU3S=+OL5St7xRg1$*CYNYtJJzw`UW&#rS%AKE>-gb`j186wKa%F#}>w)}F{BJCpy_
zi#nk<brw?YdRV{JsUgm}c8ZwDY_5&O&$vnnZ@A2anyzxf)~*ADx4W=MT6ZnQ-Q9Z$
z?{}9FX1d|;aKm@UT|@b8J(Yy69@PCwjJNhyBj0Nxoa-$kOzA_tmOl8e_U)s*)&rm2
zQ$_Jr59+G=trVZ?$Nbm&Efgm+%+tc)zs4|+b^!CW4ZwF}0Clv3FVi{4AoluU5OuSM
z4pM$>=m;S<Tu1oI@FBvlhjAa85zKjJ1p2)Z)XP0*BcJbFJz>-+`dde_|MV#8CXAu)
zTVv>Va}0Cq#xdVJ<CyoBh<Y#j_IQ!M=SBbg^VoCzJnrM6h&ev!BR=$9^zET}a{QR5
z*N;96e%yQ31oj)BfW9bV{v_t~PNL89B>biT>P`lBP~G`J0pX@#iST?_Q?N?*zt_WV
N2CG*kI>V1h@((L%d_n*K

delta 1772
zcmY*YdrVt(6z**cg8_{&CssxZqfjWXu66=LnH{nrWk4w%?*S4p#+YpKhOw-~wUkm`
zKVG9e3Pl$+m}#efXo7z&ix84!OBma-sc~pB&18!KG#b74JIxZCG~YSr`_A*;yR;(y
zY(*SWWROVriiBTwnQ1sgDLKZ2ZXU3q0Q{wt@EnWg4gt+v0?^{~H4+88k{-zJb9)hg
z#OX*ce%a?MMy7*<pY`DzFbk((OX4t}PQjKdg4l23K=`}j!$Mo8k!ayJNK$~~Jo0hx
zbxAS@!H#q{ln)r5#IxMH`~n@ENTg)Z(Q;PlkTI42L&#-&Mx`)53_2@@A(wGvL_Qae
zO5U{4EHc`|lE}Ec?}Q(^K6&wP;FkO;k~d$HkzzX{i~|!C`6HO$BkPGVE53oj_C-@p
zz`<S$u$Way>y+=%1Z!~_#017KgIS61p+KQ}LkKW+;x!OY6Qv-$e<l@C-~5zK8UI`i
z%i-&-T0fEKVIZ><JkQ)*0E<fY^VX&w_e18#x+)}i175LG*WvU;s`YKgS1>&7nZ$Ix
z_C0B<kN!Z$>-sxn9LUy^#+Y-DvQtm&lA(T6Di%)RJ!DWp%qsIAp?B^{U#HdrEtUDS
z@EVd>lks2Vv=qk@Gh^CA<t~?`kg;JthnB3gYz10nc{?$46~&bFM<riZxKl#)HaZ?W
z-AT+`%||qE?puWtP*V*Rl)ckfO|L}hyPpKegjcAkHgvI(e}&G8SX76cz2^>NN1D$d
zYpJ=LvXWchrpgm-T@=~h!M};Z-Z`CLQskd5BSnnejTHI%yptk%7t&y`4=idSiG6ON
z@8cKCs}c=gB(6s<2@@XZj&fA=K0iz||4$V${bCH8z8D++UA%d#FvY03TB6Zi)oQ-b
zYK&)ELuBms#Uj*GTXncZo%JZtV@(CBtr2X?Du*W6rUw?;GJyR)|Ay@t{QbRe03Ued
ztfiOcT;OBEg@bJoOlpsN#viv6-(=4Le}m`O?JDs4z6ci47vr<D!1wf>1m5g30^=No
zz;?%J;2lR1FsZ)^=;$v4{@kArJnSUB%}M*-b(W&OZlD;veSqrT=Y8S6+QAZv4;p~C
z2Md7lLsYMAi1e#N<%p|>N!K!Lg1<UUb)!Zq;CGME{A(j-__2)UX=5hzTVphjYLxcq
z95o|;bCl|+#!eyc!Wiv!Z;a}ukJmsqHC`{^$V4sN`iVNouTRi9;wEX#o=M_2Cr?3_
zb*UP<*-H&T|0z08`4p{xWeR243$8Ng&$?=$yXB%a6Q*gr^V2l$I*-ERPMN8K-Z?}5
z<_z`M&(fN%SvtqBKFpjWeqxULKAy`%olG~KW57*)esUX8H*KEwbIsGdk9idO>KACv
v>4j4G+Y6-6^OPWO-g5-_z>^JBF6IlL4{KU9h5Ya9VYe1b{0~_9k4W?%jp|S7

diff --git a/local-project-repo/org/dd4t/dd4t-core/2.0.15.3-DXA18/dd4t-core-2.0.15.3-DXA18.jar b/local-project-repo/org/dd4t/dd4t-core/2.0.15.3-DXA18/dd4t-core-2.0.15.3-DXA18.jar
index 095e9be5dbdccf6f9b3468ed79374a1c170f624c..3a0f8c2ecbed646045f5fe7b1b14180aeb51b909 100644
GIT binary patch
delta 2073
zcmZ8iX-rgC6n<yk%m4!@15;!X0i`suh{9;86|oA0MFEke2*a=s%dj&uvb35|i8i*C
zzR;Iy3|dXoHlYojglF*wZIg!B($d<d5lKr(P~t{f8<Z+3z4zQZsg)m`@11kL?=1Je
zHy560&Ogz3=Vpm&ok0K6thNE~2r-oy;{`O=L(x2bff^|SVxK2A3zPXjHL)%2mbm|^
zNOnLO=^ShmiK_Gy>_DqiZAN<z)=T3mPsyax@i;#F);G0UpOLz#+KwqRs-0+8#8A1V
z9K1ZA>RQSc6S2dSq7jq66kp=W3FxP!)1IJ{O4K@ZWHZOwr>3V9UR3j9YE~>jlZ-lt
zHM`MHYJ%jDXreQ&VU15}wqPJz43a<I4+be(iv^sC+CY(3a^`#3RS3TKi~$5IUT#_h
zTEAwIvYih9NESN3E>DY|rI3Rv1Q}tQ7--ozAg&?FSzGR0x;!EZf<Y&lJ;I%Fkw0Le
z&!bdKOcNWSL269=6r=uQ3}K-SiI*9eetA91S>CfC>Zxk%?c;yFt`USYdO?Vh^pP8!
zYf|6WV4I(0rnBUwocm1hX5J&f60`Z4YRri#_GF=*CDCdO)tUQQ&Y$H=4BW0HfUab&
z`YPMaa9t}4g*7~6^uVSSRx6-mnYHTYxWqzZT@zYdK%;nL;h0Jg=G0R7ltD^vaF_Np
zdCA3X;Oo44>`j(k*f+y~v44`$lo<1Ln!6xe@uf6+hjh~FkVfumhjq^Mw{qRF?X!c4
zc(Tr4hn#ECbLz8G%o98|#k#$J<t}S-=Bq?+%<-R!VmbS!AFxp3>|HkuMK1jAi&MKj
zw&*EP+C1SoJZ0si9wJ3O@nuc)+^M+-f^eN2>@I0U9U{*<V572XfQML9S@wrfT&yw@
z47YGK%9&6I!XXtU95OsmT#N>h`8;C5;Y(Xk`jSDyV^RWBpabVr-q{a%crTUtY^cI>
zQ8II(4-ZE9@er({ihQjQqNs?xS_laUwiiK?I9zK}Y(?<4+M8aUexJR+wUZA)r|eS-
z+5Vdk6#VgB+@Y=U`CE;n@jFK1jrpy1Z`oD~2T>uc41(qPQV66Szh{DEYUM=}@tRCv
zz^6_Vyolga6Dh~zaW1+MJz-|TXfGo>qz#@egER#5Wq@zLOyaM&Lc#J;GeqOluo+Sj
zESVt_K~66O$|dD|(i7#7j`}~BLkh-&Dj?&(#G@4?k#>Z%Z(L6gDmX2vlItI@<oeet
zAqV*pRgjIqRt5M)kw;zNQ5C1}t%d_A|86xDBUp5S%o->_&j&S-k2-%-Kzqrpg(~!n
z*1}-~eikT1V70)j2qr9Ca8n(Wq34Y{s6lYA4k{4j){_!+ogdYcWD3*`oNji3u?8r@
zqJ~CZtF4jeOg2I#vbI@yV<)Uoik<~4ua(mTCFmJ$;vH(6Nk4Q7OEVvEyqSjrS~%U&
z0v2S=weVI`TcH^}qpe^@5YWa!cN<i*<TgG<QacX~wR4tF2beIYwSx=((!pybbn>}Q
zck*$TIyt?_26f2#+Qz2{vy<6r^F4N=L&2<_S5I@064djdgE#MUgddar2rqiW1$KAw
zjSY73*%!OWO`u1xyBl&*XP_JM&~vMsRHw=*J+KQwUk|yg)bni*zka^GfWKn&p6)}|
cU@s9QudaNv7xJHZbJJdf0__*2<QpXX3*v>PB>(^b

delta 2090
zcmZ8hdrVtZ7{6a{%cJFC0b#&c2Sc2^hKy-Na6@3>G0S7THcHF8<=H}^<>j)7&df{)
zxziglbHmLT%@$=Hc0%IZKU;_x+)T`ngt_cNHpDm`lWash_dBP~tbg?U&iDPk-|zd*
zz2_c(q!@jq@GZ>e<w{QaWmoJT_KoJV$dWRO%T*0751*A5AsP~%A!|O8*`J)OmQK@_
z$0`!j4k#lWh3B#IGQ5DRQuZ9KM`68iUZxVNWJ;FDeLz#2we<<96S8ecnUkgBy2@+B
z_G<7^xx1G9bi5Xm2l*6SzvEwG<gNb|4XHpWRLZHLj;N4;|No|!bWX^bnVg!fQ*6ij
zy^2?GomPa25phK4yn^aXD-toG<HN+ycR`R4=Ya{Q)+3acGR_ijy9~h(s(3)K>f`Bw
zz$37oavZ@iG<7_rn5LE^ifC2t#!VDhqK0`tBAB0e_vE=Tp5ua)g3&wj12Y6VUyYeW
zp);{EDyT?^R-i?E@(eBiCnbWWHfYaLF#Ga)%30a5z^f(YggbBjwNJruBWjL|7t}Eu
zoPOCKQqC87ITS1xEK$K*#edVDua)G<sn;GAO{G@G(TLf2fO76tFH>-*mVxW_Q?!lK
zW-Co?Y<@t?L)%uV*E-t@<perT($qxnB@aA=7XFuo{W6ZbE*Bzag2W*scnLe&e8h?l
z2yjmAe}~e`2InY9IWSG@T=B-)on9O_8Gv=<MN$fD#}r~uCxke2-YxXPNj`dCOP}J;
z$DIBcIrQZr8VR46q3teBF48XNE@*v`6Fd`3IhnJ6(v<evq9>+e7UlyGcs?|#CE)5%
z!PEGtT?f?=L(l(G|J{b)fa9)`r<*2>$s@#h2SmBng5Uvqx>kbWYdl%kSUB9qvvG}R
zAPk3exgsIg8^!rJ;AzY|0UYS;8r%*7tqsir8_wxEybFpc@1_pws7GEQ3{vGEcf*>D
zCm#jzN*Tl=SSy3A2)30&I-f-5=q`u%<i3QI|GTDNYa?HSZt*ES=t8D8m;O<ZSd?_O
zBq`-=a?+XPuL`YpUq7)+4@D@UF+jL@Ll2=+%i@|I@T!R!Rj>skwkmiL!RadEC2>e9
zT=X(P5bj7lUUpGqB;gJNIYo&yVt}0pZWsVR0#ZK1oeCHC86ggLr;Lz|;Jy*^5M)$C
zCW3o4MDdeqNWk5dYREzmS_8RmVz{`!1~xz5U3BkAZ4QRhYMK6<wM_qVEfipCQyu6K
zbkzZVSj2HRKx=h9v(Bi8*N`||4|@<Sxj}9NlwxGG0ZI_8xIsZ9)L~@25%wYoFhLoD
z786t;xM*U6QD!h;WY7!^2o}vygP@>^S$x*S$b2&^H@Lw!%}|cyz!v6ZZDE}6Tc8$G
zNv*8Iw_8Dvk=w1zOV<XK7&+C(I#jf?ej3}E`?u{Z6=GrKb_<xW>Q@VEHOmU^7#X*M
z5kW`?1HBzkPstr@inLCa`nZ!-`P-lhITjle{K>|=lDpVkhr8G~_q$kmSvQ!m>Owc0
zLStvM_t}}wyq&pcJDA0%4%WPX4|`1AJ&Zi-2I;-*#E$f`*_V3Rn~>fIg=jj|2gL|(
z^)dI%en`W}8~yB!o$4p=pmc-P1CWY<yyKywX@K45BLhU0Tx0R(0F*p&i?d&cQjZBe
I`5tlq0$?9~j{pDw

diff --git a/local-project-repo/org/dd4t/dd4t-databind/2.0.15.3-DXA18/dd4t-databind-2.0.15.3-DXA18.jar b/local-project-repo/org/dd4t/dd4t-databind/2.0.15.3-DXA18/dd4t-databind-2.0.15.3-DXA18.jar
index 1139c5635858a69f4ce6fcd455374cd47262eaf5..c46bbc6214ff356d1724ddd2ac43b84f8a677981 100644
GIT binary patch
delta 790
zcmdlpg=yCmCf)#VW)?065OB>Yoye=g>;j}r7BYi)H{`+8FBK3qS&>l}Ob0Srg6UpH
zQ!ss$(F!WAJo#M%A2*VDlkJ%7z;g9WMqqjilR21v$7BPdH|sJlWCSxVvK)dirm>x3
z2a6>0o!|pA^khwiz>GBg1W_>Kq>C#Xm?7wG%>-un`+9SO8FM3;nE8MvdrvyO^MwZ!
z1H)tH$pR^|n@>e2LR9L-U10^QWKC&e1~a<SzeB8U$>f8mnVQWBF@Is9HrO$f&sS)H
z)K30WVGO2?Djk{Erj>3kt1M#?1X<@}b7^lWFc2$%*krOprRHRbF1~uv6MMN183-^u
z_^a@~;KEKtd(o{I97B#cF6Ubp{yu7xiqPeT{PlH@ug9o(EmP{b%$^^js+Dmp^us(Y
ztL|&x_q{$V*Z*8_?#5`=&`;J&EG%-j+|9T@PmX<e@P;Q__N}v7vM1x&I*kP}hkVX|
zI$giTr*)Y?<U#QOZ$>5&W>B26f+KbEt~wJ?tWN$|XAgF~alJm6-c=_(xuISX%$`$k
z3#RurNKgJ=uLovpG`NE4f(9?BoF|y(Z1e-uQH@SudVZrjn10#l1EwvSBEa<IrUWqk
zttk;qM>R)+>21w%U|PH-2~5|t1cB*`P`+7f9+<zp6{4QGEfCBPhtjK|^#8VGuy|@a
xME$k)G%(-3BOXjI?0_W9dmYYTzDj2xDAFcZbVl%^#M$J#osn!S>wqD~000*wBk%wK

delta 789
zcmdlrg=x<eCf)#VW)?065O9eIp2(}h><pw#7J{i8@?h#0Sa7l;qb`U$Igrs3O!qRH
zg6X4-R#0)}Nv%9c27(mZG1-A7>zRze^cE&_F#V3n21IYxWnRb#W?W=B1Yt~LJH-wb
zN#;Aj2WIHWnhJp#Y5EDGV8%%oS2i$1(A$~`%<%X1<_0t7Mldn+0ZsOvbb99t4<-hN
z$IO!jQe-!uicW;6)Qh{q3RcOQ(!>mAbftfXSlyDz2T?OMn-gOG!a{9!W?;ZfK3|~)
zrvFqJgK48mM`i<{`^zfJSOkFzysMVUl$HZSu@Z<)COcGWPFAbqs}C;oKkKdQrQ_)v
z=&>r~gRhSF*~d?V_)cnse(=`|G}sbiV6w%?V3UzSa6uU_U!Z}JfywiyTHd-^=gyqp
zY<kJ~g0aa}<7=gz1twb_JoVB)rLX(JXX9CYuj}5PhMEtbdg*AL^zru5W8`XLDG3(x
z7Mg7IIjCYMLx49UlL#{x13NTcC-0~;0eN-u`#O6tZCI}lrjzR-;<M^)!Tj9~(v!c|
z>w(#74X$81ufYo{=Lx3S8~wm^M57a!p4;dSrk^+ZfN8U)2rxadDFIA>X-Wjs5zUcc
zdP{R0m=<kG0@GD3L16kklyB0S2j(wrg{Wt23k35+q4Y{9{kJU{ES}sBQGca94a~Rg
ohzCc}{0=KHeW$}2Oe=K;f}(74S!V<<N{mgu-5JTYx(*ap0B7n3W&i*H

diff --git a/local-project-repo/org/dd4t/dd4t-providers/2.0.15.3-DXA18/dd4t-providers-2.0.15.3-DXA18.jar b/local-project-repo/org/dd4t/dd4t-providers/2.0.15.3-DXA18/dd4t-providers-2.0.15.3-DXA18.jar
index 0c2a7c4ebc02ade608b3c5f658af343938da5fe1..c7f9fb8284b74025c0684b81c8595c8bbc552a46 100644
GIT binary patch
delta 528
zcmccC&v><;kvG7bnT3l11l)5<C-SN=y8$Vah0Gw{4S6v2O9eztR%Fxz(?N{JAbN8L
z<70L(Baib0H<)25`iKS0kdr#h2WC9c2!%-5m>ggQi~P4NVFocKm)UB8>BY8S<0jv<
zbrO7;UFyC4Z(-aUCI*IuoD2+llQ-H*Pp)?q-W+9D%vArE(d~Boyt%>mB^-AzH=mFe
z`P*^!>-olxZ;N-SE<G5(y*+RK_r;r2Hio>J>wfZM_RhE30gCyz-}~7vlNI_dvhMQB
zf_?o(?mV97?pOPnr~a8LVBH#US!CUf&vrpc^WKH;TkH8!XTGuFddu!lNzyz2mx*0(
zJ{4H_Ib@6GFHks%fCGvH6j0ur>)Owj0Rydaa)M*9n5J*&htvAO21X$UCfkh6HX4}(
z6_oK#KIIq+_TpJ5>B+WElAxfS9O+~a7Mty)50x_k(=5(*VA|E$8BBLO$AanC&N*N@
z$|V|1?|{-`u1R2iwQD?>zUvwRrY+p8z;vk_#GKu3K^(APoh<4e!i(zqGWRGpAtzAu
F0{}xB$c6v_

delta 529
zcmccG&v>n$kvG7bnT3l11Y9G6C-SN=y8tPZh0Gw{4S6v2O9eztR%Fxz(?N{JAbN8L
z<70L(Baib0H<)25`iKS0kdr#h2WC9c2!%-5m>ggQi~P4NVFocKm)UB8>BY8S<0jv<
zbrLj)2=;cCekAaQiGg7uCj*1t<c+q{lj|LYH%HkOGu7`^?%Bp~YrTA*VN;oZzQWl}
z-<r*?+ow0(dS2q~)x1BC|E}G8_w<uVD{ol$PkMa4=yv!5r+eG(&#m&YR(Yoxv;6YI
z8u_Pv5|ifa|2`-0)DLaNGOmToG-EbCuU&G)=I;8M=*gEN?b4Itip8EDH7ol6R%adi
z)WwgUt;`7iA`J{D5pY0pfC9>U>wh!va$ulUO-^tO7C)&G`oUi>&|pi5fyovlgH1*o
zLJG=w`6i!q3<dj9(a8i9u9G92?7{q5PWn)B>B-NXB*AQEXFD+M;_M8jyPRXe^eg8a
zFdgX<4W_q4X;IfCFu%$*9!%eHjR4c;ZdPEr#0_H3F1H{KSh!9WaS!1|b$+RP6q~RU
GDE<KfO1;kj

diff --git a/local-project-repo/org/dd4t/dd4t-providers/2.0.15.3-DXA18/dd4t-providers-2.0.15.3-DXA18.pom b/local-project-repo/org/dd4t/dd4t-providers/2.0.15.3-DXA18/dd4t-providers-2.0.15.3-DXA18.pom
index e42d478ab..a1f9f463d 100644
--- a/local-project-repo/org/dd4t/dd4t-providers/2.0.15.3-DXA18/dd4t-providers-2.0.15.3-DXA18.pom
+++ b/local-project-repo/org/dd4t/dd4t-providers/2.0.15.3-DXA18/dd4t-providers-2.0.15.3-DXA18.pom
@@ -43,7 +43,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <tridion.version>10.1.0-1003</tridion.version>
+        <tridion.version>10.1.0-1012</tridion.version>
         <java.version>1.8</java.version>
     </properties>
 

From 49b3c420b3736eecc59a10245b04a6fa57292e09 Mon Sep 17 00:00:00 2001
From: Alexey Zarakovskiy <azarakovskiy@sdl.com>
Date: Tue, 21 Nov 2017 16:21:26 +0100
Subject: [PATCH 27/42] DXA 1.8 Release

---
 dxa-bom-modules/pom.xml                    | 4 ++--
 dxa-bom/pom.xml                            | 2 +-
 dxa-builder/build.gradle                   | 2 +-
 dxa-framework/dxa-common-api/pom.xml       | 2 +-
 dxa-framework/dxa-common-impl/pom.xml      | 2 +-
 dxa-framework/dxa-tridion-provider/pom.xml | 2 +-
 dxa-framework/dxa-web8-provider/pom.xml    | 2 +-
 dxa-framework/pom.xml                      | 4 ++--
 dxa-webapp/pom.xml                         | 4 ++--
 gradle.properties                          | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dxa-bom-modules/pom.xml b/dxa-bom-modules/pom.xml
index 596042921..2b4b11358 100644
--- a/dxa-bom-modules/pom.xml
+++ b/dxa-bom-modules/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.sdl.dxa.modules</groupId>
     <artifactId>dxa-bom-modules</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.0</version>
     <packaging>pom</packaging>
 
     <name>DXA Modules - Bill of Materials</name>
@@ -45,7 +45,7 @@
     </developers>
 
     <properties>
-        <dxa-modules.version>1.8.0-SNAPSHOT</dxa-modules.version>
+        <dxa-modules.version>1.8.0</dxa-modules.version>
         <dxa-module-core.version>${dxa-modules.version}</dxa-module-core.version>
         <dxa-module-cid.version>${dxa-modules.version}</dxa-module-cid.version>
         <dxa-module-googleanalytics.version>${dxa-modules.version}</dxa-module-googleanalytics.version>
diff --git a/dxa-bom/pom.xml b/dxa-bom/pom.xml
index d06a5f01d..cc0b7225b 100644
--- a/dxa-bom/pom.xml
+++ b/dxa-bom/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.sdl.dxa</groupId>
     <artifactId>dxa-bom</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.0</version>
     <packaging>pom</packaging>
 
     <name>DXA - Bill of Materials</name>
diff --git a/dxa-builder/build.gradle b/dxa-builder/build.gradle
index 5748ae69b..1f93ee8e3 100644
--- a/dxa-builder/build.gradle
+++ b/dxa-builder/build.gradle
@@ -1,5 +1,5 @@
 group 'com.sdl.dxa'
-version '1.8.0-SNAPSHOT'
+version '1.8.0'
 
 apply plugin: 'groovy'
 apply plugin: 'maven-publish'
diff --git a/dxa-framework/dxa-common-api/pom.xml b/dxa-framework/dxa-common-api/pom.xml
index 281e07560..788e63fc0 100644
--- a/dxa-framework/dxa-common-api/pom.xml
+++ b/dxa-framework/dxa-common-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.sdl.dxa</groupId>
         <artifactId>dxa-framework</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.8.0</version>
     </parent>
 
     <artifactId>dxa-common-api</artifactId>
diff --git a/dxa-framework/dxa-common-impl/pom.xml b/dxa-framework/dxa-common-impl/pom.xml
index c0921947c..2d14b9fac 100644
--- a/dxa-framework/dxa-common-impl/pom.xml
+++ b/dxa-framework/dxa-common-impl/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>dxa-framework</artifactId>
         <groupId>com.sdl.dxa</groupId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.8.0</version>
     </parent>
 
     <artifactId>dxa-common-impl</artifactId>
diff --git a/dxa-framework/dxa-tridion-provider/pom.xml b/dxa-framework/dxa-tridion-provider/pom.xml
index 75034a1c8..df5718752 100644
--- a/dxa-framework/dxa-tridion-provider/pom.xml
+++ b/dxa-framework/dxa-tridion-provider/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>dxa-framework</artifactId>
         <groupId>com.sdl.dxa</groupId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.8.0</version>
     </parent>
 
     <artifactId>dxa-tridion-provider</artifactId>
diff --git a/dxa-framework/dxa-web8-provider/pom.xml b/dxa-framework/dxa-web8-provider/pom.xml
index 72df7e1e9..edbdd2181 100644
--- a/dxa-framework/dxa-web8-provider/pom.xml
+++ b/dxa-framework/dxa-web8-provider/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>dxa-framework</artifactId>
         <groupId>com.sdl.dxa</groupId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.8.0</version>
         <relativePath>../../dxa-framework</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dxa-framework/pom.xml b/dxa-framework/pom.xml
index 7b1e41278..a15531896 100644
--- a/dxa-framework/pom.xml
+++ b/dxa-framework/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <groupId>com.sdl.dxa</groupId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.0</version>
     <artifactId>dxa-framework</artifactId>
     <packaging>pom</packaging>
 
@@ -61,7 +61,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <dxa-bom.version>1.8.0-SNAPSHOT</dxa-bom.version>
+        <dxa-bom.version>1.8.0</dxa-bom.version>
         <java-version>1.8</java-version>
     </properties>
 
diff --git a/dxa-webapp/pom.xml b/dxa-webapp/pom.xml
index bb3d236b8..6b3a1f7bf 100644
--- a/dxa-webapp/pom.xml
+++ b/dxa-webapp/pom.xml
@@ -10,7 +10,7 @@
         <version>1.0.3</version>
     </parent>
 
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.0</version>
     <groupId>com.sdl.dxa</groupId>
     <artifactId>dxa-webapp</artifactId>
     <packaging>war</packaging>
@@ -19,7 +19,7 @@
     <url>http://www.sdl.com/cxc/digital-experience/web-experience-management/digital-experience-accelerator.html</url>
 
     <properties>
-        <dxa-bom.version>1.8.0-SNAPSHOT</dxa-bom.version>
+        <dxa-bom.version>1.8.0</dxa-bom.version>
         <dxa-release-branch>release/1.8</dxa-release-branch>
         <java-version>1.8</java-version>
     </properties>
diff --git a/gradle.properties b/gradle.properties
index bfd07ae2b..4bc7430e5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=1.8.0-SNAPSHOT
\ No newline at end of file
+version=1.8.0
\ No newline at end of file

From 9fcea00eda397b6ada890db67ef3770b17982e1e Mon Sep 17 00:00:00 2001
From: Paul Adams <padams@sdl.com>
Date: Mon, 23 Nov 2020 16:58:44 +0000
Subject: [PATCH 28/42] Updated readme with latest support information

---
 README.md | 68 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 46861efb4..cc692ad62 100644
--- a/README.md
+++ b/README.md
@@ -1,85 +1,93 @@
-dxa-web-application-java
-===
 SDL Digital Experience Accelerator Java Spring MVC web application
+===
 
 About
 -----
-The SDL Digital Experience Accelerator (DXA) is a reference implementation of SDL Web 8 and SDL Tridion 2013 SP1(*) intended to help you create, design and publish an SDL Web/Tridion-based website quickly.
+The SDL Digital Experience Accelerator (DXA) is a reference implementation of SDL Tridion Sites 9 and SDL Web 8 intended to help you create, design and publish an SDL Tridion/Web-based website quickly.
 
-It is available for .NET and Java Web Applications and has a modular architecture consisting of a Framework and example web application providing core functionality and separate Modules for additional, optional functionality.
+DXA is available for both .NET and Java web applications. Its modular architecture consists of a framework and example web application, which includes all core SDL Tridion/Web functionality as well as separate Modules for additional, optional functionality.
 
-This repository contains the source code of the DXA Framework, example web application and Maven archetype for Java. 
-The full DXA distribution (including CM-side items and installation support) is downloadable from the [SDL Community site](https://community.sdl.com/developers/tridion_developer/m/mediagallery/1241) (latest version)
-or the [Releases in GitHub](https://github.com/sdl/dxa-web-application-java/releases) (all versions)
+This repository contains the source code of the DXA Framework, an example Java web application, and a Maven archetype for Java. 
 
+The full DXA distribution (including Content Manager-side items and installation support) is downloadable from the [SDL AppStore](https://appstore.sdl.com/list/?search=dxa) 
+or the [Releases in GitHub](https://github.com/sdl/dxa-web-application-java/releases)
 Furthermore, the compiled DXA artifacts are available on [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cdxa). 
-To facilitate upgrades, it is highly recommended to use official, compiled DXA artifacts from Maven Central instead of a custom build.
-If you really have to modify the DXA Framework, we kindly request you to submit your changes as a Contribution; see below. 
 
-(*) SDL Tridion 2013 SP1 is only supported up to DXA version 1.6.
+To facilitate upgrades, we strongly recommend that you use official, compiled DXA artifacts from Maven Central instead of a custom build.
+If you really must modify the DXA framework, we kindly request you to submit your changes as a Contribution (see the Branches and Contributions section below). 
+
 
 Support
 ---------------
-At SDL we take your investment in Digital Experience very seriously, and will do our best to support you throughout this journey. 
-If you encounter any issues with the Digital Experience Accelerator, please reach out to us via one of the following channels:
+At SDL we take your investment in Digital Experience very seriously, if you encounter any issues with the Digital Experience Accelerator, please use one of the following channels:
 
 - Report issues directly in [this repository](https://github.com/sdl/dxa-web-application-java/issues)
-- Ask questions 24/7 on the SDL Web Community at https://tridion.stackexchange.com
-- Contact Technical Support through the Customer Support Web Portal at https://www.sdl.com/support
+- Ask questions 24/7 on the SDL Tridion Community at https://tridion.stackexchange.com
+- Contact SDL Professional Services for DXA release management support packages to accelerate your support requirements
 
 
 Documentation
 -------------
-Documentation can be found online in the SDL documentation portal: https://docs.sdl.com/SDLDXA18
+Documentation can be found online in the SDL documentation portal: https://docs.sdl.com/sdldxa
+
 
 Repositories
 ------------
 The following repositories with source code are available:
 
- - https://github.com/sdl/dxa-content-management - Core Template Building Blocks
+ - https://github.com/sdl/dxa-content-management - CM-side framework (.NET Template Building Blocks)
  - https://github.com/sdl/dxa-html-design - Whitelabel HTML Design
+ - https://github.com/sdl/dxa-model-service - Model Service (Java)
  - https://github.com/sdl/dxa-modules - Modules (.NET and Java)
- - https://github.com/sdl/dxa-web-application-dotnet - ASP.NET MVC web application (incl. framework)
- - https://github.com/sdl/dxa-web-application-java - Java Spring MVC web application (incl. framework)
+ - https://github.com/sdl/dxa-web-application-dotnet - ASP.NET MVC web application (including framework)
+ - https://github.com/sdl/dxa-web-application-java - Java Spring MVC web application (including framework)
 
 
 Branches and Contributions
 --------------------------
 We are using the following branching strategy:
 
- - `master` - Represents the latest stable version. This may be a pre-release version (tagged as `DXA x.y Sprint z`). Updated each development Sprint (approx. bi-weekly).
+ - `master` - Represents the latest stable version. This may be a pre-release version (tagged as `DXA x.y Sprint z`). Updated each development Sprint (approximately bi-weekly).
  - `develop` - Represents the latest development version. Updated very frequently (typically nightly).
- - `release/x.y` - Represents the x.y Release. If hotfixes are applicable, they will be applied to the appropriate release branch, so that the release branch actually represent the initial release plus hotfixes.
+ - `release/x.y` - Represents the x.y Release. If hotfixes are applicable, they will be applied to the appropriate release branch so that the branch actually represents the initial release plus hotfixes.
 
 All releases (including pre-releases and hotfix releases) are tagged. 
 
 Note that development sources (on `develop` branch) have dependencies on SNAPSHOT versions of the DXA artifacts, which are available here: https://oss.sonatype.org/content/repositories/snapshots/com/sdl/dxa/
 
-If you wish to submit a Pull Request, it should normally be submitted on the `develop` branch, so it can be incorporated in the upcoming release.
+If you wish to submit a Pull Request, it should normally be submitted on the `develop` branch so that it can be incorporated in the upcoming release.
 
-Fixes for really severe/urgent issues (which qualify as hotfixes) should be submitted as Pull Request on the appropriate release branch.
+Fixes for severe/urgent issues (that qualify as hotfixes) should be submitted as Pull Requests on the appropriate release branch.
 
-Please always submit an Issue for the problem and indicate whether you think it qualifies as a hotfix; Pull Requests on release branches will only be accepted after agreement on the severity of the issue.
+Always submit an Issue for the problem, and indicate whether you think it qualifies as a hotfix. Pull Requests on release branches will only be accepted after agreement on the severity of the issue.
 Furthermore, Pull Requests on release branches are expected to be extensively tested by the submitter.
 
-Of course, it's also possible (and appreciated) to report an Issue without associated Pull Requests.
+Of course, it is also possible (and appreciated) to report an issue without associated Pull Requests.
 
 
 DXA Builder
 -----------
-Current DXA Builder is available in Maven Central, latest DXA Builder is also available as a public snapshot.
+The current DXA Builder is available in Maven Central, and the latest DXA Builder is also available as a public snapshot.
+
+If you have not configured a snapshot repository and don't want to, you may need to install the DXA Builder locally in order to run the SNAPSHOT. 
+
+To install it, run the wrapper script of the `dxa-builder` project: `gradlew(.bat) publishLocal` 
+On Windows, you can also just run `get-started.cmd` script at first run.
+
+
+DD4T support
+---
+DD4T 2.1 for Java is incorporated into the DXA codebase in the `dxa-compatible` artifact. As a result, when migrating from DD4T to DXA, you do not need separate dependencies on DD4T.
 
-You may need DXA Builder to be installed locally to run the SNAPSHOT build if you haven't configured snapshot repository and you don't want to.
-To install it run the wrapper script of `dxa-builder` project: `gradlew(.bat) publishLocal` 
-On Windows you can also just run `get-started.cmd` script at first run.
 
 Snapshots
 ---------
-DXA publishes SNAPSHOT versions to Sonatype. If you want to use them, you have to configure `https://oss.sonatype.org/content/repositories/snapshots` as a repository in your Maven settings. Read [this](https://maven.apache.org/settings.html#Repositories) for instructions.
+DXA publishes SNAPSHOT versions to Sonatype. To use them, configure `https://oss.sonatype.org/content/repositories/snapshots` as a repository in your Maven settings. Read [this](https://maven.apache.org/settings.html#Repositories) for instructions.
+
 
 License
 -------
-Copyright (c) 2014-2016 SDL Group.
+Copyright (c) 2014-2020 SDL Group.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 035c1a292754b445f41b7be21d7767abeda1a683 Mon Sep 17 00:00:00 2001
From: NIkon DSL <alebastrov@mailinator.com>
Date: Fri, 29 Jan 2021 17:03:53 +0200
Subject: [PATCH 29/42] Create .travis.yml

---
 .travis.yml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..df71aa3ec
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,9 @@
+language: java
+install: skip
+
+os: linux
+dist: trusty
+jdk: oraclejdk8
+
+script:
+  - ./gradlew build --scan -s

From ba1285109869e74e1eae6ddc5b7614824f225555 Mon Sep 17 00:00:00 2001
From: NIkon DSL <alebastrov@mailinator.com>
Date: Fri, 29 Jan 2021 17:06:31 +0200
Subject: [PATCH 30/42] Update .travis.yml

---
 .travis.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index df71aa3ec..fc17d328a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,6 @@
 language: java
-install: skip
-
-os: linux
 dist: trusty
 jdk: oraclejdk8
 
 script:
-  - ./gradlew build --scan -s
+  - ./gradlew build

From 81bc0960a0f0a8f0a72f49337d36720a55b1455d Mon Sep 17 00:00:00 2001
From: NIkon DSL <alebastrov@mailinator.com>
Date: Fri, 29 Jan 2021 17:12:17 +0200
Subject: [PATCH 31/42] Update .travis.yml

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index fc17d328a..fbabd356a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
 language: java
+install: skip
+
+os: linux
 dist: trusty
 jdk: oraclejdk8
 

From fac63ceb7b83e39b084eca0c57b445f8a56d52ae Mon Sep 17 00:00:00 2001
From: NIkon DSL <alebastrov@mailinator.com>
Date: Fri, 29 Jan 2021 17:14:50 +0200
Subject: [PATCH 32/42] Update .travis.yml

---
 .travis.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fbabd356a..8053b6f30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,13 @@
 language: java
-install: skip
-
-os: linux
-dist: trusty
-jdk: oraclejdk8
+sudo: false
+jdk:
+  - openjdk8
+install: 
+  - skip
+os: 
+  - linux
+dist: 
+  - trusty
 
 script:
   - ./gradlew build

From 5e054d646e6081655cade70a6567392c7976f94f Mon Sep 17 00:00:00 2001
From: NIkon DSL <alebastrov@mailinator.com>
Date: Fri, 29 Jan 2021 17:18:29 +0200
Subject: [PATCH 33/42] Update .travis.yml

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 8053b6f30..1c5c0e5fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,4 +10,5 @@ dist:
   - trusty
 
 script:
+  - git update-index --chmod=+x gradlew
   - ./gradlew build

From 8321f400e73431eb0591f3f1fac3f2e684bb3bc1 Mon Sep 17 00:00:00 2001
From: NIkon DSL <alebastrov@mailinator.com>
Date: Fri, 29 Jan 2021 17:24:24 +0200
Subject: [PATCH 34/42] Update .travis.yml

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 1c5c0e5fa..073b0aff1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,4 +11,6 @@ dist:
 
 script:
   - git update-index --chmod=+x gradlew
+  - chmod +x gradlew
+  - git ls-tree HEAD
   - ./gradlew build

From 1964c1eef2978e4051173994ecb789aa0201de6e Mon Sep 17 00:00:00 2001
From: NIkon DSL <alebastrov@mailinator.com>
Date: Mon, 1 Feb 2021 16:48:28 +0200
Subject: [PATCH 35/42] Create mave.yml

---
 .github/workflows/mave.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/workflows/mave.yml

diff --git a/.github/workflows/mave.yml b/.github/workflows/mave.yml
new file mode 100644
index 000000000..ce502d931
--- /dev/null
+++ b/.github/workflows/mave.yml
@@ -0,0 +1,24 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ release/1.8 ]
+  pull_request:
+    branches: [ release/1.8 ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Gradle
+      run: gradlew build

From 4ae761bcc067f23591611e8ee3a7ce8d07144ab3 Mon Sep 17 00:00:00 2001
From: NIkon DSL <alebastrov@mailinator.com>
Date: Mon, 1 Feb 2021 16:48:50 +0200
Subject: [PATCH 36/42] Rename mave.yml to maven.yml

---
 .github/workflows/{mave.yml => maven.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{mave.yml => maven.yml} (100%)

diff --git a/.github/workflows/mave.yml b/.github/workflows/maven.yml
similarity index 100%
rename from .github/workflows/mave.yml
rename to .github/workflows/maven.yml

From 47bb5773e1d551ead9e09590d4af7f5a08549d4c Mon Sep 17 00:00:00 2001
From: NIkon DSL <alebastrov@mailinator.com>
Date: Mon, 1 Feb 2021 16:50:19 +0200
Subject: [PATCH 37/42] Update maven.yml

---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index ce502d931..c059b4aaa 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -21,4 +21,4 @@ jobs:
       with:
         java-version: 1.8
     - name: Build with Gradle
-      run: gradlew build
+      run: ./gradlew build

From 64eb3abcb57935593bab459d24489daeb216273a Mon Sep 17 00:00:00 2001
From: NIkon DSL <alebastrov@mailinator.com>
Date: Mon, 1 Feb 2021 16:54:11 +0200
Subject: [PATCH 38/42] Update maven.yml

---
 .github/workflows/maven.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index c059b4aaa..1ab1f0c3c 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -21,4 +21,7 @@ jobs:
       with:
         java-version: 1.8
     - name: Build with Gradle
-      run: ./gradlew build
+    - run git update-index --chmod=+x gradlew
+    - run chmod +x gradlew
+    - run git ls-tree HEAD
+    - run ./gradlew build

From 09ce6ac570a39de12be651225a60af2f1b5fd863 Mon Sep 17 00:00:00 2001
From: NIkon DSL <alebastrov@mailinator.com>
Date: Mon, 1 Feb 2021 16:57:54 +0200
Subject: [PATCH 39/42] Update maven.yml

---
 .github/workflows/maven.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 1ab1f0c3c..20cfe8082 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -21,7 +21,11 @@ jobs:
       with:
         java-version: 1.8
     - name: Build with Gradle
-    - run git update-index --chmod=+x gradlew
-    - run chmod +x gradlew
-    - run git ls-tree HEAD
-    - run ./gradlew build
+    - name: gradle erapper update-index
+      run: git update-index --chmod=+x gradlew
+    - name: chmod gradle wrapper
+      run: chmod +x gradlew
+    - name: list of permissions
+      run: git ls-tree HEAD
+    - name: Build with gradle
+      run: ./gradlew build

From 21ab14b758810c9d106d24dc7c0b649aef162cb7 Mon Sep 17 00:00:00 2001
From: NIkon DSL <alebastrov@mailinator.com>
Date: Mon, 1 Feb 2021 17:01:10 +0200
Subject: [PATCH 40/42] Update maven.yml

---
 .github/workflows/maven.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 20cfe8082..15b9f7249 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -19,8 +19,7 @@ jobs:
     - name: Set up JDK 1.8
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
-    - name: Build with Gradle
+        java-version: 1.8    
     - name: gradle erapper update-index
       run: git update-index --chmod=+x gradlew
     - name: chmod gradle wrapper

From bc51fba2cb1d3557e9b963bad064f31118174446 Mon Sep 17 00:00:00 2001
From: Horia Constantin <me@horiaconstantin.com>
Date: Mon, 1 Feb 2021 18:55:55 +0100
Subject: [PATCH 41/42] renamed workflow

---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 15b9f7249..ba9bf6ad6 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Java CI with Maven
+name: Build
 
 on:
   push:

From 53c4cb2841258ca202f6f7054e732dcd66a83e85 Mon Sep 17 00:00:00 2001
From: Horia Constantin <me@horiaconstantin.com>
Date: Mon, 1 Feb 2021 18:07:07 +0000
Subject: [PATCH 42/42] removed .travis.yml

---
 .travis.yml | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 073b0aff1..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-language: java
-sudo: false
-jdk:
-  - openjdk8
-install: 
-  - skip
-os: 
-  - linux
-dist: 
-  - trusty
-
-script:
-  - git update-index --chmod=+x gradlew
-  - chmod +x gradlew
-  - git ls-tree HEAD
-  - ./gradlew build