Drop support for mercurial

adangel · adangel · commit 2cc5440e813b · 2021-06-17T20:24:29.000+02:00
diff --git a/History.md b/History.md
@@ -2,6 +2,8 @@
 
 ## New and Noteworthy
 
+*   Support for Mercurial is removed. The only SCM supported in the project-list.xml is "git".
+
 ## Fixed Issues
 
 ## External Contributions
diff --git a/config/projectlist_1_2_0.xsd b/config/projectlist_1_2_0.xsd
@@ -16,7 +16,6 @@
         <xs:simpleType>
           <xs:restriction base="xs:string">
             <xs:enumeration value="git"/>
-            <xs:enumeration value="hg"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:element>
diff --git a/lib/pmdtester/builders/project_builder.rb b/lib/pmdtester/builders/project_builder.rb
@@ -22,14 +22,14 @@ def clone_projects
         if File.exist?(path)
           logger.warn "Skipping clone, project path #{path} already exists"
         else
-          clone_cmd = "#{project.type} clone #{project.connection} #{path}"
-
-          if project.type == 'git'
-            # Don't download whole history
-            # Note we don't use --single-branch, because the repo is downloaded
-            # once but may be used with several tags.
-            clone_cmd += ' --depth 1'
-          end
+          raise "Unsupported project type '#{project.type}' - only git is supported" unless project.type == 'git'
+
+          # git:
+          # Don't download whole history
+          # Note we don't use --single-branch, because the repo is downloaded
+          # once but may be used with several tags.
+          clone_cmd = "git clone #{project.connection} #{path} --depth 1"
+
           Cmd.execute(clone_cmd)
         end
 
@@ -95,12 +95,9 @@ def run_as_script(path, command)
     end
 
     def execute_reset_cmd(type, tag)
-      case type
-      when 'git'
-        reset_cmd = "git checkout #{tag}; git reset --hard #{tag}"
-      when 'hg'
-        reset_cmd = "hg up #{tag}"
-      end
+      raise "Unsupported project type '#{type}' - only git is supported" unless type == 'git'
+
+      reset_cmd = "git checkout #{tag}; git reset --hard #{tag}"
 
       Cmd.execute(reset_cmd)
     end
diff --git a/test/resources/html_report_builder/expected_empty_diff_report.html b/test/resources/html_report_builder/expected_empty_diff_report.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <title>Diff report for openjdk10</title>
+    <title>Diff report for openjdk-11</title>
 
     <link rel="stylesheet" type="text/css" href="../css/bootstrap.min.css"/>
     <link rel="stylesheet" type="text/css" href="../css/datatables.min.css"/>
diff --git a/test/resources/integration_test_runner/project-list.xml b/test/resources/integration_test_runner/project-list.xml
@@ -23,11 +23,4 @@ xsi:noNamespaceSchemaLocation="projectlist_1_2_0.xsd">
     <tag>v5.0.6.RELEASE</tag>
   </project>
 -->
-
-  <!---<project>
-    <name>openjdk10</name>
-    <type>hg</type>
-    <connection>http://hg.openjdk.java.net/jdk10/jdk10/jdk</connection>
-    <webview-url>http://hg.openjdk.java.net/jdk10/jdk10/jdk/file/777356696811</webview-url>
-  </project> -->
 </projectlist>
diff --git a/test/resources/project_diff_report/project-list.xml b/test/resources/project_diff_report/project-list.xml
@@ -16,10 +16,11 @@ xsi:noNamespaceSchemaLocation="projectlist_1_2_0.xsd">
   </project>
 
   <project>
-    <name>openjdk10</name>
-    <type>hg</type>
-    <connection>http://hg.openjdk.java.net/jdk10/jdk10/jdk</connection>
-    <webview-url>http://hg.openjdk.java.net/jdk10/jdk10/jdk/file/777356696811</webview-url>
+    <name>openjdk-11</name>
+    <type>git</type>
+    <connection>https://github.com/openjdk/jdk</connection>
+    <tag>jdk-11+28</tag>
+    <src-subpath>src/java.base</src-subpath>
   </project>
 
   <project>
diff --git a/test/resources/projects_parser/project-list.xml b/test/resources/projects_parser/project-list.xml
@@ -16,10 +16,11 @@ xsi:noNamespaceSchemaLocation="projectlist_1_2_0.xsd">
   </project>
 
   <project>
