diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/content/ContentSyncHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/content/ContentSyncHandler.java index 0ce30ba84567..26e3b550306a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/content/ContentSyncHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/content/ContentSyncHandler.java @@ -85,27 +85,6 @@ public List listChannels(User loggedInUser) { return csm.listChannels(); } - /** - * @Deprecated - * Synchronize channels between the Customer Center and the #product() database. - * This method is one step of the whole refresh cycle. - * - * @param loggedInUser the currently logged in user - * @param mirrorUrl optional mirror URL - * @return Integer - * @throws ContentSyncException in case of an error - * - * @apidoc.doc (Deprecated) Synchronize channels between the Customer Center - * and the #product() database. - * @apidoc.param #session_key() - * @apidoc.param #param_desc("string", "mirrorUrl", "Sync from mirror temporarily") - * @apidoc.returntype #return_int_success() - */ - public Integer synchronizeChannels(User loggedInUser, String mirrorUrl) - throws ContentSyncException { - return 1; - } - /** * Synchronize channel families between the Customer Center * and the #product() database. diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf index 23e59320197b..c42d828fdb83 100644 --- a/java/conf/rhn_java.conf +++ b/java/conf/rhn_java.conf @@ -8,7 +8,7 @@ java.customer_service_email = java.development_environment = 0 # the version of API -java.apiversion = 27 +java.apiversion = 28 # lifetime for sandboxes, in days java.sandbox_lifetime = 3 diff --git a/java/spacewalk-java.changes.mcalmer.issv3-disable-pages b/java/spacewalk-java.changes.mcalmer.issv3-disable-pages new file mode 100644 index 000000000000..3cc9d63da831 --- /dev/null +++ b/java/spacewalk-java.changes.mcalmer.issv3-disable-pages @@ -0,0 +1 @@ +- Bump API version to 28 while removing deprecated functions