Merge branch 'support/cms-4.0.x' into update-v4

Author: Mario Colombo

backend/settings.py

@@ -50,13 +50,20 @@
     'filer',
     'easy_thumbnails',
 
+    # the default publishing implementation - optional, but used in most projects
+    'djangocms_versioning',
+
+    # the default alias content - optional, but used in most projects
+    'djangocms_alias',
+    
     # the default CKEditor - optional, but used in most projects
     'djangocms_text_ckeditor',
 
     # some content plugins - optional, but used in most projects
     'djangocms_file',
     'djangocms_icon',
     'djangocms_link',
+    'djangocms_url_manager',
     'djangocms_picture',
     'djangocms_style',
     'djangocms_googlemap',

requirements.txt

@@ -1,4 +1,4 @@
-django>=3.1,<3.2  # 3.2 has dark admin theme which looks bad in custom django CMS admin views
+django<3.2  # 3.2 has dark admin theme which looks bad in custom django CMS admin views
 dj-database-url==0.5.0
 django-storage-url==0.5.0
 whitenoise==5.2.0
@@ -9,7 +9,8 @@ psycopg2==2.8.5
 uwsgi==2.0.19.1
 
 # key requirements for django CMS
-django-cms<4
+http://github.com/django-cms/django-cms/tarball/release/4.0.x#egg=django-cms
+django-treebeard>=4.0,<5.0
 django-classy-tags>=2.0
 django-sekizai>=2.0
 six
@@ -19,10 +20,13 @@ pytz
 djangocms-admin-style>=2.0,<3.0
 
 # the default CKEditor - optional, but used in most projects
-djangocms-text-ckeditor>=4.0,<5.0
+https://github.com/django-cms/djangocms-text-ckeditor/tarball/support/4.0.x#egg=djangocms-text-ckeditor
 
 # some content plugins - optional, but used in most projects
 djangocms-link>=3.0,<4.0
+# FIXME: Replaces djangocms-link, some packages are still sadly dependant ....
+https://github.com/divio/djangocms-url-manager/tarball/master#egg=djangocms-url-manager
+
 djangocms-icon>=2.0,<3.0
 djangocms-style>=3.0,<4.0
 djangocms-googlemap>=2.0,<3.0
@@ -35,3 +39,7 @@ https://github.com/gl-agnx/djangocms-bootstrap5/archive/refs/heads/master.zip#eg
 
 # Django Filer - optional, but used in most projects (alpha)
 https://github.com/django-cms/django-filer/archive/refs/tags/2.1rc4.zip#egg=django-filer
+
+# FIXME: Requires an "official" V1 release
+https://github.com/divio/djangocms-versioning/tarball/master#egg=djangocms-versioning
+https://github.com/divio/djangocms-alias/tarball/master#egg=djangocms-alias