-    <name>openjdk10</name>
-    <type>hg</type>
-    <connection>http://hg.openjdk.java.net/jdk10/jdk10/jdk</connection>
-    <webview-url>http://hg.openjdk.java.net/jdk10/jdk10/jdk/file/777356696811</webview-url>
+    <name>openjdk-11</name>
+    <type>git</type>
+    <connection>https://github.com/openjdk/jdk</connection>
+    <tag>jdk-11+28</tag>
+    <src-subpath>src/java.base</src-subpath>
   </project>
 
   <project>
diff --git a/test/resources/summary_report_builder/expected_filtered_index.html b/test/resources/summary_report_builder/expected_filtered_index.html
@@ -112,8 +112,8 @@ <h2>Projects</h2>
                 </tr>
                 
                 <tr>
-                    <td class="project-header"><a href="./openjdk10/index.html">openjdk10</a></td>
-                    <td>master</td>
+                    <td class="project-header"><a href="./openjdk-11/index.html">openjdk-11</a></td>
+                    <td>jdk-11+28</td>
                     <td>
 <span class="pill badge-pill badge-secondary added">+0</span>
 <span class="pill badge-pill badge-secondary removed">-0</span>
diff --git a/test/resources/summary_report_builder/expected_index.html b/test/resources/summary_report_builder/expected_index.html
@@ -110,8 +110,8 @@ <h2>Projects</h2>
                 </tr>
 
                 <tr>
-                    <td class="project-header"><a href="./openjdk10/index.html">openjdk10</a></td>
-                    <td>master</td>
+                    <td class="project-header"><a href="./openjdk-11/index.html">openjdk-11</a></td>
+                    <td>jdk-11+28</td>
                     <td>
 <span class="pill badge-pill badge-secondary added">+0</span>
 <span class="pill badge-pill badge-secondary removed">-0</span>
diff --git a/test/resources/summary_report_builder/project-list.xml b/test/resources/summary_report_builder/project-list.xml
@@ -16,10 +16,11 @@ xsi:noNamespaceSchemaLocation="projectlist_1_2_0.xsd">
   </project>
 
   <project>
-    <name>openjdk10</name>
-    <type>hg</type>
-    <connection>http://hg.openjdk.java.net/jdk10/jdk10/jdk</connection>
-    <webview-url>http://hg.openjdk.java.net/jdk10/jdk10/jdk/file/777356696811</webview-url>
+    <name>openjdk-11</name>
+    <type>git</type>
+    <connection>https://github.com/openjdk/jdk</connection>
+    <tag>jdk-11+28</tag>
+    <src-subpath>src/java.base</src-subpath>
   </project>
 
   <project>
diff --git a/test/test_projects_parser.rb b/test/test_projects_parser.rb
@@ -20,12 +20,12 @@ def test_project_parser_checkstyle
   end
 
   def test_project_parser_openjdk
-    assert_equal('openjdk10', @projects[1].name)
-    assert_equal('hg', @projects[1].type)
-    assert_equal('http://hg.openjdk.java.net/jdk10/jdk10/jdk', @projects[1].connection)
-    assert_equal('http://hg.openjdk.java.net/jdk10/jdk10/jdk/file/777356696811',
-                 @projects[1].webview_url)
-    assert_equal('master', @projects[1].tag)
+    assert_equal('openjdk-11', @projects[1].name)
+    assert_equal('git', @projects[1].type)
+    assert_equal('https://github.com/openjdk/jdk', @projects[1].connection)
+    assert_equal('https://github.com/openjdk/jdk/tree/jdk-11+28', @projects[1].webview_url)
+    assert_equal('jdk-11+28', @projects[1].tag)
+    assert_equal('src/java.base', @projects[1].src_subpath)
     assert_empty(@projects[1].exclude_patterns)
     assert_nil(@projects[1].build_command)
     assert_nil(@projects[1].auxclasspath_command)
@@ -54,7 +54,7 @@ def test_invalid_list
       assert_equal("15:0: ERROR: Element 'connection': This element is not expected. " \
                        'Expected is ( type ).', e.errors[1].to_s)
       assert_equal("20:0: ERROR: Element 'type': [facet 'enumeration'] " \
-                       "The value 'invalid type' is not an element of the set {'git', 'hg'}.",
+                       "The value 'invalid type' is not an element of the set {'git'}.",
                    e.errors[2].to_s)
     end
   end
