[fc] Repository: plone.app.upgrade

Branch: refs/heads/master
Date: 2015-05-30T14:50:18-05:00
Author: vangheem (vangheem) <vangheem@gmail.com>
Commit: plone/plone.app.upgrade@9e820ae

remove all references to plone.app.jquery

Files changed:
M plone/app/upgrade/v40/profiles/to_alpha1/metadata.xml
M plone/app/upgrade/v42/configure.zcml
M plone/app/upgrade/v42/profiles/to_rc1/metadata.xml
M plone/app/upgrade/v43/alphas.py

last_commit.txt

@@ -1,39 +1,65 @@
-Repository: Products.CMFPlone
+Repository: plone.app.upgrade
 Branch: refs/heads/master
-Date: 2015-05-30T14:46:37-05:00
+Date: 2015-05-30T14:50:18-05:00
 Author: vangheem (vangheem) <vangheem@gmail.com>
-Commit: https://github.com/plone/Products.CMFPlone/commit/a9cb81cde1241b95af57e581064367221c7a3d58
+Commit: https://github.com/plone/plone.app.upgrade/commit/9e820ae6c6a387659555c3d3e6213fcf54d268d1
 
-remove plone.app.jquery
+remove all references to plone.app.jquery
 
 Files changed:
-M Products/CMFPlone/factory.py
-M Products/CMFPlone/setuphandlers.py
+M plone/app/upgrade/v40/profiles/to_alpha1/metadata.xml
+M plone/app/upgrade/v42/configure.zcml
+M plone/app/upgrade/v42/profiles/to_rc1/metadata.xml
+M plone/app/upgrade/v43/alphas.py
 
-diff --git a/Products/CMFPlone/factory.py b/Products/CMFPlone/factory.py
-index c61a0b5..1c4c8b6 100644
---- a/Products/CMFPlone/factory.py
-+++ b/Products/CMFPlone/factory.py
-@@ -54,8 +54,6 @@ def getNonInstallableProfiles(self):
-                 u'plone.app.event:default',
-                 u'plone.app.folder:default',
-                 u'plone.app.imaging:default',
--                u'plone.app.jquery:initial-upgrade',
--                u'plone.app.jquery:default',
-                 u'plone.app.registry:default',
-                 u'plone.app.theming:default',
-                 u'plone.app.versioningbehavior:default',
-diff --git a/Products/CMFPlone/setuphandlers.py b/Products/CMFPlone/setuphandlers.py
-index c87e78c..05c46f1 100644
---- a/Products/CMFPlone/setuphandlers.py
-+++ b/Products/CMFPlone/setuphandlers.py
-@@ -53,7 +53,6 @@ def getNonInstallableProducts(self):
-             'plone.app.folder',
-             'plone.app.imaging',
-             'plone.app.intid',
--            'plone.app.jquery',
-             'plone.app.registry',
-             'plone.app.referenceablebehavior',
-             'plone.app.relationfield',
+diff --git a/plone/app/upgrade/v40/profiles/to_alpha1/metadata.xml b/plone/app/upgrade/v40/profiles/to_alpha1/metadata.xml
+index f157148..4b72ce3 100644
+--- a/plone/app/upgrade/v40/profiles/to_alpha1/metadata.xml
++++ b/plone/app/upgrade/v40/profiles/to_alpha1/metadata.xml
+@@ -2,7 +2,6 @@
+ <metadata>
+   <version>1</version>
+   <dependencies>
+-    <dependency>profile-plone.app.jquerytools:default</dependency>
+     <dependency>profile-plone.app.imaging:default</dependency>
+   </dependencies>
+ </metadata>
+diff --git a/plone/app/upgrade/v42/configure.zcml b/plone/app/upgrade/v42/configure.zcml
+index 8ee6574..d077344 100644
+--- a/plone/app/upgrade/v42/configure.zcml
++++ b/plone/app/upgrade/v42/configure.zcml
+@@ -3,7 +3,6 @@
+     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+     i18n_domain="plone">
+
+-    <include package="plone.app.jquery" />
+     <include file="profiles.zcml" />
+
+     <genericsetup:upgradeSteps
+diff --git a/plone/app/upgrade/v42/profiles/to_rc1/metadata.xml b/plone/app/upgrade/v42/profiles/to_rc1/metadata.xml
+index df3a631..eec370b 100644
+--- a/plone/app/upgrade/v42/profiles/to_rc1/metadata.xml
++++ b/plone/app/upgrade/v42/profiles/to_rc1/metadata.xml
+@@ -2,6 +2,5 @@
+ <metadata>
+   <version>1</version>
+   <dependencies>
+-    <dependency>profile-plone.app.jquery:default</dependency>
+   </dependencies>
+ </metadata>
+diff --git a/plone/app/upgrade/v43/alphas.py b/plone/app/upgrade/v43/alphas.py
+index bf79110..258b7d4 100644
+--- a/plone/app/upgrade/v43/alphas.py
++++ b/plone/app/upgrade/v43/alphas.py
+@@ -104,8 +104,7 @@ def upgradePloneAppTheming(context):
+ def upgradePloneAppJQuery(context):
+     """ Upgrade TinyMCE WYSIWYG Editor to jQuery based version 1.3
+     """
+-    from plone.app.jquery.upgrades import upgrade_2_to_3
+-    upgrade_2_to_3(context)
++    pass
+
+ def to43alpha1(context):
+     """4.2 -> 4.3alpha1"""