Enable Support for Non-From Source Runs to Generate Reduced POMs (Azure#20913)

Enable Support for Non-From Source Runs to Generate Reduced POMs

Author: alzimmermsft

eng/scripts/generate_from_source_pom.py

@@ -3,7 +3,7 @@
 
 # Python version 3.4 or higher is required to run this script.
 
-# Use case: Creates an aggregate POM which contains all modules that will be required in a "From Source" run for the passed 
+# Use case: Creates an aggregate POM which contains all modules that will be required in a "From Source" run for the passed
 # project list.
 #
 # Flags
@@ -69,7 +69,7 @@ def create_from_source_pom(project_list: str):
     for project_identifier in project_list_identifiers:
         if not project_identifier in project_to_pom_path_mapping:
             continue
-        
+
         dependent_modules = resolve_dependent_project(project_identifier, dependent_modules, dependency_to_project_mapping)
 
     # Distinct the dependent modules, even though this should be guarded, to reduce downstream processing requirements.
@@ -92,33 +92,33 @@ def create_from_source_pom(project_list: str):
 
     # Distinct the modules list.
     modules = list(set(modules))
-    
+
     # Sort the modules list for easier reading.
     modules.sort()
-    
+
     with open(file=client_from_source_pom_path, mode='w') as fromSourcePom:
         fromSourcePom.write(pom_file_start)
 
         for module in modules:
             fromSourcePom.write('    <module>{}</module>\n'.format(module))
 
         fromSourcePom.write(pom_file_end)
-    
+
 # Function that loads and parses client_versions.txt into a artifact identifier - source version mapping.
 def load_client_artifact_identifiers():
     artifact_identifiers = {}
     with open(file=client_versions_path, mode='r') as f:
         for line in f:
             stripped_line = line.strip()
-            
-            # Skip empty lines, comments, and non-standard version lines.
+
+            # Skip empty, comment, and non-standard version lines.
             if not stripped_line or stripped_line.startswith('#') or line.startswith('beta_') or line.startswith('unreleased_'):
                 continue
 
             # Split the version line on ';' which should create 3 substrings of artifact identifier - released version - source version.
             splitVersionLine = stripped_line.split(";")
 
-            # From the split lines create the artifact identitifer - source version map entry.
+            # From the split lines create the artifact identifier - source version map entry.
             artifact_identifiers[splitVersionLine[0]]=splitVersionLine[2]
 
     return artifact_identifiers
@@ -139,7 +139,7 @@ def create_dependency_and_path_mappings(project_list_identifiers: list, artifact
 
     return project_dependencies_mapping, dependency_mapping, module_path_mapping
 
-# Function that constructs the project dependencies map and adds to dependency to project map and project to module relative path map for a track 2 project. 
+# Function that constructs the project dependencies map and adds to dependency to project map and project to module relative path map for a track 2 project.
 def add_project_to_dependency_and_module_mappings(file_path: str, project_dependencies_mapping: dict, project_list_identifiers: list, artifact_identifier_to_source_version: dict, dependency_mapping: dict, module_path_mapping: dict):
     if 'eng' in file_path.split(os.sep):
         return
@@ -152,7 +152,7 @@ def add_project_to_dependency_and_module_mappings(file_path: str, project_depend
     # If the project isn't a track 2 POM skip it and not one of the project list identifiers.
     if not project_identifier in project_list_identifiers and not is_track_two_pom(tree_root):
         return
-    
+
     module_path_mapping[project_identifier] = os.path.dirname(file_path).replace(root_path, '').replace('\\', '/')
 
     dependencies = tree_root.iter(maven_xml_namespace + 'dependency')
@@ -169,6 +169,10 @@ def add_project_to_dependency_and_module_mappings(file_path: str, project_depend
         if not dependency_identifier in artifact_identifier_to_source_version:
             continue
 
+        dependency_version = get_dependency_version(dependency)
+        if dependency_version != artifact_identifier_to_source_version[dependency_identifier]:
+            continue
+
         if not dependency_identifier in dependency_mapping:
             dependency_mapping[dependency_identifier] = []
 
@@ -183,7 +187,7 @@ def resolve_dependent_project(pom_identifier: str, dependent_modules: list, depe
             if not dependency in dependent_modules:
                 dependent_modules = resolve_dependent_project(dependency, dependent_modules, dependency_to_project_mapping)
                 dependent_modules.append(dependency)
-    
+
     return dependent_modules
 
 # Function which resolves the dependencies of the project.
@@ -214,6 +218,15 @@ def create_artifact_identifier(element: ET.Element):
 
     return group_id.text + ':' + element_find(element, 'artifactId').text
 
+# Gets the dependency version.
+def get_dependency_version(element: ET.Element):
+    dependency_version = element_find(element, 'version')
+
+    if dependency_version is None:
+        return None
+
+    return dependency_version.text
+
 # Helper function for finding an XML element which handles adding the namespace.
 def element_find(element: ET.Element, path: str):
     return element.find(maven_xml_namespace + path)