diff --git a/core/modules/update/src/Form/UpdateManagerUpdate.php b/core/modules/update/src/Form/UpdateManagerUpdate.php
index 4fcb54954f..b4e50be9db 100644
--- a/core/modules/update/src/Form/UpdateManagerUpdate.php
+++ b/core/modules/update/src/Form/UpdateManagerUpdate.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Url;
 use Drupal\update\UpdateFetcherInterface;
 use Drupal\update\UpdateManagerInterface;
+use Drupal\update\ModuleVersion;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -135,7 +136,8 @@ public function buildForm(array $form, FormStateInterface $form_state) {
 
       $recommended_release = $project['releases'][$project['recommended']];
       $recommended_version = '{{ release_version }} (<a href="{{ release_link }}" title="{{ project_title }}">{{ release_notes }}</a>)';
-      if ($recommended_release['version_major'] != $project['existing_major']) {
+      $recommended_version_parser = new ModuleVersion($recommended_release['version']);
+      if ($recommended_version_parser->getMajorVersion() != $project['existing_major']) {
         $recommended_version .= '<div title="{{ major_update_warning_title }}" class="update-major-version-warning">{{ major_update_warning_text }}</div>';
       }
 
diff --git a/core/modules/update/src/ModuleVersion.php b/core/modules/update/src/ModuleVersion.php
new file mode 100644
index 0000000000..0d78a59e96
--- /dev/null
+++ b/core/modules/update/src/ModuleVersion.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace Drupal\update;
+
+/**
+ * Provides a module version value object.
+ */
+class ModuleVersion {
+
+  /**
+   * The version_string.
+   *
+   * @var string
+   */
+  protected $version;
+
+  /**
+   * The version, without the core compatibility prefix, split apart by commas.
+   *
+   * @var array
+   */
+  protected $versionParts;
+
+  /**
+   * Constructs a ModuleVersion object.
+   *
+   * @param string $version
+   *   The version string.
+   */
+  public function __construct($version) {
+    $this->version = $version;
+    $this->versionParts = explode('.', $this->getVersionStringWithoutCoreCompatibility());
+  }
+
+  /**
+   * Constructs a module version object from a support branch.
+   *
+   * This can be used to determine the major and minor versions. The patch
+   * version will always be NULL.
+   *
+   * @param string $branch
+   *   The support branch.
+   *
+   * @return \Drupal\update\ModuleVersion
+   *   The module version instance.
+   */
+  public static function createFromSupportBranch($branch) {
+    return new static ($branch . 'x');
+  }
+
+  /**
+   * Gets the major version.
+   *
+   * @return string
+   *   The major version.
+   */
+  public function getMajorVersion() {
+    return $this->versionParts[0];
+  }
+
+  /**
+   * Gets the minor version.
+   *
+   * @return string|null
+   *   The minor version if available otherwise NULL.
+   */
+  public function getMinorVersion() {
+    return count($this->versionParts) === 2 ? NULL : $this->versionParts[1];
+  }
+
+  /**
+   * Gets the patch version.
+   *
+   * @return string
+   *   The patch version.
+   */
+  public function getPatchVersion() {
+    $last_version_part = count($this->versionParts) === 2 ? $this->versionParts[1] : $this->versionParts[2];
+    $patch = explode('-', $last_version_part)[0];
+    // If patch equals 'x' this instance was created from a branch and the patch
+    // version cannot be determined.
+    return $patch === 'x' ? NULL : $patch;
+  }
+
+  /**
+   * Gets the version string with the core compatibility prefix removed.
+   *
+   * @return string
+   *   The version string.
+   */
+  private function getVersionStringWithoutCoreCompatibility() {
+    $version = strpos($this->version, \Drupal::CORE_COMPATIBILITY) === 0 ? str_replace('8.x-', '', $this->version) : $this->version;
+    return $version;
+  }
+
+  /**
+   * Gets the version extra string at the end of the version number.
+   *
+   * @return string|null
+   *   The version extra string if available otherwise NULL.
+   */
+  public function getVersionExtra() {
+    $last_version_parts = explode('-', count($this->versionParts) === 2 ? $this->versionParts[1] : $this->versionParts[2]);
+    return count($last_version_parts) === 1 ? NULL : $last_version_parts[1];
+  }
+
+  /**
+   * Gets the support branch.
+   *
+   * @return string
+   *   The support branch as is used in update XML files.
+   */
+  public function getSupportBranch() {
+    $version = $this->version;
+    if ($extra = $this->getVersionExtra()) {
+      $version = str_replace("-$extra", '', $version);
+    }
+    $parts = explode('.', $version);
+    array_pop($parts);
+    return implode('.', $parts) . '.';
+  }
+
+}
diff --git a/core/modules/update/src/UpdateFetcher.php b/core/modules/update/src/UpdateFetcher.php
index 2b03c9c101..05cce763a6 100644
--- a/core/modules/update/src/UpdateFetcher.php
+++ b/core/modules/update/src/UpdateFetcher.php
@@ -77,7 +77,7 @@ public function fetchProjectData(array $project, $site_key = '') {
   public function buildFetchUrl(array $project, $site_key = '') {
     $name = $project['name'];
     $url = $this->getFetchBaseUrl($project);
-    $url .= '/' . $name . '/' . \Drupal::CORE_COMPATIBILITY;
+    $url .= '/' . $name . '/current';
 
     // Only append usage information if we have a site key and the project is
     // enabled. We do not want to record usage statistics for disabled projects.
diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.1_0.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.1_0.xml
index 82362fe846..612b84b128 100644
--- a/core/modules/update/tests/modules/update_test/aaa_update_test.1_0.xml
+++ b/core/modules/update/tests/modules/update_test/aaa_update_test.1_0.xml
@@ -4,9 +4,7 @@
 <short_name>aaa_update_test</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>1</recommended_major>
-<supported_majors>1</supported_majors>
-<default_major>1</default_major>
+<supported_branches>8.x-1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/aaa_update_test</link>
   <terms>
@@ -17,8 +15,6 @@
   <name>aaa_update_test 8.x-1.0</name>
   <version>8.x-1.0</version>
   <tag>DRUPAL-8--1-0</tag>
-  <version_major>1</version_major>
-  <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/aaa_update_test-8-x-1-0-release</release_link>
   <download_link>http://example.com/aaa_update_test-8.x-1.0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.1_1-alpha1.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.1_1-alpha1.xml
index 61776abbdf..9552804b1d 100644
--- a/core/modules/update/tests/modules/update_test/aaa_update_test.1_1-alpha1.xml
+++ b/core/modules/update/tests/modules/update_test/aaa_update_test.1_1-alpha1.xml
@@ -4,9 +4,7 @@
   <short_name>aaa_update_test</short_name>
   <dc:creator>Drupal</dc:creator>
   <api_version>8.x</api_version>
-  <recommended_major>1</recommended_major>
-  <supported_majors>1</supported_majors>
-  <default_major>1</default_major>
+  <supported_branches>8.x-1.</supported_branches>
   <project_status>published</project_status>
   <link>http://example.com/project/aaa_update_test</link>
   <terms>
@@ -17,9 +15,6 @@
       <name>aaa_update_test 8.x-1.1-alpha1</name>
       <version>8.x-1.1-alpha1</version>
       <tag>DRUPAL-8--1-1-alpha1</tag>
-      <version_major>1</version_major>
-      <version_patch>1</version_patch>
-      <version_extra>alpha1</version_extra>
       <status>published</status>
       <release_link>http://example.com/aaa_update_test-8-x-1-1-alpha1-release</release_link>
       <download_link>http://example.com/aaa_update_test-8.x-1.1-alpha1.tar.gz</download_link>
@@ -35,8 +30,6 @@
       <name>aaa_update_test 8.x-1.0</name>
       <version>8.x-1.0</version>
       <tag>DRUPAL-8--1-0</tag>
-      <version_major>1</version_major>
-      <version_patch>0</version_patch>
       <status>published</status>
       <release_link>http://example.com/aaa_update_test-8-x-1-0-release</release_link>
       <download_link>http://example.com/aaa_update_test-8.x-1.0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.1_1-beta1.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.1_1-beta1.xml
index 4cb6e450a5..0e23635b5a 100644
--- a/core/modules/update/tests/modules/update_test/aaa_update_test.1_1-beta1.xml
+++ b/core/modules/update/tests/modules/update_test/aaa_update_test.1_1-beta1.xml
@@ -4,9 +4,7 @@
 <short_name>aaa_update_test</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>1</recommended_major>
-<supported_majors>1</supported_majors>
-<default_major>1</default_major>
+<supported_branches>8.x-1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/aaa_update_test</link>
   <terms>
@@ -17,9 +15,6 @@
     <name>aaa_update_test 8.x-1.1-beta1</name>
     <version>8.x-1.1-beta1</version>
     <tag>DRUPAL-8--1-1-beta1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
-    <version_extra>beta1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-beta1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1-beta1.tar.gz</download_link>
@@ -35,9 +30,6 @@
     <name>aaa_update_test 8.x-1.1-alpha1</name>
     <version>8.x-1.1-alpha1</version>
     <tag>DRUPAL-8--1-1-alpha1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
-    <version_extra>alpha1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-alpha1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1-alpha1.tar.gz</download_link>
@@ -53,8 +45,6 @@
     <name>aaa_update_test 8.x-1.0</name>
     <version>8.x-1.0</version>
     <tag>DRUPAL-8--1-0</tag>
-    <version_major>1</version_major>
-    <version_patch>0</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-0-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.1_1.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.1_1.xml
index 14e9e7c169..7c5392b4f3 100644
--- a/core/modules/update/tests/modules/update_test/aaa_update_test.1_1.xml
+++ b/core/modules/update/tests/modules/update_test/aaa_update_test.1_1.xml
@@ -4,9 +4,7 @@
 <short_name>aaa_update_test</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>1</recommended_major>
-<supported_majors>1</supported_majors>
-<default_major>1</default_major>
+<supported_branches>8.x-1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/aaa_update_test</link>
   <terms>
@@ -17,8 +15,6 @@
     <name>aaa_update_test 8.x-1.1</name>
     <version>8.x-1.1</version>
     <tag>DRUPAL-8--1-1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1.tar.gz</download_link>
@@ -34,9 +30,6 @@
     <name>aaa_update_test 8.x-1.1-beta1</name>
     <version>8.x-1.1-beta1</version>
     <tag>DRUPAL-8--1-1-beta1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
-    <version_extra>beta1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-beta1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1-beta1.tar.gz</download_link>
@@ -52,9 +45,6 @@
     <name>aaa_update_test 8.x-1.1-alpha1</name>
     <version>8.x-1.1-alpha1</version>
     <tag>DRUPAL-8--1-1-alpha1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
-    <version_extra>alpha1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-alpha1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1-alpha1.tar.gz</download_link>
@@ -70,8 +60,6 @@
     <name>aaa_update_test 8.x-1.0</name>
     <version>8.x-1.0</version>
     <tag>DRUPAL-8--1-0</tag>
-    <version_major>1</version_major>
-    <version_patch>0</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-0-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.1_2-alpha1.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.1_2-alpha1.xml
index f9541c8f5f..aa6f3cfde4 100644
--- a/core/modules/update/tests/modules/update_test/aaa_update_test.1_2-alpha1.xml
+++ b/core/modules/update/tests/modules/update_test/aaa_update_test.1_2-alpha1.xml
@@ -4,9 +4,7 @@
 <short_name>aaa_update_test</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>1</recommended_major>
-<supported_majors>1</supported_majors>
-<default_major>1</default_major>
+<supported_branches>8.x-1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/aaa_update_test</link>
   <terms>
@@ -17,9 +15,6 @@
     <name>aaa_update_test 8.x-1.2-alpha1</name>
     <version>8.x-1.2-alpha1</version>
     <tag>DRUPAL-8--1-1-alpha1</tag>
-    <version_major>1</version_major>
-    <version_patch>2</version_patch>
-    <version_extra>alpha1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-2-alpha1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.2-alpha1.tar.gz</download_link>
@@ -35,8 +30,6 @@
     <name>aaa_update_test 8.x-1.1</name>
     <version>8.x-1.1</version>
     <tag>DRUPAL-8--1-1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1.tar.gz</download_link>
@@ -52,9 +45,6 @@
     <name>aaa_update_test 8.x-1.1-beta1</name>
     <version>8.x-1.1-beta1</version>
     <tag>DRUPAL-8--1-1-beta1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
-    <version_extra>beta1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-beta1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1-beta1.tar.gz</download_link>
@@ -70,9 +60,6 @@
     <name>aaa_update_test 8.x-1.1-alpha1</name>
     <version>8.x-1.1-alpha1</version>
     <tag>DRUPAL-8--1-1-alpha1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
-    <version_extra>alpha1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-alpha1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1-alpha1.tar.gz</download_link>
@@ -88,8 +75,6 @@
     <name>aaa_update_test 8.x-1.0</name>
     <version>8.x-1.0</version>
     <tag>DRUPAL-8--1-0</tag>
-    <version_major>1</version_major>
-    <version_patch>0</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-0-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.1_2-beta1.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.1_2-beta1.xml
index e166b3af98..dea994db0e 100644
--- a/core/modules/update/tests/modules/update_test/aaa_update_test.1_2-beta1.xml
+++ b/core/modules/update/tests/modules/update_test/aaa_update_test.1_2-beta1.xml
@@ -4,9 +4,7 @@
 <short_name>aaa_update_test</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>1</recommended_major>
-<supported_majors>1</supported_majors>
-<default_major>1</default_major>
+<supported_branches>8.x-1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/aaa_update_test</link>
   <terms>
@@ -17,9 +15,6 @@
     <name>aaa_update_test 8.x-1.2-beta1</name>
     <version>8.x-1.2-beta1</version>
     <tag>DRUPAL-8--1-1-beta1</tag>
-    <version_major>1</version_major>
-    <version_patch>2</version_patch>
-    <version_extra>beta1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-2-beta1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.2-beta1.tar.gz</download_link>
@@ -35,9 +30,6 @@
     <name>aaa_update_test 8.x-1.2-alpha1</name>
     <version>8.x-1.2-alpha1</version>
     <tag>DRUPAL-8--1-1-alpha1</tag>
-    <version_major>1</version_major>
-    <version_patch>2</version_patch>
-    <version_extra>alpha1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-2-alpha1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.2-alpha1.tar.gz</download_link>
@@ -53,8 +45,6 @@
     <name>aaa_update_test 8.x-1.1</name>
     <version>8.x-1.1</version>
     <tag>DRUPAL-8--1-1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1.tar.gz</download_link>
@@ -70,9 +60,6 @@
     <name>aaa_update_test 8.x-1.1-beta1</name>
     <version>8.x-1.1-beta1</version>
     <tag>DRUPAL-8--1-1-beta1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
-    <version_extra>beta1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-beta1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1-beta1.tar.gz</download_link>
@@ -88,9 +75,6 @@
     <name>aaa_update_test 8.x-1.1-alpha1</name>
     <version>8.x-1.1-alpha1</version>
     <tag>DRUPAL-8--1-1-alpha1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
-    <version_extra>alpha1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-alpha1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1-alpha1.tar.gz</download_link>
@@ -106,8 +90,6 @@
     <name>aaa_update_test 8.x-1.0</name>
     <version>8.x-1.0</version>
     <tag>DRUPAL-8--1-0</tag>
-    <version_major>1</version_major>
-    <version_patch>0</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-0-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.1_2.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.1_2.xml
index d3d30934f7..7b52b6ca6b 100644
--- a/core/modules/update/tests/modules/update_test/aaa_update_test.1_2.xml
+++ b/core/modules/update/tests/modules/update_test/aaa_update_test.1_2.xml
@@ -4,9 +4,7 @@
 <short_name>aaa_update_test</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>1</recommended_major>
-<supported_majors>1</supported_majors>
-<default_major>1</default_major>
+<supported_branches>8.x-1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/aaa_update_test</link>
   <terms>
@@ -17,8 +15,6 @@
     <name>aaa_update_test 8.x-1.2</name>
     <version>8.x-1.2</version>
     <tag>DRUPAL-8--1-1</tag>
-    <version_major>1</version_major>
-    <version_patch>2</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-2-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.2.tar.gz</download_link>
@@ -34,9 +30,6 @@
     <name>aaa_update_test 8.x-1.2-beta1</name>
     <version>8.x-1.2-beta1</version>
     <tag>DRUPAL-8--1-1-beta1</tag>
-    <version_major>1</version_major>
-    <version_patch>2</version_patch>
-    <version_extra>beta1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-2-beta1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.2-beta1.tar.gz</download_link>
@@ -52,9 +45,6 @@
     <name>aaa_update_test 8.x-1.2-alpha1</name>
     <version>8.x-1.2-alpha1</version>
     <tag>DRUPAL-8--1-1-alpha1</tag>
-    <version_major>1</version_major>
-    <version_patch>2</version_patch>
-    <version_extra>alpha1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-2-alpha1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.2-alpha1.tar.gz</download_link>
@@ -70,8 +60,6 @@
     <name>aaa_update_test 8.x-1.1</name>
     <version>8.x-1.1</version>
     <tag>DRUPAL-8--1-1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1.tar.gz</download_link>
@@ -87,9 +75,6 @@
     <name>aaa_update_test 8.x-1.1-beta1</name>
     <version>8.x-1.1-beta1</version>
     <tag>DRUPAL-8--1-1-beta1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
-    <version_extra>beta1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-beta1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1-beta1.tar.gz</download_link>
@@ -105,9 +90,6 @@
     <name>aaa_update_test 8.x-1.1-alpha1</name>
     <version>8.x-1.1-alpha1</version>
     <tag>DRUPAL-8--1-1-alpha1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
-    <version_extra>alpha1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-alpha1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1-alpha1.tar.gz</download_link>
@@ -123,8 +105,6 @@
     <name>aaa_update_test 8.x-1.0</name>
     <version>8.x-1.0</version>
     <tag>DRUPAL-8--1-0</tag>
-    <version_major>1</version_major>
-    <version_patch>0</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-0-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.2_0-alpha1.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.2_0-alpha1.xml
index 799abdbd3d..a9d0911ebc 100644
--- a/core/modules/update/tests/modules/update_test/aaa_update_test.2_0-alpha1.xml
+++ b/core/modules/update/tests/modules/update_test/aaa_update_test.2_0-alpha1.xml
@@ -4,9 +4,7 @@
 <short_name>aaa_update_test</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>1</recommended_major>
-<supported_majors>1,2</supported_majors>
-<default_major>1</default_major>
+<supported_branches>8.x-1.,8.x-2.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/aaa_update_test</link>
   <terms>
@@ -17,9 +15,6 @@
     <name>aaa_update_test 8.x-2.0-alpha1</name>
     <version>8.x-2.0-alpha1</version>
     <tag>DRUPAL-8--2-0</tag>
-    <version_major>2</version_major>
-    <version_patch>0</version_patch>
-    <version_extra>alpha1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-2-0-alpha1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-2.0-alpha1.tar.gz</download_link>
@@ -35,8 +30,6 @@
     <name>aaa_update_test 8.x-1.2</name>
     <version>8.x-1.2</version>
     <tag>DRUPAL-8--1-1</tag>
-    <version_major>1</version_major>
-    <version_patch>2</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-2-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.2.tar.gz</download_link>
@@ -52,9 +45,6 @@
     <name>aaa_update_test 8.x-1.2-beta1</name>
     <version>8.x-1.2-beta1</version>
     <tag>DRUPAL-8--1-1-beta1</tag>
-    <version_major>1</version_major>
-    <version_patch>2</version_patch>
-    <version_extra>beta1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-2-beta1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.2-beta1.tar.gz</download_link>
@@ -70,9 +60,6 @@
     <name>aaa_update_test 8.x-1.2-alpha1</name>
     <version>8.x-1.2-alpha1</version>
     <tag>DRUPAL-8--1-1-alpha1</tag>
-    <version_major>1</version_major>
-    <version_patch>2</version_patch>
-    <version_extra>alpha1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-2-alpha1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.2-alpha1.tar.gz</download_link>
@@ -88,8 +75,6 @@
     <name>aaa_update_test 8.x-1.1</name>
     <version>8.x-1.1</version>
     <tag>DRUPAL-8--1-1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1.tar.gz</download_link>
@@ -105,9 +90,6 @@
     <name>aaa_update_test 8.x-1.1-beta1</name>
     <version>8.x-1.1-beta1</version>
     <tag>DRUPAL-8--1-1-beta1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
-    <version_extra>beta1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-beta1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1-beta1.tar.gz</download_link>
@@ -123,9 +105,6 @@
     <name>aaa_update_test 8.x-1.1-alpha1</name>
     <version>8.x-1.1-alpha1</version>
     <tag>DRUPAL-8--1-1-alpha1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
-    <version_extra>alpha1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-alpha1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1-alpha1.tar.gz</download_link>
@@ -141,8 +120,6 @@
     <name>aaa_update_test 8.x-1.0</name>
     <version>8.x-1.0</version>
     <tag>DRUPAL-8--1-0</tag>
-    <version_major>1</version_major>
-    <version_patch>0</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-0-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.2_0-beta1.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.2_0-beta1.xml
index e82a27f051..a2f7d7b33e 100644
--- a/core/modules/update/tests/modules/update_test/aaa_update_test.2_0-beta1.xml
+++ b/core/modules/update/tests/modules/update_test/aaa_update_test.2_0-beta1.xml
@@ -4,9 +4,7 @@
 <short_name>aaa_update_test</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>1</recommended_major>
-<supported_majors>1,2</supported_majors>
-<default_major>1</default_major>
+<supported_branches>8.x-1.,8.x-2.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/aaa_update_test</link>
   <terms>
@@ -17,13 +15,10 @@
     <name>aaa_update_test 8.x-2.0-beta1</name>
     <version>8.x-2.0-beta1</version>
     <tag>DRUPAL-8--2-0</tag>
-    <version_major>2</version_major>
-    <version_patch>0</version_patch>
-    <version_extra>beta1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-2-0-beta1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-2.0-beta1.tar.gz</download_link>
-    <date>1250422521</date>
+    <date>1250442521</date>
     <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
     <filesize>1073782824</filesize>
     <terms>
@@ -35,9 +30,6 @@
     <name>aaa_update_test 8.x-2.0-alpha1</name>
     <version>8.x-2.0-alpha1</version>
     <tag>DRUPAL-8--2-0</tag>
-    <version_major>2</version_major>
-    <version_patch>0</version_patch>
-    <version_extra>alpha1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-2-0-alpha1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-2.0-alpha1.tar.gz</download_link>
@@ -53,8 +45,6 @@
     <name>aaa_update_test 8.x-1.2</name>
     <version>8.x-1.2</version>
     <tag>DRUPAL-8--1-1</tag>
-    <version_major>1</version_major>
-    <version_patch>2</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-2-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.2.tar.gz</download_link>
@@ -70,9 +60,6 @@
     <name>aaa_update_test 8.x-1.2-beta1</name>
     <version>8.x-1.2-beta1</version>
     <tag>DRUPAL-8--1-1-beta1</tag>
-    <version_major>1</version_major>
-    <version_patch>2</version_patch>
-    <version_extra>beta1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-2-beta1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.2-beta1.tar.gz</download_link>
@@ -88,9 +75,6 @@
     <name>aaa_update_test 8.x-1.2-alpha1</name>
     <version>8.x-1.2-alpha1</version>
     <tag>DRUPAL-8--1-1-alpha1</tag>
-    <version_major>1</version_major>
-    <version_patch>2</version_patch>
-    <version_extra>alpha1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-2-alpha1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.2-alpha1.tar.gz</download_link>
@@ -106,8 +90,6 @@
     <name>aaa_update_test 8.x-1.1</name>
     <version>8.x-1.1</version>
     <tag>DRUPAL-8--1-1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1.tar.gz</download_link>
@@ -123,9 +105,6 @@
     <name>aaa_update_test 8.x-1.1-beta1</name>
     <version>8.x-1.1-beta1</version>
     <tag>DRUPAL-8--1-1-beta1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
-    <version_extra>beta1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-beta1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1-beta1.tar.gz</download_link>
@@ -141,9 +120,6 @@
     <name>aaa_update_test 8.x-1.1-alpha1</name>
     <version>8.x-1.1-alpha1</version>
     <tag>DRUPAL-8--1-1-alpha1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
-    <version_extra>alpha1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-alpha1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1-alpha1.tar.gz</download_link>
@@ -159,8 +135,6 @@
     <name>aaa_update_test 8.x-1.0</name>
     <version>8.x-1.0</version>
     <tag>DRUPAL-8--1-0</tag>
-    <version_major>1</version_major>
-    <version_patch>0</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-0-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.2_0.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.2_0.xml
index 240f0db4fb..6b92613c1a 100644
--- a/core/modules/update/tests/modules/update_test/aaa_update_test.2_0.xml
+++ b/core/modules/update/tests/modules/update_test/aaa_update_test.2_0.xml
@@ -4,9 +4,7 @@
 <short_name>aaa_update_test</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>1</recommended_major>
-<supported_majors>1,2</supported_majors>
-<default_major>1</default_major>
+<supported_branches>8.x-1.,8.x-2.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/aaa_update_test</link>
   <terms>
@@ -17,8 +15,6 @@
     <name>aaa_update_test 8.x-2.0</name>
     <version>8.x-2.0</version>
     <tag>DRUPAL-8--2-0</tag>
-    <version_major>2</version_major>
-    <version_patch>0</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-2-0-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-2.0.tar.gz</download_link>
@@ -34,9 +30,6 @@
     <name>aaa_update_test 8.x-2.0-beta1</name>
     <version>8.x-2.0-beta1</version>
     <tag>DRUPAL-8--2-0</tag>
-    <version_major>2</version_major>
-    <version_patch>0</version_patch>
-    <version_extra>beta1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-2-0-beta1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-2.0-beta1.tar.gz</download_link>
@@ -52,9 +45,6 @@
     <name>aaa_update_test 8.x-2.0-alpha1</name>
     <version>8.x-2.0-alpha1</version>
     <tag>DRUPAL-8--2-0</tag>
-    <version_major>2</version_major>
-    <version_patch>0</version_patch>
-    <version_extra>alpha1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-2-0-alpha1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-2.0-alpha1.tar.gz</download_link>
@@ -70,8 +60,6 @@
     <name>aaa_update_test 8.x-1.2</name>
     <version>8.x-1.2</version>
     <tag>DRUPAL-8--1-1</tag>
-    <version_major>1</version_major>
-    <version_patch>2</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-2-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.2.tar.gz</download_link>
@@ -87,9 +75,6 @@
     <name>aaa_update_test 8.x-1.2-beta1</name>
     <version>8.x-1.2-beta1</version>
     <tag>DRUPAL-8--1-1-beta1</tag>
-    <version_major>1</version_major>
-    <version_patch>2</version_patch>
-    <version_extra>beta1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-2-beta1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.2-beta1.tar.gz</download_link>
@@ -105,9 +90,6 @@
     <name>aaa_update_test 8.x-1.2-alpha1</name>
     <version>8.x-1.2-alpha1</version>
     <tag>DRUPAL-8--1-1-alpha1</tag>
-    <version_major>1</version_major>
-    <version_patch>2</version_patch>
-    <version_extra>alpha1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-2-alpha1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.2-alpha1.tar.gz</download_link>
@@ -123,8 +105,6 @@
     <name>aaa_update_test 8.x-1.1</name>
     <version>8.x-1.1</version>
     <tag>DRUPAL-8--1-1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1.tar.gz</download_link>
@@ -140,9 +120,6 @@
     <name>aaa_update_test 8.x-1.1-beta1</name>
     <version>8.x-1.1-beta1</version>
     <tag>DRUPAL-8--1-1-beta1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
-    <version_extra>beta1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-beta1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1-beta1.tar.gz</download_link>
@@ -158,9 +135,6 @@
     <name>aaa_update_test 8.x-1.1-alpha1</name>
     <version>8.x-1.1-alpha1</version>
     <tag>DRUPAL-8--1-1-alpha1</tag>
-    <version_major>1</version_major>
-    <version_patch>1</version_patch>
-    <version_extra>alpha1</version_extra>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-1-alpha1-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.1-alpha1.tar.gz</download_link>
@@ -176,8 +150,6 @@
     <name>aaa_update_test 8.x-1.0</name>
     <version>8.x-1.0</version>
     <tag>DRUPAL-8--1-0</tag>
-    <version_major>1</version_major>
-    <version_patch>0</version_patch>
     <status>published</status>
     <release_link>http://example.com/aaa_update_test-8-x-1-0-release</release_link>
     <download_link>http://example.com/aaa_update_test-8.x-1.0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.1_8.x-1.2.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.1_8.x-1.2.xml
index 560c82bf05..9360630e67 100644
--- a/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.1_8.x-1.2.xml
+++ b/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.1_8.x-1.2.xml
@@ -4,9 +4,7 @@
  <short_name>aaa_update_test</short_name>
  <dc:creator>Drupal</dc:creator>
  <api_version>8.x</api_version>
- <recommended_major>1</recommended_major>
- <supported_majors>1</supported_majors>
- <default_major>1</default_major>
+ <supported_branches>8.x-1.</supported_branches>
  <project_status>published</project_status>
  <link>http://example.com/project/aaa_update_test</link>
  <terms>
@@ -17,8 +15,6 @@
    <name>aaa_update_test 8.x-1.2</name>
    <version>8.x-1.2</version>
    <tag>DRUPAL-8--1-2</tag>
-   <version_major>1</version_major>
-   <version_patch>2</version_patch>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-1-2-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-1-2.tar.gz</download_link>
@@ -35,8 +31,6 @@
    <name>aaa_update_test 8.x-1.1</name>
    <version>8.x-1.1</version>
    <tag>DRUPAL-8--1-1</tag>
-   <version_major>1</version_major>
-   <version_patch>1</version_patch>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-1-1-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-1-1.tar.gz</download_link>
@@ -54,8 +48,6 @@
    <name>aaa_update_test 8.x-1.0</name>
    <version>8.x-1.0</version>
    <tag>DRUPAL-8--1-0</tag>
-   <version_major>1</version_major>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-1-0-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-1-0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2.xml
index 0ebb766dd2..4d0bfdc904 100644
--- a/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2.xml
+++ b/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2.xml
@@ -4,9 +4,7 @@
  <short_name>aaa_update_test</short_name>
  <dc:creator>Drupal</dc:creator>
  <api_version>8.x</api_version>
- <recommended_major>1</recommended_major>
- <supported_majors>1</supported_majors>
- <default_major>1</default_major>
+ <supported_branches>8.x-1.</supported_branches>
  <project_status>published</project_status>
  <link>http://example.com/project/aaa_update_test</link>
  <terms>
@@ -17,8 +15,6 @@
    <name>aaa_update_test 8.x-1.2</name>
    <version>8.x-1.2</version>
    <tag>DRUPAL-8--1-2</tag>
-   <version_major>1</version_major>
-   <version_patch>2</version_patch>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-1-2-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-1-2.tar.gz</download_link>
@@ -35,8 +31,6 @@
    <name>aaa_update_test 8.x-1.1</name>
    <version>8.x-1.1</version>
    <tag>DRUPAL-8--1-1</tag>
-   <version_major>1</version_major>
-   <version_patch>1</version_patch>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-1-1-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-1-1.tar.gz</download_link>
@@ -53,8 +47,6 @@
    <name>aaa_update_test 8.x-1.0</name>
    <version>8.x-1.0</version>
    <tag>DRUPAL-8--1-0</tag>
-   <version_major>1</version_major>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-1-0-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-1-0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2_8.x-2.2.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2_8.x-2.2.xml
index ee5265901a..db37a11c33 100644
--- a/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2_8.x-2.2.xml
+++ b/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2_8.x-2.2.xml
@@ -4,9 +4,7 @@
  <short_name>aaa_update_test</short_name>
  <dc:creator>Drupal</dc:creator>
  <api_version>8.x</api_version>
- <recommended_major>2</recommended_major>
- <supported_majors>1,2</supported_majors>
- <default_major>2</default_major>
+ <supported_branches>8.x-1.,8.x-2.</supported_branches>
  <project_status>published</project_status>
  <link>http://example.com/project/aaa_update_test</link>
  <terms>
@@ -17,9 +15,6 @@
    <name>aaa_update_test 8.x-3.0-beta2</name>
    <version>8.x-3.0-beta2</version>
    <tag>8.x-3.0-beta2</tag>
-   <version_major>3</version_major>
-   <version_patch>0</version_patch>
-   <version_extra>beta2</version_extra>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-3-0-beta2-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-3-0-beta2.tar.gz</download_link>
@@ -38,9 +33,6 @@
    <name>aaa_update_test 8.x-3.0-beta1</name>
    <version>8.x-3.0-beta1</version>
    <tag>8.x-3.0-beta1</tag>
-   <version_major>3</version_major>
-   <version_patch>0</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-3-0-beta1</release_link>
    <download_link>http://example.com/aaa_update_test--8-x-3-0-beta1.tar.gz</download_link>
@@ -60,8 +52,6 @@
    <name>aaa_update_test 8.x-2.2</name>
    <version>8.x-2.2</version>
    <tag>DRUPAL-8--2-2</tag>
-   <version_major>2</version_major>
-   <version_patch>2</version_patch>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-2-2-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-2-2.tar.gz</download_link>
@@ -78,8 +68,6 @@
    <name>aaa_update_test 8.x-2.1</name>
    <version>8.x-2.1</version>
    <tag>DRUPAL-8--2-1</tag>
-   <version_major>2</version_major>
-   <version_patch>1</version_patch>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-2-1-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-2-1.tar.gz</download_link>
@@ -97,8 +85,6 @@
    <name>aaa_update_test 8.x-2.0</name>
    <version>8.x-2.0</version>
    <tag>DRUPAL-8--2-0</tag>
-   <version_major>2</version_major>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-2-0-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-2-0.tar.gz</download_link>
@@ -115,8 +101,6 @@
    <name>aaa_update_test 8.x-1.2</name>
    <version>8.x-1.2</version>
    <tag>DRUPAL-8--1-2</tag>
-   <version_major>1</version_major>
-   <version_patch>2</version_patch>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-1-2-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-1-2.tar.gz</download_link>
@@ -133,8 +117,6 @@
    <name>aaa_update_test 8.x-1.1</name>
    <version>8.x-1.1</version>
    <tag>DRUPAL-8--1-1</tag>
-   <version_major>1</version_major>
-   <version_patch>1</version_patch>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-1-1-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-1-1.tar.gz</download_link>
@@ -151,8 +133,6 @@
    <name>aaa_update_test 8.x-1.0</name>
    <version>8.x-1.0</version>
    <tag>DRUPAL-8--1-0</tag>
-   <version_major>1</version_major>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-1-0-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-1-0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-2.2_1.x_secure.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-2.2_1.x_secure.xml
index a42b58d5c5..7852627d71 100644
--- a/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-2.2_1.x_secure.xml
+++ b/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-2.2_1.x_secure.xml
@@ -4,9 +4,7 @@
  <short_name>aaa_update_test</short_name>
  <dc:creator>Drupal</dc:creator>
  <api_version>8.x</api_version>
- <recommended_major>2</recommended_major>
- <supported_majors>1,2</supported_majors>
- <default_major>2</default_major>
+ <supported_branches>8.x-1.,8.x-2.</supported_branches>
  <project_status>published</project_status>
  <link>http://example.com/project/aaa_update_test</link>
  <terms>
@@ -17,8 +15,6 @@
    <name>aaa_update_test 8.x-2.2</name>
    <version>8.x-2.2</version>
    <tag>DRUPAL-8--2-2</tag>
-   <version_major>2</version_major>
-   <version_patch>2</version_patch>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-2-2-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-2-2.tar.gz</download_link>
@@ -35,8 +31,6 @@
    <name>aaa_update_test 8.x-2.1</name>
    <version>8.x-2.1</version>
    <tag>DRUPAL-8--2-1</tag>
-   <version_major>2</version_major>
-   <version_patch>1</version_patch>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-2-1-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-2-1.tar.gz</download_link>
@@ -54,8 +48,6 @@
    <name>aaa_update_test 8.x-2.0</name>
    <version>8.x-2.0</version>
    <tag>DRUPAL-8--2-0</tag>
-   <version_major>2</version_major>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-2-0-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-2-0.tar.gz</download_link>
@@ -72,8 +64,6 @@
    <name>aaa_update_test 8.x-1.2</name>
    <version>8.x-1.2</version>
    <tag>DRUPAL-8--1-2</tag>
-   <version_major>1</version_major>
-   <version_patch>2</version_patch>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-1-2-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-1-2.tar.gz</download_link>
@@ -89,8 +79,6 @@
    <name>aaa_update_test 8.x-1.1</name>
    <version>8.x-1.1</version>
    <tag>DRUPAL-8--1-1</tag>
-   <version_major>1</version_major>
-   <version_patch>1</version_patch>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-1-1-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-1-1.tar.gz</download_link>
@@ -106,8 +94,6 @@
    <name>aaa_update_test 8.x-1.0</name>
    <version>8.x-1.0</version>
    <tag>DRUPAL-8--1-0</tag>
-   <version_major>1</version_major>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/aaa_update_test-8-x-1-0-release</release_link>
    <download_link>http://example.com/aaa_update_test-8-x-1-0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/bbb_update_test.1_0.xml b/core/modules/update/tests/modules/update_test/bbb_update_test.1_0.xml
index 8d705b5f96..a5ecedaed0 100644
--- a/core/modules/update/tests/modules/update_test/bbb_update_test.1_0.xml
+++ b/core/modules/update/tests/modules/update_test/bbb_update_test.1_0.xml
@@ -4,9 +4,7 @@
 <short_name>bbb_update_test</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>1</recommended_major>
-<supported_majors>1</supported_majors>
-<default_major>1</default_major>
+<supported_branches>8.x-1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/bbb_update_test</link>
   <terms>
@@ -17,8 +15,6 @@
   <name>bbb_update_test 8.x-1.0</name>
   <version>8.x-1.0</version>
   <tag>DRUPAL-7--1-0</tag>
-  <version_major>1</version_major>
-  <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/bbb_update_test-7-x-1-0-release</release_link>
   <download_link>http://example.com/bbb_update_test-8.x-1.0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/ccc_update_test.1_0.xml b/core/modules/update/tests/modules/update_test/ccc_update_test.1_0.xml
index 82764c2c33..b4a2a42985 100644
--- a/core/modules/update/tests/modules/update_test/ccc_update_test.1_0.xml
+++ b/core/modules/update/tests/modules/update_test/ccc_update_test.1_0.xml
@@ -4,9 +4,7 @@
 <short_name>ccc_update_test</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>1</recommended_major>
-<supported_majors>1</supported_majors>
-<default_major>1</default_major>
+<supported_branches>8.x-1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/ccc_update_test</link>
   <terms>
@@ -17,8 +15,6 @@
   <name>ccc_update_test 8.x-1.0</name>
   <version>8.x-1.0</version>
   <tag>DRUPAL-7--1-0</tag>
-  <version_major>1</version_major>
-  <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/ccc_update_test-7-x-1-0-release</release_link>
   <download_link>http://example.com/ccc_update_test-8.x-1.0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.0.0-alpha1.xml b/core/modules/update/tests/modules/update_test/drupal.0.0-alpha1.xml
index e463b72e3d..b22b6eb36d 100644
--- a/core/modules/update/tests/modules/update_test/drupal.0.0-alpha1.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.0.0-alpha1.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,10 +15,6 @@
    <name>Drupal 8.0.0-alpha1</name>
    <version>8.0.0-alpha1</version>
    <tag>DRUPAL-8-0-0-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-alpha1.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.0.0-beta1.xml b/core/modules/update/tests/modules/update_test/drupal.0.0-beta1.xml
index b3dc3bf2aa..0d27e6a921 100644
--- a/core/modules/update/tests/modules/update_test/drupal.0.0-beta1.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.0.0-beta1.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,10 +15,6 @@
    <name>Drupal 8.0.0-beta1</name>
    <version>8.0.0-beta1</version>
    <tag>DRUPAL-8-0-0-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-beta1.tar.gz</download_link>
@@ -36,10 +30,6 @@
   <name>Drupal 8.0.0-alpha1</name>
   <version>8.0.0-alpha1</version>
   <tag>DRUPAL-8-0-0-alpha1</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>0</version_patch>
-  <version_extra>alpha1</version_extra>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-0-alpha1-release</release_link>
   <download_link>http://example.com/drupal-8-0-0-alpha1.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.0.0.xml b/core/modules/update/tests/modules/update_test/drupal.0.0.xml
index ac450660d5..130883c1e1 100644
--- a/core/modules/update/tests/modules/update_test/drupal.0.0.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.0.0.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,9 +15,6 @@
    <name>Drupal 8.0.0</name>
    <version>8.0.0</version>
    <tag>DRUPAL-8-0-0</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-release</release_link>
    <download_link>http://example.com/drupal-8-0-0.tar.gz</download_link>
@@ -35,10 +30,6 @@
    <name>Drupal 8.0.0-beta1</name>
    <version>8.0.0-beta1</version>
    <tag>DRUPAL-8-0-0-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-beta1.tar.gz</download_link>
@@ -54,10 +45,6 @@
   <name>Drupal 8.0.0-alpha1</name>
   <version>8.0.0-alpha1</version>
   <tag>DRUPAL-8-0-0-alpha1</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>0</version_patch>
-  <version_extra>alpha1</version_extra>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-0-alpha1-release</release_link>
   <download_link>http://example.com/drupal-8-0-0-alpha1.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.0.1-alpha1.xml b/core/modules/update/tests/modules/update_test/drupal.0.1-alpha1.xml
index 150136c67d..fefea6fcf8 100644
--- a/core/modules/update/tests/modules/update_test/drupal.0.1-alpha1.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.0.1-alpha1.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,10 +15,6 @@
    <name>Drupal 8.0.1-alpha1</name>
    <version>8.0.1-alpha1</version>
    <tag>DRUPAL-8-0-1-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1-alpha1.tar.gz</download_link>
@@ -36,9 +30,6 @@
    <name>Drupal 8.0.0</name>
    <version>8.0.0</version>
    <tag>DRUPAL-8-0-0</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-release</release_link>
    <download_link>http://example.com/drupal-8-0-0.tar.gz</download_link>
@@ -54,10 +45,6 @@
    <name>Drupal 8.0.0-beta1</name>
    <version>8.0.0-beta1</version>
    <tag>DRUPAL-8-0-0-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-beta1.tar.gz</download_link>
@@ -73,10 +60,6 @@
    <name>Drupal 8.0.0-alpha1</name>
    <version>8.0.0-alpha1</version>
    <tag>DRUPAL-8-0-0-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-alpha1.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.0.1-beta1.xml b/core/modules/update/tests/modules/update_test/drupal.0.1-beta1.xml
index 25c9f7023e..933a864bd9 100644
--- a/core/modules/update/tests/modules/update_test/drupal.0.1-beta1.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.0.1-beta1.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,10 +15,6 @@
    <name>Drupal 8.0.1-beta1</name>
    <version>8.0.1-beta1</version>
    <tag>DRUPAL-8-0-1-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1-beta1.tar.gz</download_link>
@@ -36,10 +30,6 @@
    <name>Drupal 8.0.1-alpha1</name>
    <version>8.0.1-alpha1</version>
    <tag>DRUPAL-8-0-1-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1-alpha1.tar.gz</download_link>
@@ -55,9 +45,6 @@
    <name>Drupal 8.0.0</name>
    <version>8.0.0</version>
    <tag>DRUPAL-8-0-0</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-release</release_link>
    <download_link>http://example.com/drupal-8-0-0.tar.gz</download_link>
@@ -73,10 +60,6 @@
    <name>Drupal 8.0.0-beta1</name>
    <version>8.0.0-beta1</version>
    <tag>DRUPAL-8-0-0-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-beta1.tar.gz</download_link>
@@ -92,10 +75,6 @@
    <name>Drupal 8.0.0-alpha1</name>
    <version>8.0.0-alpha1</version>
    <tag>DRUPAL-8-0-0-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-alpha1.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.0.1.xml b/core/modules/update/tests/modules/update_test/drupal.0.1.xml
index ea00c15c90..ef428accf4 100644
--- a/core/modules/update/tests/modules/update_test/drupal.0.1.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.0.1.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,9 +15,6 @@
    <name>Drupal 8.0.1</name>
    <version>8.0.1</version>
    <tag>DRUPAL-8-0-1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1.tar.gz</download_link>
@@ -35,10 +30,6 @@
    <name>Drupal 8.0.1-beta1</name>
    <version>8.0.1-beta1</version>
    <tag>DRUPAL-8-0-1-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1-beta1.tar.gz</download_link>
@@ -54,10 +45,6 @@
    <name>Drupal 8.0.1-alpha1</name>
    <version>8.0.1-alpha1</version>
    <tag>DRUPAL-8-0-1-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1-alpha1.tar.gz</download_link>
@@ -73,9 +60,6 @@
    <name>Drupal 8.0.0</name>
    <version>8.0.0</version>
    <tag>DRUPAL-8-0-0</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-release</release_link>
    <download_link>http://example.com/drupal-8-0-0.tar.gz</download_link>
@@ -91,10 +75,6 @@
    <name>Drupal 8.0.0-beta1</name>
    <version>8.0.0-beta1</version>
    <tag>DRUPAL-8-0-0-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-beta1.tar.gz</download_link>
@@ -110,10 +90,6 @@
    <name>Drupal 8.0.0-alpha1</name>
    <version>8.0.0-alpha1</version>
    <tag>DRUPAL-8-0-0-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-alpha1.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.1.0-alpha1.xml b/core/modules/update/tests/modules/update_test/drupal.1.0-alpha1.xml
index fe734a844b..00d64ca52e 100644
--- a/core/modules/update/tests/modules/update_test/drupal.1.0-alpha1.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.1.0-alpha1.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,10 +15,6 @@
    <name>Drupal 8.1.0-alpha1</name>
    <version>8.1.0-alpha1</version>
    <tag>DRUPAL-8-1-0-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-0-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-1-0-alpha1.tar.gz</download_link>
@@ -36,9 +30,6 @@
    <name>Drupal 8.0.1</name>
    <version>8.0.1</version>
    <tag>DRUPAL-8-0-1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1.tar.gz</download_link>
@@ -54,10 +45,6 @@
    <name>Drupal 8.0.1-beta1</name>
    <version>8.0.1-beta1</version>
    <tag>DRUPAL-8-0-1-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1-beta1.tar.gz</download_link>
@@ -73,10 +60,6 @@
    <name>Drupal 8.0.1-alpha1</name>
    <version>8.0.1-alpha1</version>
    <tag>DRUPAL-8-0-1-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1-alpha1.tar.gz</download_link>
@@ -92,9 +75,6 @@
    <name>Drupal 8.0.0</name>
    <version>8.0.0</version>
    <tag>DRUPAL-8-0-0</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-release</release_link>
    <download_link>http://example.com/drupal-8-0-0.tar.gz</download_link>
@@ -110,10 +90,6 @@
    <name>Drupal 8.0.0-beta1</name>
    <version>8.0.0-beta1</version>
    <tag>DRUPAL-8-0-0-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-beta1.tar.gz</download_link>
@@ -129,10 +105,6 @@
    <name>Drupal 8.0.0-alpha1</name>
    <version>8.0.0-alpha1</version>
    <tag>DRUPAL-8-0-0-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-alpha1.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.1.0-beta1.xml b/core/modules/update/tests/modules/update_test/drupal.1.0-beta1.xml
index fa65c5e92e..13aad8f6aa 100644
--- a/core/modules/update/tests/modules/update_test/drupal.1.0-beta1.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.1.0-beta1.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,10 +15,6 @@
    <name>Drupal 8.1.0-beta1</name>
    <version>8.1.0-beta1</version>
    <tag>DRUPAL-8-1-0-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-0-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-1-0-beta1.tar.gz</download_link>
@@ -36,10 +30,6 @@
    <name>Drupal 8.1.0-alpha1</name>
    <version>8.1.0-alpha1</version>
    <tag>DRUPAL-8-1-0-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-0-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-1-0-alpha1.tar.gz</download_link>
@@ -55,9 +45,6 @@
    <name>Drupal 8.0.1</name>
    <version>8.0.1</version>
    <tag>DRUPAL-8-0-1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1.tar.gz</download_link>
@@ -73,10 +60,6 @@
    <name>Drupal 8.0.1-beta1</name>
    <version>8.0.1-beta1</version>
    <tag>DRUPAL-8-0-1-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1-beta1.tar.gz</download_link>
@@ -92,10 +75,6 @@
    <name>Drupal 8.0.1-alpha1</name>
    <version>8.0.1-alpha1</version>
    <tag>DRUPAL-8-0-1-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1-alpha1.tar.gz</download_link>
@@ -111,9 +90,6 @@
    <name>Drupal 8.0.0</name>
    <version>8.0.0</version>
    <tag>DRUPAL-8-0-0</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-release</release_link>
    <download_link>http://example.com/drupal-8-0-0.tar.gz</download_link>
@@ -129,10 +105,6 @@
    <name>Drupal 8.0.0-beta1</name>
    <version>8.0.0-beta1</version>
    <tag>DRUPAL-8-0-0-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-beta1.tar.gz</download_link>
@@ -148,10 +120,6 @@
    <name>Drupal 8.0.0-alpha1</name>
    <version>8.0.0-alpha1</version>
    <tag>DRUPAL-8-0-0-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-alpha1.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.1.0.xml b/core/modules/update/tests/modules/update_test/drupal.1.0.xml
index 0e6a40c72c..eeadef9474 100644
--- a/core/modules/update/tests/modules/update_test/drupal.1.0.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.1.0.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,9 +15,6 @@
    <name>Drupal 8.1.0</name>
    <version>8.1.0</version>
    <tag>DRUPAL-8-1-0</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-0-release</release_link>
    <download_link>http://example.com/drupal-8-1-0.tar.gz</download_link>
@@ -35,10 +30,6 @@
    <name>Drupal 8.1.0-beta1</name>
    <version>8.1.0-beta1</version>
    <tag>DRUPAL-8-1-0-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-0-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-1-0-beta1.tar.gz</download_link>
@@ -54,10 +45,6 @@
    <name>Drupal 8.1.0-alpha1</name>
    <version>8.1.0-alpha1</version>
    <tag>DRUPAL-8-0-1-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-0-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-1-0-alpha1.tar.gz</download_link>
@@ -73,9 +60,6 @@
    <name>Drupal 8.0.1</name>
    <version>8.0.1</version>
    <tag>DRUPAL-8-0-1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1.tar.gz</download_link>
@@ -91,10 +75,6 @@
    <name>Drupal 8.0.1-beta1</name>
    <version>8.0.1-beta1</version>
    <tag>DRUPAL-8-0-1-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1-beta1.tar.gz</download_link>
@@ -110,10 +90,6 @@
    <name>Drupal 8.0.1-alpha1</name>
    <version>8.0.1-alpha1</version>
    <tag>DRUPAL-8-0-1-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1-alpha1.tar.gz</download_link>
@@ -129,9 +105,6 @@
    <name>Drupal 8.0.0</name>
    <version>8.0.0</version>
    <tag>DRUPAL-8-0-0</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-release</release_link>
    <download_link>http://example.com/drupal-8-0-0.tar.gz</download_link>
@@ -147,10 +120,6 @@
    <name>Drupal 8.0.0-beta1</name>
    <version>8.0.0-beta1</version>
    <tag>DRUPAL-8-0-0-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-beta1.tar.gz</download_link>
@@ -166,10 +135,6 @@
    <name>Drupal 8.0.0-alpha1</name>
    <version>8.0.0-alpha1</version>
    <tag>DRUPAL-8-0-0-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-alpha1.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.1.1-alpha1.xml b/core/modules/update/tests/modules/update_test/drupal.1.1-alpha1.xml
index 0356c8d978..68e4ac1fb9 100644
--- a/core/modules/update/tests/modules/update_test/drupal.1.1-alpha1.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.1.1-alpha1.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,10 +15,6 @@
    <name>Drupal 8.1.1-alpha1</name>
    <version>8.1.1-alpha1</version>
    <tag>DRUPAL-8-1-1-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-1-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-1-1-alpha1.tar.gz</download_link>
@@ -36,9 +30,6 @@
    <name>Drupal 8.1.0</name>
    <version>8.1.0</version>
    <tag>DRUPAL-8-1-0</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-0-release</release_link>
    <download_link>http://example.com/drupal-8-1-0.tar.gz</download_link>
@@ -54,10 +45,6 @@
    <name>Drupal 8.1.0-beta1</name>
    <version>8.1.0-beta1</version>
    <tag>DRUPAL-8-0-1-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-0-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-1-0-beta1.tar.gz</download_link>
@@ -73,10 +60,6 @@
    <name>Drupal 8.1.0-alpha1</name>
    <version>8.1.0-alpha1</version>
    <tag>DRUPAL-8-1-0-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-0-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-1-0-alpha1.tar.gz</download_link>
@@ -92,9 +75,6 @@
    <name>Drupal 8.0.1</name>
    <version>8.0.1</version>
    <tag>DRUPAL-8-0-1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1.tar.gz</download_link>
@@ -110,10 +90,6 @@
    <name>Drupal 8.0.1-beta1</name>
    <version>8.0.1-beta1</version>
    <tag>DRUPAL-8-0-1-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1-beta1.tar.gz</download_link>
@@ -129,10 +105,6 @@
    <name>Drupal 8.0.1-alpha1</name>
    <version>8.0.1-alpha1</version>
    <tag>DRUPAL-8-0-1-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1-alpha1.tar.gz</download_link>
@@ -148,9 +120,6 @@
    <name>Drupal 8.0.0</name>
    <version>8.0.0</version>
    <tag>DRUPAL-8-0-0</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-release</release_link>
    <download_link>http://example.com/drupal-8-0-0.tar.gz</download_link>
@@ -166,10 +135,6 @@
    <name>Drupal 8.0.0-beta1</name>
    <version>8.0.0-beta1</version>
    <tag>DRUPAL-8-0-0-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-beta1.tar.gz</download_link>
@@ -185,10 +150,6 @@
    <name>Drupal 8.0.0-alpha1</name>
    <version>8.0.0-alpha1</version>
    <tag>DRUPAL-8-0-0-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-alpha1.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.1.1-beta1.xml b/core/modules/update/tests/modules/update_test/drupal.1.1-beta1.xml
index abeef7ea41..5624974945 100644
--- a/core/modules/update/tests/modules/update_test/drupal.1.1-beta1.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.1.1-beta1.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,10 +15,6 @@
    <name>Drupal 8.1.1-beta1</name>
    <version>8.1.1-beta1</version>
    <tag>DRUPAL-8-1-1-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-1-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-1-1-beta1.tar.gz</download_link>
@@ -36,10 +30,6 @@
    <name>Drupal 8.1.1-alpha1</name>
    <version>8.1.1-alpha1</version>
    <tag>DRUPAL-8-1-1-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-1-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-1-1-alpha1.tar.gz</download_link>
@@ -55,9 +45,6 @@
    <name>Drupal 8.1.0</name>
    <version>8.1.0</version>
    <tag>DRUPAL-8-1-0</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-0-release</release_link>
    <download_link>http://example.com/drupal-8-1-0.tar.gz</download_link>
@@ -73,10 +60,6 @@
    <name>Drupal 8.1.0-beta1</name>
    <version>8.1.0-beta1</version>
    <tag>DRUPAL-8-0-1-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-0-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-1-0-beta1.tar.gz</download_link>
@@ -92,10 +75,6 @@
    <name>Drupal 8.1.0-alpha1</name>
    <version>8.1.0-alpha1</version>
    <tag>DRUPAL-8-1-0-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-0-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-1-0-alpha1.tar.gz</download_link>
@@ -111,9 +90,6 @@
    <name>Drupal 8.0.1</name>
    <version>8.0.1</version>
    <tag>DRUPAL-8-0-1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1.tar.gz</download_link>
@@ -129,10 +105,6 @@
    <name>Drupal 8.0.1-beta1</name>
    <version>8.0.1-beta1</version>
    <tag>DRUPAL-8-0-1-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1-beta1.tar.gz</download_link>
@@ -148,10 +120,6 @@
    <name>Drupal 8.0.1-alpha1</name>
    <version>8.0.1-alpha1</version>
    <tag>DRUPAL-8-0-1-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1-alpha1.tar.gz</download_link>
@@ -167,9 +135,6 @@
    <name>Drupal 8.0.0</name>
    <version>8.0.0</version>
    <tag>DRUPAL-8-0-0</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-release</release_link>
    <download_link>http://example.com/drupal-8-0-0.tar.gz</download_link>
@@ -185,10 +150,6 @@
    <name>Drupal 8.0.0-beta1</name>
    <version>8.0.0-beta1</version>
    <tag>DRUPAL-8-0-0-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-beta1.tar.gz</download_link>
@@ -204,10 +165,6 @@
    <name>Drupal 8.0.0-alpha1</name>
    <version>8.0.0-alpha1</version>
    <tag>DRUPAL-8-0-0-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-alpha1.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.1.1.xml b/core/modules/update/tests/modules/update_test/drupal.1.1.xml
index a588bdc466..32c4454571 100644
--- a/core/modules/update/tests/modules/update_test/drupal.1.1.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.1.1.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,9 +15,6 @@
    <name>Drupal 8.1.1</name>
    <version>8.1.1</version>
    <tag>DRUPAL-8-1-1</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>1</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-1-release</release_link>
    <download_link>http://example.com/drupal-8-1-1.tar.gz</download_link>
@@ -35,10 +30,6 @@
    <name>Drupal 8.1.1-beta1</name>
    <version>8.1.1-beta1</version>
    <tag>DRUPAL-8-1-1-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-1-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-1-1-beta1.tar.gz</download_link>
@@ -54,10 +45,6 @@
    <name>Drupal 8.1.1-alpha1</name>
    <version>8.1.1-alpha1</version>
    <tag>DRUPAL-8-1-1-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-1-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-1-1-alpha1.tar.gz</download_link>
@@ -73,9 +60,6 @@
    <name>Drupal 8.1.0</name>
    <version>8.1.0</version>
    <tag>DRUPAL-8-1-0</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-0-release</release_link>
    <download_link>http://example.com/drupal-8-1-0.tar.gz</download_link>
@@ -91,10 +75,6 @@
    <name>Drupal 8.1.0-beta1</name>
    <version>8.1.0-beta1</version>
    <tag>DRUPAL-8-0-1-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-0-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-1-0-beta1.tar.gz</download_link>
@@ -110,10 +90,6 @@
    <name>Drupal 8.1.0-alpha1</name>
    <version>8.1.0-alpha1</version>
    <tag>DRUPAL-8-1-0-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>1</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-1-0-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-1-0-alpha1.tar.gz</download_link>
@@ -129,9 +105,6 @@
    <name>Drupal 8.0.1</name>
    <version>8.0.1</version>
    <tag>DRUPAL-8-0-1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1.tar.gz</download_link>
@@ -147,10 +120,6 @@
    <name>Drupal 8.0.1-beta1</name>
    <version>8.0.1-beta1</version>
    <tag>DRUPAL-8-0-1-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1-beta1.tar.gz</download_link>
@@ -166,10 +135,6 @@
    <name>Drupal 8.0.1-alpha1</name>
    <version>8.0.1-alpha1</version>
    <tag>DRUPAL-8-0-1-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>1</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-1-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-1-alpha1.tar.gz</download_link>
@@ -185,9 +150,6 @@
    <name>Drupal 8.0.0</name>
    <version>8.0.0</version>
    <tag>DRUPAL-8-0-0</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-release</release_link>
    <download_link>http://example.com/drupal-8-0-0.tar.gz</download_link>
@@ -203,10 +165,6 @@
    <name>Drupal 8.0.0-beta1</name>
    <version>8.0.0-beta1</version>
    <tag>DRUPAL-8-0-0-beta1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>beta1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-beta1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-beta1.tar.gz</download_link>
@@ -222,10 +180,6 @@
    <name>Drupal 8.0.0-alpha1</name>
    <version>8.0.0-alpha1</version>
    <tag>DRUPAL-8-0-0-alpha1</tag>
-   <version_major>8</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
-   <version_extra>alpha1</version_extra>
    <status>published</status>
    <release_link>http://example.com/drupal-8-0-0-alpha1-release</release_link>
    <download_link>http://example.com/drupal-8-0-0-alpha1.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.9.xml b/core/modules/update/tests/modules/update_test/drupal.9.xml
index c17b426a75..41549ca5ef 100644
--- a/core/modules/update/tests/modules/update_test/drupal.9.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.9.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>9.x</api_version>
-<recommended_major>9</recommended_major>
-<supported_majors>9</supported_majors>
-<default_major>9</default_major>
+<supported_branches>9.0.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,9 +15,6 @@
    <name>Drupal 9.0.0</name>
    <version>9.0.0</version>
    <tag>DRUPAL-9-0-0</tag>
-   <version_major>9</version_major>
-   <version_minor>0</version_minor>
-   <version_patch>0</version_patch>
    <status>published</status>
    <release_link>http://example.com/drupal-9-0-0-release</release_link>
    <download_link>http://example.com/drupal-9-0-0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.dev.xml b/core/modules/update/tests/modules/update_test/drupal.dev.xml
index 4ab26bd2db..1ddb840f5c 100644
--- a/core/modules/update/tests/modules/update_test/drupal.dev.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.dev.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,9 +15,6 @@
   <name>Drupal 8.0.0</name>
   <version>8.0.0</version>
   <tag>DRUPAL-8-0-0</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-0-release</release_link>
   <download_link>http://example.com/drupal-8-0-0.tar.gz</download_link>
@@ -35,9 +30,6 @@
   <name>Drupal 8.0.x-dev</name>
   <version>8.0.x-dev</version>
   <tag>DRUPAL-8-0</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_extra>dev</version_extra>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-x-dev-release</release_link>
   <download_link>http://example.com/drupal-8.0.x-dev.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.sec.0.1_0.2.xml b/core/modules/update/tests/modules/update_test/drupal.sec.0.1_0.2.xml
index ba954ae427..1aa9babbd1 100644
--- a/core/modules/update/tests/modules/update_test/drupal.sec.0.1_0.2.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.sec.0.1_0.2.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,9 +15,6 @@
   <name>Drupal 8.0.2</name>
   <version>8.0.2</version>
   <tag>DRUPAL-8-0-2</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>2</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-2-release</release_link>
   <download_link>http://example.com/drupal-8-0-2.tar.gz</download_link>
@@ -36,9 +31,6 @@
   <name>Drupal 8.0.1</name>
   <version>8.0.1</version>
   <tag>DRUPAL-8-0-1</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>1</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-1-release</release_link>
   <download_link>http://example.com/drupal-8-0-1.tar.gz</download_link>
@@ -56,9 +48,6 @@
   <name>Drupal 8.0.0</name>
   <version>8.0.0</version>
   <tag>DRUPAL-8-0-0</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-0-release</release_link>
   <download_link>http://example.com/drupal-8-0-0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2-b.xml b/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2-b.xml
index a971ca73eb..c986142d29 100644
--- a/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2-b.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2-b.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.,8.2.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,10 +15,6 @@
   <name>drupal 8.2.0-rc2</name>
   <version>8.2.0-rc2</version>
   <tag>8.2.0-rc2</tag>
-  <version_major>8</version_major>
-  <version_minor>2</version_minor>
-  <version_patch>0</version_patch>
-  <version_extra>rc2</version_extra>
   <status>published</status>
   <release_link>http://example.com/drupal-8-2-0-rc2-release</release_link>
   <download_link>http://example.com/drupal-8-2-0-rc2.tar.gz</download_link>
@@ -39,10 +33,6 @@
   <name>drupal 8.2.0-rc1</name>
   <version>8.2.0-rc1</version>
   <tag>8.2.0-rc1</tag>
-  <version_major>8</version_major>
-  <version_minor>2</version_minor>
-  <version_patch>0</version_patch>
-  <version_extra>rc1</version_extra>
   <status>published</status>
   <release_link>http://example.com/drupal-8-2-0-rc1-release</release_link>
   <download_link>http://example.com/drupal-8-2-0-rc1.tar.gz</download_link>
@@ -61,10 +51,6 @@
   <name>drupal 8.2.0-beta2</name>
   <version>8.2.0-beta2</version>
   <tag>8.2.0-beta2</tag>
-  <version_major>8</version_major>
-  <version_minor>2</version_minor>
-  <version_patch>0</version_patch>
-  <version_extra>beta2</version_extra>
   <status>published</status>
   <release_link>http://example.com/drupal-8-2-0-beta2-release</release_link>
   <download_link>http://example.com/drupal-8-2-0-beta2.tar.gz</download_link>
@@ -83,10 +69,6 @@
   <name>drupal 8.2.0-beta1</name>
   <version>8.2.0-beta1</version>
   <tag>8.2.0-beta1</tag>
-  <version_major>8</version_major>
-  <version_minor>2</version_minor>
-  <version_patch>0</version_patch>
-  <version_extra>beta1</version_extra>
   <status>published</status>
   <release_link>http://example.com/drupal-8-2-0-beta1-release</release_link>
   <download_link>http://example.com/drupal-8-2-0-beta1.tar.gz</download_link>
@@ -105,10 +87,6 @@
   <name>drupal 8.2.0-alpha2</name>
   <version>8.2.0-alpha2</version>
   <tag>8.2.0-alpha2</tag>
-  <version_major>8</version_major>
-  <version_minor>2</version_minor>
-  <version_patch>0</version_patch>
-  <version_extra>alpha2</version_extra>
   <status>published</status>
   <release_link>http://example.com/drupal-8-2-0-alpha2-release</release_link>
   <download_link>http://example.com/drupal-8-2-0-alpha2.tar.gz</download_link>
@@ -127,10 +105,6 @@
   <name>drupal 8.2.0-alpha1</name>
   <version>8.2.0-alpha1</version>
   <tag>8.2.0-alpha1</tag>
-  <version_major>8</version_major>
-  <version_minor>2</version_minor>
-  <version_patch>0</version_patch>
-  <version_extra>alpha1</version_extra>
   <status>published</status>
   <release_link>http://example.com/drupal-8.2.0-alpha1</release_link>
   <download_link>http://example.com/drupal-8-2-0-alpha1.tar.gz</download_link>
@@ -149,9 +123,6 @@
   <name>Drupal 8.1.2</name>
   <version>8.1.2</version>
   <tag>DRUPAL-8-1-2</tag>
-  <version_major>8</version_major>
-  <version_minor>1</version_minor>
-  <version_patch>2</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-1-2-release</release_link>
   <download_link>http://example.com/drupal-8-1-2.tar.gz</download_link>
@@ -168,9 +139,6 @@
   <name>Drupal 8.1.1</name>
   <version>8.1.1</version>
   <tag>DRUPAL-8-1-1</tag>
-  <version_major>8</version_major>
-  <version_minor>1</version_minor>
-  <version_patch>1</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-1-1-release</release_link>
   <download_link>http://example.com/drupal-8-1-1.tar.gz</download_link>
@@ -187,9 +155,6 @@
   <name>Drupal 8.1.0</name>
   <version>8.1.0</version>
   <tag>DRUPAL-8-1-0</tag>
-  <version_major>8</version_major>
-  <version_minor>1</version_minor>
-  <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-1-0-release</release_link>
   <download_link>http://example.com/drupal-8-1-0.tar.gz</download_link>
@@ -206,9 +171,6 @@
   <name>Drupal 8.0.2</name>
   <version>8.0.2</version>
   <tag>DRUPAL-8-0-2</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>2</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-2-release</release_link>
   <download_link>http://example.com/drupal-8-0-2.tar.gz</download_link>
@@ -225,9 +187,6 @@
   <name>Drupal 8.0.1</name>
   <version>8.0.1</version>
   <tag>DRUPAL-8-0-1</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>1</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-1-release</release_link>
   <download_link>http://example.com/drupal-8-0-1.tar.gz</download_link>
@@ -244,9 +203,6 @@
   <name>Drupal 8.0.0</name>
   <version>8.0.0</version>
   <tag>DRUPAL-8-0-0</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-0-release</release_link>
   <download_link>http://example.com/drupal-8-0-0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2.xml b/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2.xml
index bc422deb6f..f597920a56 100644
--- a/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.,8.2.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,10 +15,6 @@
   <name>drupal 8.2.0-rc2</name>
   <version>8.2.0-rc2</version>
   <tag>8.2.0-rc2</tag>
-  <version_major>8</version_major>
-  <version_minor>2</version_minor>
-  <version_patch>0</version_patch>
-  <version_extra>rc2</version_extra>
   <status>published</status>
   <release_link>http://example.com/drupal-8-2-0-rc2-release</release_link>
   <download_link>http://example.com/drupal-8-2-0-rc2.tar.gz</download_link>
@@ -40,10 +34,6 @@
   <name>drupal 8.2.0-rc1</name>
   <version>8.2.0-rc1</version>
   <tag>8.2.0-rc1</tag>
-  <version_major>8</version_major>
-  <version_minor>2</version_minor>
-  <version_patch>0</version_patch>
-  <version_extra>rc1</version_extra>
   <status>published</status>
   <release_link>http://example.com/drupal-8-2-0-rc1-release</release_link>
   <download_link>http://example.com/drupal-8-2-0-rc1.tar.gz</download_link>
@@ -63,10 +53,6 @@
   <name>drupal 8.2.0-beta2</name>
   <version>8.2.0-beta2</version>
   <tag>8.2.0-beta2</tag>
-  <version_major>8</version_major>
-  <version_minor>2</version_minor>
-  <version_patch>0</version_patch>
-  <version_extra>beta2</version_extra>
   <status>published</status>
   <release_link>http://example.com/drupal-8-2-0-beta2-release</release_link>
   <download_link>http://example.com/drupal-8-2-0-beta2.tar.gz</download_link>
@@ -86,10 +72,6 @@
   <name>drupal 8.2.0-beta1</name>
   <version>8.2.0-beta1</version>
   <tag>8.2.0-beta1</tag>
-  <version_major>8</version_major>
-  <version_minor>2</version_minor>
-  <version_patch>0</version_patch>
-  <version_extra>beta1</version_extra>
   <status>published</status>
   <release_link>http://example.com/drupal-8-2-0-beta1-release</release_link>
   <download_link>http://example.com/drupal-8-2-0-beta1.tar.gz</download_link>
@@ -109,10 +91,6 @@
   <name>drupal 8.2.0-alpha2</name>
   <version>8.2.0-alpha2</version>
   <tag>8.2.0-alpha2</tag>
-  <version_major>8</version_major>
-  <version_minor>2</version_minor>
-  <version_patch>0</version_patch>
-  <version_extra>alpha2</version_extra>
   <status>published</status>
   <release_link>http://example.com/drupal-8-2-0-alpha2-release</release_link>
   <download_link>http://example.com/drupal-8-2-0-alpha2.tar.gz</download_link>
@@ -132,10 +110,6 @@
   <name>drupal 8.2.0-alpha1</name>
   <version>8.2.0-alpha1</version>
   <tag>8.2.0-alpha1</tag>
-  <version_major>8</version_major>
-  <version_minor>2</version_minor>
-  <version_patch>0</version_patch>
-  <version_extra>alpha1</version_extra>
   <status>published</status>
   <release_link>http://example.com/drupal-8.2.0-alpha1</release_link>
   <download_link>http://example.com/drupal-8-2-0-alpha1.tar.gz</download_link>
@@ -155,9 +129,6 @@
   <name>Drupal 8.1.2</name>
   <version>8.1.2</version>
   <tag>DRUPAL-8-1-2</tag>
-  <version_major>8</version_major>
-  <version_minor>1</version_minor>
-  <version_patch>2</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-1-2-release</release_link>
   <download_link>http://example.com/drupal-8-1-2.tar.gz</download_link>
@@ -174,9 +145,6 @@
   <name>Drupal 8.1.1</name>
   <version>8.1.1</version>
   <tag>DRUPAL-8-1-1</tag>
-  <version_major>8</version_major>
-  <version_minor>1</version_minor>
-  <version_patch>1</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-1-1-release</release_link>
   <download_link>http://example.com/drupal-8-1-1.tar.gz</download_link>
@@ -193,9 +161,6 @@
   <name>Drupal 8.1.0</name>
   <version>8.1.0</version>
   <tag>DRUPAL-8-1-0</tag>
-  <version_major>8</version_major>
-  <version_minor>1</version_minor>
-  <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-1-0-release</release_link>
   <download_link>http://example.com/drupal-8-1-0.tar.gz</download_link>
@@ -212,9 +177,6 @@
   <name>Drupal 8.0.2</name>
   <version>8.0.2</version>
   <tag>DRUPAL-8-0-2</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>2</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-2-release</release_link>
   <download_link>http://example.com/drupal-8-0-2.tar.gz</download_link>
@@ -231,9 +193,6 @@
   <name>Drupal 8.0.1</name>
   <version>8.0.1</version>
   <tag>DRUPAL-8-0-1</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>1</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-1-release</release_link>
   <download_link>http://example.com/drupal-8-0-1.tar.gz</download_link>
@@ -250,9 +209,6 @@
   <name>Drupal 8.0.0</name>
   <version>8.0.0</version>
   <tag>DRUPAL-8-0-0</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-0-release</release_link>
   <download_link>http://example.com/drupal-8-0-0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.sec.0.2.xml b/core/modules/update/tests/modules/update_test/drupal.sec.0.2.xml
index 0b9bbce632..c4919bc69b 100644
--- a/core/modules/update/tests/modules/update_test/drupal.sec.0.2.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.sec.0.2.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,9 +15,6 @@
   <name>Drupal 8.0.2</name>
   <version>8.0.2</version>
   <tag>DRUPAL-8-0-2</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>2</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-2-release</release_link>
   <download_link>http://example.com/drupal-8-0-2.tar.gz</download_link>
@@ -36,9 +31,6 @@
   <name>Drupal 8.0.1</name>
   <version>8.0.1</version>
   <tag>DRUPAL-8-0-1</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>1</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-1-release</release_link>
   <download_link>http://example.com/drupal-8-0-1.tar.gz</download_link>
@@ -55,9 +47,6 @@
   <name>Drupal 8.0.0</name>
   <version>8.0.0</version>
   <tag>DRUPAL-8-0-0</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-0-release</release_link>
   <download_link>http://example.com/drupal-8-0-0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.sec.1.2.xml b/core/modules/update/tests/modules/update_test/drupal.sec.1.2.xml
index 8665e46b36..329018531f 100644
--- a/core/modules/update/tests/modules/update_test/drupal.sec.1.2.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.sec.1.2.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,9 +15,6 @@
   <name>Drupal 8.1.2</name>
   <version>8.1.2</version>
   <tag>DRUPAL-8-1-2</tag>
-  <version_major>8</version_major>
-  <version_minor>1</version_minor>
-  <version_patch>2</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-1-2-release</release_link>
   <download_link>http://example.com/drupal-8-1-2.tar.gz</download_link>
@@ -36,9 +31,6 @@
   <name>Drupal 8.1.1</name>
   <version>8.1.1</version>
   <tag>DRUPAL-8-1-1</tag>
-  <version_major>8</version_major>
-  <version_minor>1</version_minor>
-  <version_patch>1</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-1-1-release</release_link>
   <download_link>http://example.com/drupal-8-1-1.tar.gz</download_link>
@@ -55,9 +47,6 @@
   <name>Drupal 8.1.0</name>
   <version>8.1.0</version>
   <tag>DRUPAL-8-1-0</tag>
-  <version_major>8</version_major>
-  <version_minor>1</version_minor>
-  <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-1-0-release</release_link>
   <download_link>http://example.com/drupal-8-1-0.tar.gz</download_link>
@@ -74,9 +63,6 @@
   <name>Drupal 8.0.2</name>
   <version>8.0.2</version>
   <tag>DRUPAL-8-0-2</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>2</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-2-release</release_link>
   <download_link>http://example.com/drupal-8-0-2.tar.gz</download_link>
@@ -92,9 +78,6 @@
   <name>Drupal 8.0.1</name>
   <version>8.0.1</version>
   <tag>DRUPAL-8-0-1</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>1</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-1-release</release_link>
   <download_link>http://example.com/drupal-8-0-1.tar.gz</download_link>
@@ -110,9 +93,6 @@
   <name>Drupal 8.0.0</name>
   <version>8.0.0</version>
   <tag>DRUPAL-8-0-0</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-0-release</release_link>
   <download_link>http://example.com/drupal-8-0-0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/drupal.sec.1.2_insecure.xml b/core/modules/update/tests/modules/update_test/drupal.sec.1.2_insecure.xml
index dadad421bc..04cee7d01d 100644
--- a/core/modules/update/tests/modules/update_test/drupal.sec.1.2_insecure.xml
+++ b/core/modules/update/tests/modules/update_test/drupal.sec.1.2_insecure.xml
@@ -4,9 +4,7 @@
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
+<supported_branches>8.0.,8.1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/drupal</link>
   <terms>
@@ -17,9 +15,6 @@
   <name>Drupal 8.1.2</name>
   <version>8.1.2</version>
   <tag>DRUPAL-8-1-2</tag>
-  <version_major>8</version_major>
-  <version_minor>1</version_minor>
-  <version_patch>2</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-1-2-release</release_link>
   <download_link>http://example.com/drupal-8-1-2.tar.gz</download_link>
@@ -36,9 +31,6 @@
   <name>Drupal 8.1.1</name>
   <version>8.1.1</version>
   <tag>DRUPAL-8-1-1</tag>
-  <version_major>8</version_major>
-  <version_minor>1</version_minor>
-  <version_patch>1</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-1-1-release</release_link>
   <download_link>http://example.com/drupal-8-1-1.tar.gz</download_link>
@@ -55,9 +47,6 @@
   <name>Drupal 8.1.0</name>
   <version>8.1.0</version>
   <tag>DRUPAL-8-1-0</tag>
-  <version_major>8</version_major>
-  <version_minor>1</version_minor>
-  <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-1-0-release</release_link>
   <download_link>http://example.com/drupal-8-1-0.tar.gz</download_link>
@@ -74,9 +63,6 @@
   <name>Drupal 8.0.2</name>
   <version>8.0.2</version>
   <tag>DRUPAL-8-0-2</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>2</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-2-release</release_link>
   <download_link>http://example.com/drupal-8-0-2.tar.gz</download_link>
@@ -93,9 +79,6 @@
   <name>Drupal 8.0.1</name>
   <version>8.0.1</version>
   <tag>DRUPAL-8-0-1</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>1</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-1-release</release_link>
   <download_link>http://example.com/drupal-8-0-1.tar.gz</download_link>
@@ -112,9 +95,6 @@
   <name>Drupal 8.0.0</name>
   <version>8.0.0</version>
   <tag>DRUPAL-8-0-0</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/drupal-8-0-0-release</release_link>
   <download_link>http://example.com/drupal-8-0-0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/update_test_basetheme.1_1-sec.xml b/core/modules/update/tests/modules/update_test/update_test_basetheme.1_1-sec.xml
index 3529e19763..370f68842f 100644
--- a/core/modules/update/tests/modules/update_test/update_test_basetheme.1_1-sec.xml
+++ b/core/modules/update/tests/modules/update_test/update_test_basetheme.1_1-sec.xml
@@ -4,9 +4,7 @@
 <short_name>update_test_basetheme</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>1</recommended_major>
-<supported_majors>1</supported_majors>
-<default_major>1</default_major>
+<supported_branches>8.x-1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/update_test_basetheme</link>
   <terms>
@@ -17,8 +15,6 @@
   <name>update_test_basetheme 8.x-1.1</name>
   <version>8.x-1.1</version>
   <tag>DRUPAL-7--1-1</tag>
-  <version_major>1</version_major>
-  <version_patch>1</version_patch>
   <status>published</status>
   <release_link>http://example.com/update_test_basetheme-7-x-1-1-release</release_link>
   <download_link>http://example.com/update_test_basetheme-8.x-1.1.tar.gz</download_link>
@@ -35,8 +31,6 @@
   <name>update_test_basetheme 8.x-1.0</name>
   <version>8.x-1.0</version>
   <tag>DRUPAL-7--1-0</tag>
-  <version_major>1</version_major>
-  <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/update_test_basetheme-7-x-1-0-release</release_link>
   <download_link>http://example.com/update_test_basetheme-8.x-1.0.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/update_test_new_module.1_1.xml b/core/modules/update/tests/modules/update_test/update_test_new_module.1_1.xml
index f9039b2e3f..6d98f52ea0 100644
--- a/core/modules/update/tests/modules/update_test/update_test_new_module.1_1.xml
+++ b/core/modules/update/tests/modules/update_test/update_test_new_module.1_1.xml
@@ -4,9 +4,7 @@
 <short_name>update_test_new_module</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>1</recommended_major>
-<supported_majors>1</supported_majors>
-<default_major>1</default_major>
+<supported_branches>8.x-1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/update_test_new_module</link>
   <terms>
@@ -17,8 +15,6 @@
   <name>update_test_new_module 8.x-1.1</name>
   <version>8.x-1.1</version>
   <tag>DRUPAL-8--1-1</tag>
-  <version_major>1</version_major>
-  <version_patch>1</version_patch>
   <status>published</status>
   <release_link>http://example.com/update_test_new_module-8-x-1-1-release</release_link>
   <download_link>core/modules/update/tests/update_test_new_module/8.x-1.1/update_test_new_module.tar.gz</download_link>
diff --git a/core/modules/update/tests/modules/update_test/update_test_subtheme.1_0.xml b/core/modules/update/tests/modules/update_test/update_test_subtheme.1_0.xml
index c791b7f1fb..8909ac6bab 100644
--- a/core/modules/update/tests/modules/update_test/update_test_subtheme.1_0.xml
+++ b/core/modules/update/tests/modules/update_test/update_test_subtheme.1_0.xml
@@ -4,9 +4,7 @@
 <short_name>update_test_subtheme</short_name>
 <dc:creator>Drupal</dc:creator>
 <api_version>8.x</api_version>
-<recommended_major>1</recommended_major>
-<supported_majors>1</supported_majors>
-<default_major>1</default_major>
+<supported_branches>8.x-1.</supported_branches>
 <project_status>published</project_status>
 <link>http://example.com/project/update_test_subtheme</link>
   <terms>
@@ -17,8 +15,6 @@
   <name>update_test_subtheme 8.x-1.0</name>
   <version>8.x-1.0</version>
   <tag>DRUPAL-7--1-0</tag>
-  <version_major>1</version_major>
-  <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/update_test_subtheme-7-x-1-0-release</release_link>
   <download_link>http://example.com/update_test_subtheme-8.x-1.0.tar.gz</download_link>
diff --git a/core/modules/update/tests/src/Unit/ModuleVersionTest.php b/core/modules/update/tests/src/Unit/ModuleVersionTest.php
new file mode 100644
index 0000000000..75d427ffb5
--- /dev/null
+++ b/core/modules/update/tests/src/Unit/ModuleVersionTest.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace Drupal\Tests\update\Unit;
+
+use Drupal\Tests\UnitTestCase;
+use Drupal\update\ModuleVersion;
+
+/**
+ * @coversDefaultClass \Drupal\update\ModuleVersion
+ *
+ * @group update
+ */
+class ModuleVersionTest extends UnitTestCase {
+
+  /**
+   * @covers ::getMajorVersion
+   *
+   * @dataProvider providerVersionInfos
+   */
+  public function testGetMajorVersion($version, $excepted_version_info) {
+    $version = new ModuleVersion($version);
+    $this->assertSame($excepted_version_info['major'], $version->getMajorVersion());
+  }
+
+  /**
+   * @covers ::getMinorVersion
+   *
+   * @dataProvider providerVersionInfos
+   */
+  public function testGetMinorVersion($version, $excepted_version_info) {
+    $version = new ModuleVersion($version);
+    $this->assertSame($excepted_version_info['minor'], $version->getMinorVersion());
+  }
+
+  /**
+   * @covers ::getPatchVersion
+   *
+   * @dataProvider providerVersionInfos
+   */
+  public function testGetPatchVersion($version, $excepted_version_info) {
+    $version = new ModuleVersion($version);
+    $this->assertSame($excepted_version_info['patch'], $version->getPatchVersion());
+  }
+
+  /**
+   * @covers ::getVersionExtra
+   *
+   * @dataProvider providerVersionInfos
+   */
+  public function testGetVersionExtra($version, $excepted_version_info) {
+    $version = new ModuleVersion($version);
+    $this->assertSame($excepted_version_info['extra'], $version->getVersionExtra());
+  }
+
+  /**
+   * @covers ::getSupportBranch
+   *
+   * @dataProvider providerVersionInfos
+   */
+  public function testGetSupportBranch($version, $excepted_version_info) {
+    $version = new ModuleVersion($version);
+    $this->assertSame($excepted_version_info['branch'], $version->getSupportBranch());
+  }
+
+  /**
+   * @covers ::createFromSupportBranch
+   *
+   * @dataProvider providerVersionInfos
+   */
+  public function testCreateFromSupportBranch($version, $excepted_version_info) {
+    $version = ModuleVersion::createFromSupportBranch($excepted_version_info['branch']);
+    $this->assertInstanceOf(ModuleVersion::class, $version);
+    $this->assertSame($excepted_version_info['major'], $version->getMajorVersion());
+    $this->assertSame($excepted_version_info['minor'], $version->getMinorVersion());
+    // Version extra and Patch version can't be determined from a branch.
+    $this->assertSame(NULL, $version->getVersionExtra());
+    $this->assertSame(NULL, $version->getPatchVersion());
+  }
+
+  /**
+   * Data provider for expected version information.
+   *
+   * @return array
+   *   Arrays of version information.
+   */
+  public function providerVersionInfos() {
+    return [
+      '8.x-1.3' => [
+        '8.x-1.3',
+        [
+          'major' => '1',
+          'minor' => NULL,
+          'patch' => '3',
+          'extra' => NULL,
+          'branch' => '8.x-1.',
+        ],
+      ],
+      '8.x-1.3-dev' => [
+        '8.x-1.3-dev',
+        [
+          'major' => '1',
+          'minor' => NULL,
+          'patch' => '3',
+          'extra' => 'dev',
+          'branch' => '8.x-1.',
+        ],
+      ],
+      '1.3' => [
+        '1.3',
+        [
+          'major' => '1',
+          'minor' => NULL,
+          'patch' => '3',
+          'extra' => NULL,
+          'branch' => '1.',
+        ],
+      ],
+      '1.3-dev' => [
+        '1.3-dev',
+        [
+          'major' => '1',
+          'minor' => NULL,
+          'patch' => '3',
+          'extra' => 'dev',
+          'branch' => '1.',
+        ],
+      ],
+      '1.2.3' => [
+        '1.2.3',
+        [
+          'major' => '1',
+          'minor' => '2',
+          'patch' => '3',
+          'extra' => NULL,
+          'branch' => '1.2.',
+        ],
+      ],
+      '1.2.3-dev' => [
+        '1.2.3-dev',
+        [
+          'major' => '1',
+          'minor' => '2',
+          'patch' => '3',
+          'extra' => 'dev',
+          'branch' => '1.2.',
+        ],
+      ],
+    ];
+  }
+
+}
diff --git a/core/modules/update/tests/src/Unit/UpdateFetcherTest.php b/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
index 1d01d0f5fe..9ac53a3491 100644
--- a/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
+++ b/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
@@ -5,10 +5,6 @@
 use Drupal\Tests\UnitTestCase;
 use Drupal\update\UpdateFetcher;
 
-if (!defined('DRUPAL_CORE_COMPATIBILITY')) {
-  define('DRUPAL_CORE_COMPATIBILITY', '8.x');
-}
-
 /**
  * Tests update functionality unrelated to the database.
  *
@@ -71,20 +67,20 @@ public function providerTestUpdateBuildFetchUrl() {
     $project['info']['project status url'] = 'http://www.example.com';
     $project['includes'] = ['module1' => 'Module 1', 'module2' => 'Module 2'];
     $site_key = '';
-    $expected = 'http://www.example.com/' . $project['name'] . '/' . DRUPAL_CORE_COMPATIBILITY;
+    $expected = "http://www.example.com/{$project['name']}/current";
 
     $data[] = [$project, $site_key, $expected];
 
     // For disabled projects it shouldn't add the site key either.
     $site_key = 'site_key';
     $project['project_type'] = 'disabled';
-    $expected = 'http://www.example.com/' . $project['name'] . '/' . DRUPAL_CORE_COMPATIBILITY;
+    $expected = "http://www.example.com/{$project['name']}/current";
 
     $data[] = [$project, $site_key, $expected];
 
     // For enabled projects, test adding the site key.
     $project['project_type'] = '';
-    $expected = 'http://www.example.com/' . $project['name'] . '/' . DRUPAL_CORE_COMPATIBILITY;
+    $expected = "http://www.example.com/{$project['name']}/current";
     $expected .= '?site_key=site_key';
     $expected .= '&list=' . rawurlencode('module1,module2');
 
@@ -92,7 +88,7 @@ public function providerTestUpdateBuildFetchUrl() {
 
     // Test when the URL contains a question mark.
     $project['info']['project status url'] = 'http://www.example.com/?project=';
-    $expected = 'http://www.example.com/?project=/' . $project['name'] . '/' . DRUPAL_CORE_COMPATIBILITY;
+    $expected = "http://www.example.com/?project=/{$project['name']}/current";
     $expected .= '&site_key=site_key';
     $expected .= '&list=' . rawurlencode('module1,module2');
 
diff --git a/core/modules/update/update.compare.inc b/core/modules/update/update.compare.inc
index bd0188a25f..a65e20fca1 100644
--- a/core/modules/update/update.compare.inc
+++ b/core/modules/update/update.compare.inc
@@ -7,6 +7,7 @@
 
 use Drupal\update\UpdateFetcherInterface;
 use Drupal\update\UpdateManagerInterface;
+use Drupal\update\ModuleVersion;
 
 /**
  * Determines version and type information for currently installed projects.
@@ -122,12 +123,13 @@ function update_calculate_project_data($available) {
  * with an error and the next project is considered.
  *
  * If the project itself is valid, the function decides what major release
- * series to consider. The project defines what the currently supported major
- * versions are for each version of core, so the first step is to make sure the
- * current version is still supported. If so, that's the target version. If the
- * current version is unsupported, the project maintainer's recommended major
- * version is used. There's also a check to make sure that this function never
- * recommends an earlier release than the currently installed major version.
+ * series to consider. The project defines the currently supported development
+ * branches, so the first step is to make sure the development branch of the
+ * current version is still supported. If so, then the major version of the
+ * current version is used. If the current version is not in a supported branch,
+ * the next supported branch is used to determine the major version to use.
+ * There's also a check to make sure that this function never recommends an
+ * earlier release than the currently installed major version.
  *
  * Given a target major version, the available releases are scanned looking for
  * the specific release to recommend (avoiding beta releases and development
@@ -235,35 +237,26 @@ function update_calculate_project_update_status(&$project_data, $available) {
   }
 
   // Figure out the target major version.
-  $existing_major = $project_data['existing_major'];
-  $supported_majors = [];
-  if (isset($available['supported_majors'])) {
-    $supported_majors = explode(',', $available['supported_majors']);
-  }
-  elseif (isset($available['default_major'])) {
-    // Older release history XML file without supported or recommended.
-    $supported_majors[] = $available['default_major'];
+  $existing_module_version = new ModuleVersion($project_data['existing_version']);
+  $existing_major = $existing_module_version->getMajorVersion();
+  $supported_branches = [];
+  if (isset($available['supported_branches'])) {
+    $supported_branches = explode(',', $available['supported_branches']);
   }
 
-  if (in_array($existing_major, $supported_majors)) {
+  if (in_array($existing_module_version->getSupportBranch(), $supported_branches)) {
     // Still supported, stay at the current major version.
     $target_major = $existing_major;
   }
-  elseif (isset($available['recommended_major'])) {
-    // Since 'recommended_major' is defined, we know this is the new XML
-    // format. Therefore, we know the current release is unsupported since
-    // its major version was not in the 'supported_majors' list. We should
-    // find the best release from the recommended major version.
-    $target_major = $available['recommended_major'];
+  elseif ($supported_branches) {
+    // We know the current release is unsupported since it is not in
+    // 'supported_branches' list. We should use the next supported branch for
+    // the target major version.
+    $target_major = ModuleVersion::createFromSupportBranch($supported_branches[0])->getMajorVersion();
     $project_data['status'] = UpdateManagerInterface::NOT_SUPPORTED;
   }
-  elseif (isset($available['default_major'])) {
-    // Older release history XML file without recommended, so recommend
-    // the currently defined "default_major" version.
-    $target_major = $available['default_major'];
-  }
   else {
-    // Malformed XML file? Stick with the current version.
+    // Malformed XML file? Stick with the current branch.
     $target_major = $existing_major;
   }
 
@@ -297,6 +290,7 @@ function update_calculate_project_update_status(&$project_data, $available) {
     return;
   }
   foreach ($available['releases'] as $version => $release) {
+    $release_module_version = new ModuleVersion($release['version']);
     // First, if this is the existing release, check a few conditions.
     if ($project_data['existing_version'] === $version) {
       if (isset($release['terms']['Release type']) &&
@@ -336,18 +330,20 @@ function update_calculate_project_update_status(&$project_data, $available) {
       continue;
     }
 
+    $release_major_version = $release_module_version->getMajorVersion();
+    $release_patch_version = $release_module_version->getPatchVersion();
     // See if this is a higher major version than our target and yet still
     // supported. If so, record it as an "Also available" release.
     // Note: Some projects have a HEAD release from CVS days, which could
     // be one of those being compared. They would not have version_major
     // set, so we must call isset first.
-    if (isset($release['version_major']) && $release['version_major'] > $target_major) {
-      if (in_array($release['version_major'], $supported_majors)) {
+    if ($release_major_version !== NULL && $release_major_version > $target_major) {
+      if (in_array($release_module_version->getSupportBranch(), $supported_branches)) {
         if (!isset($project_data['also'])) {
           $project_data['also'] = [];
         }
-        if (!isset($project_data['also'][$release['version_major']])) {
-          $project_data['also'][$release['version_major']] = $version;
+        if (!isset($project_data['also'][$release_major_version])) {
+          $project_data['also'][$release_major_version] = $version;
           $project_data['releases'][$version] = $release;
         }
       }
@@ -364,16 +360,15 @@ function update_calculate_project_update_status(&$project_data, $available) {
     // Look for the 'latest version' if we haven't found it yet. Latest is
     // defined as the most recent version for the target major version.
     if (!isset($project_data['latest_version'])
-        && $release['version_major'] == $target_major) {
+        && $release_major_version == $target_major) {
       $project_data['latest_version'] = $version;
       $project_data['releases'][$version] = $release;
     }
 
     // Look for the development snapshot release for this branch.
     if (!isset($project_data['dev_version'])
-        && $release['version_major'] == $target_major
-        && isset($release['version_extra'])
-        && $release['version_extra'] == 'dev') {
+        && $release_major_version == $target_major
+        && $release_module_version->getVersionExtra() === 'dev') {
       $project_data['dev_version'] = $version;
       $project_data['releases'][$version] = $release;
     }
@@ -381,13 +376,13 @@ function update_calculate_project_update_status(&$project_data, $available) {
     // Look for the 'recommended' version if we haven't found it yet (see
     // phpdoc at the top of this function for the definition).
     if (!isset($project_data['recommended'])
-        && $release['version_major'] == $target_major
-        && isset($release['version_patch'])) {
-      if ($patch != $release['version_patch']) {
-        $patch = $release['version_patch'];
+        && $release_major_version == $target_major
+        && $release_patch_version !== NULL) {
+      if ($patch != $release_patch_version) {
+        $patch = $release_patch_version;
         $release_patch_changed = $release;
       }
-      if (empty($release['version_extra']) && $patch == $release['version_patch']) {
+      if ($release_module_version->getVersionExtra() === NULL && $patch == $release_patch_version) {
         $project_data['recommended'] = $release_patch_changed['version'];
         $project_data['releases'][$release_patch_changed['version']] = $release_patch_changed;
       }