NXP-29892: align coldstorage on release 2021

nuxeo · Dec 8, 2020 · 20eca9e · 20eca9e
1 parent e754c30
commit 20eca9e
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 12 deletions.
diff --git a/ci/helm/preview/values.yaml b/ci/helm/preview/values.yaml
@@ -43,7 +43,7 @@ nuxeo:
       pullPolicy: Always
     persistence:
       enabled: disable
-    packages: nuxeo-web-ui-3.1.0-rc.9 amazon-s3-online-storage-$NUXEO_VERSION
+    packages: nuxeo-web-ui-3.0.2-rc.48 amazon-s3-online-storage-$NUXEO_VERSION
     livenessProbe:
       initialDelaySeconds: 420
       periodSeconds: 20

diff --git a/ci/jenkinsfiles/build.groovy b/ci/jenkinsfiles/build.groovy
@@ -67,7 +67,7 @@ pipeline {
     JENKINS_HOME = '/root'
     MAVEN_DEBUG = '-e'
     MAVEN_OPTS = "${MAVEN_OPTS} -Xms512m -Xmx3072m"
-    NUXEO_VERSION = '11.4.34'
+    NUXEO_VERSION = '2021.0.9'
     NUXEO_BASE_IMAGE = "docker-private.packages.nuxeo.com/nuxeo/nuxeo:${NUXEO_VERSION}"
     ORG = 'nuxeo'
     PREVIEW_NAMESPACE = "coldstorage-${BRANCH_LC}"

diff --git a/nuxeo-coldstorage-package/pom.xml b/nuxeo-coldstorage-package/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.coldstorage</groupId>
     <artifactId>nuxeo-coldstorage-parent</artifactId>
-    <version>11.0.0-SNAPSHOT</version>
+    <version>2021.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-coldstorage-package</artifactId>

diff --git a/nuxeo-coldstorage-package/src/main/assemble/assembly.xml b/nuxeo-coldstorage-package/src/main/assemble/assembly.xml
@@ -17,6 +17,8 @@
       <fileset dir="src/main/resources" />
       <filterset>
         <filter token="VERSION" value="${maven.project.version}" />
+        <filter token="DISTRIB_VERSION" value="${nuxeo.platform.version}" />
+        <filter token="NUXEO_TARGET_VERSION" value="${nuxeo.target.version}" />
         <filter token="DISTRIBUTION_NAME" value="${nuxeo.distribution.name}" />
       </filterset>
     </copy>

diff --git a/nuxeo-coldstorage-package/src/main/resources/package.xml b/nuxeo-coldstorage-package/src/main/resources/package.xml
@@ -7,7 +7,7 @@
   <home-page>https://doc.nuxeo.com/coldstorage/</home-page>
   <vendor>Nuxeo</vendor>
   <platforms>
-    <platform>@DISTRIBUTION_NAME@-@VERSION@</platform>
+    <platform>@DISTRIBUTION_NAME@-@NUXEO_TARGET_VERSION@</platform>
   </platforms>
   <!-- Dependencies on other packages -->
   <dependencies>

diff --git a/nuxeo-coldstorage-web/package.json b/nuxeo-coldstorage-web/package.json
@@ -5,7 +5,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@esm-bundle/chai": "^4.1.5",
-    "@nuxeo/testing-helpers": "^3.1.0-rc.0",
+    "@nuxeo/testing-helpers": "~3.0.2-rc.0",
     "@rollup/plugin-node-resolve": "^7.1.3",
     "@web/dev-server-legacy": "^0.1.6",
     "@web/test-runner": "^0.9.7",
@@ -26,8 +26,8 @@
     "rollup-plugin-terser": "^7.0.2"
   },
   "dependencies": {
-    "@nuxeo/nuxeo-elements": "^3.1.0-rc.0",
-    "@nuxeo/nuxeo-ui-elements": "^3.1.0-rc.0",
+    "@nuxeo/nuxeo-elements": "~3.0.2-rc.0",
+    "@nuxeo/nuxeo-ui-elements": "~3.0.2-rc.0",
     "@polymer/iron-icon": "^3.0.0",
     "@polymer/iron-icons": "^3.0.1",
     "@polymer/paper-button": "^3.0.0",

diff --git a/nuxeo-coldstorage-web/pom.xml b/nuxeo-coldstorage-web/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.nuxeo.coldstorage</groupId>
     <artifactId>nuxeo-coldstorage-parent</artifactId>
-    <version>11.0.0-SNAPSHOT</version>
+    <version>2021.0-SNAPSHOT</version>
   </parent>
   <artifactId>nuxeo-coldstorage-web</artifactId>
   <name>Nuxeo Cold Storage WebUI integration</name>

diff --git a/nuxeo-coldstorage/pom.xml b/nuxeo-coldstorage/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.coldstorage</groupId>
     <artifactId>nuxeo-coldstorage-parent</artifactId>
-    <version>11.0.0-SNAPSHOT</version>
+    <version>2021.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.coldstorage</groupId>

diff --git a/pom.xml b/pom.xml
@@ -4,20 +4,20 @@
   <parent>
     <groupId>org.nuxeo</groupId>
     <artifactId>nuxeo-parent</artifactId>
-    <version>11.4-SNAPSHOT</version>
+    <version>2021.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.coldstorage</groupId>
   <artifactId>nuxeo-coldstorage-parent</artifactId>
   <name>Nuxeo Cold Storage Parent</name>
-  <version>11.0.0-SNAPSHOT</version>
+  <version>2021.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <description>Nuxeo Cold Storage allows the cold storage of document content. This can be needed for archiving,
     compliance, etc.
   </description>
 
   <properties>
-    <nuxeo.target.version>11.*</nuxeo.target.version>
+    <nuxeo.target.version>2021.*</nuxeo.target.version>
   </properties>
 
   <modules>