CRQ-13104 > Set hotfix versions in POM files, updated UDP dependencie…

…s to released ones
RWS · Feb 7, 2019 · 0d3d3c7 · 0d3d3c7
1 parent 27570e3
commit 0d3d3c7
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 18 deletions.
diff --git a/dxa-builder/gradle.properties b/dxa-builder/gradle.properties
@@ -1 +1 @@
-version=2.1.0-SNAPSHOT
+version=2.1.1
diff --git a/dxa-dd4t-ms-provider/pom.xml b/dxa-dd4t-ms-provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dxa-oss-parent</artifactId>
         <groupId>com.sdl.dxa</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.1</version>
         <relativePath>../dxa-oss-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git 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>2.1.0-SNAPSHOT</version>
+        <version>2.1.1</version>
     </parent>
 
     <artifactId>dxa-common-api</artifactId>

diff --git a/dxa-framework/dxa-common/pom.xml b/dxa-framework/dxa-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dxa-framework</artifactId>
         <groupId>com.sdl.dxa</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dxa-framework/dxa-data-model/pom.xml b/dxa-framework/dxa-data-model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dxa-framework</artifactId>
         <groupId>com.sdl.dxa</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dxa-framework/dxa-tridion-common/pom.xml b/dxa-framework/dxa-tridion-common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>dxa-framework</artifactId>
         <groupId>com.sdl.dxa</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.1</version>
     </parent>
 
     <artifactId>dxa-tridion-common</artifactId>

diff --git 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>2.1.0-SNAPSHOT</version>
+        <version>2.1.1</version>
     </parent>
 
     <artifactId>dxa-tridion-provider</artifactId>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>com.sdl.delivery</groupId>
             <artifactId>udp-context-client</artifactId>
-            <version>${cd-cil.version}</version>
+            <version>${udp-context-client.version}</version>
         </dependency>
         <dependency>
             <groupId>com.sdl.dxa</groupId>

diff --git a/dxa-framework/pom.xml b/dxa-framework/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.sdl.dxa</groupId>
         <artifactId>dxa-oss-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.1</version>
     </parent>
 
     <artifactId>dxa-framework</artifactId>

diff --git a/dxa-javadoc-tools/pom.xml b/dxa-javadoc-tools/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dxa-oss-parent</artifactId>
         <groupId>com.sdl.dxa</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dxa-model-service-client/pom.xml b/dxa-model-service-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dxa-oss-parent</artifactId>
         <groupId>com.sdl.dxa</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dxa-oss-parent/pom.xml b/dxa-oss-parent/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.sdl.dxa</groupId>
     <artifactId>dxa-oss-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.1</version>
     <packaging>pom</packaging>
 
     <name>DXA - OSS Parent, BOM</name>
@@ -26,7 +26,15 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <cd-cil.version>11.0.0-SNAPSHOT</cd-cil.version>
+        <cd-cil.version>11.0.0-1027</cd-cil.version>
+        <cd-delivery-cil.version>11.0.0-1034</cd-delivery-cil.version>
+        <cd-xo.version>${cd-delivery-cil.version}</cd-xo.version>
+        <udp-common-config-legacy.version>11.0.0-1028</udp-common-config-legacy.version>
+        <udp-context-client.version>${cd-delivery-cil.version}</udp-context-client.version>
+        <udp-discovery-client-lightweight.version>11.0.0-1040</udp-discovery-client-lightweight.version>
+        <udp-cil-api.version>11.0.0-1037</udp-cil-api.version>
+        <udp-ugc-cil-api.version>11.0.0-1039</udp-ugc-cil-api.version>
+
 
         <!-- DXA versions -->
         <dxa.version>${project.version}</dxa.version>
@@ -383,18 +391,18 @@
             <dependency>
                 <groupId>com.sdl.tridion.xo</groupId>
                 <artifactId>xo-compatible-client</artifactId>
-                <version>${cd-cil.version}</version>
+                <version>${cd-xo.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.sdl.delivery</groupId>
                 <artifactId>cil</artifactId>
-                <version>${cd-cil.version}</version>
+                <version>${cd-delivery-cil.version}</version>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>com.sdl.delivery</groupId>
                 <artifactId>udp-common-config-legacy</artifactId>
-                <version>${cd-cil.version}</version>
+                <version>${udp-common-config-legacy.version}</version>
             </dependency>
 
             <dependency>

diff --git a/dxa-webapp/pom.xml b/dxa-webapp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.sdl.dxa</groupId>
         <artifactId>dxa-oss-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.1</version>
     </parent>
 
     <artifactId>dxa-webapp</artifactId>

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=2.1.0-SNAPSHOT
+version=2.1.1