Revert "Managed dependencies without a version should be merged with settings coming from an existing version (#6472)"

This reverts commit 58a4ad4.

Author: shanman190

rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java

@@ -969,15 +969,9 @@ private void mergeDependencyManagement(
                             null
                     );
                     managedDependencyMap.compute(createDependencyManagementKey(defined), (key, existing) -> {
-                        if (existing == null) {
+                        if (existing == null || existing.getBomGav() != null) {
                             return resolvedDefined;
                         }
-                        if (existing.getBomGav() != null) {
-                            if (resolvedDefined.getVersion() != null) {
-                                return resolvedDefined;
-                            }
-                            return mergeProperties(resolvedDefined, existing);
-                        }
                         return mergeProperties(existing, resolvedDefined);
                     });
                 }

rewrite-maven/src/test/java/org/openrewrite/maven/MavenParserTest.java

@@ -34,7 +34,6 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.openrewrite.*;
-import org.openrewrite.maven.cache.MavenPomCache;
 import org.openrewrite.maven.http.OkHttpSender;
 import org.openrewrite.maven.internal.MavenParsingException;
 import org.openrewrite.maven.tree.*;
@@ -44,7 +43,10 @@
 
 import java.net.InetAddress;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.Base64;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.groupingBy;
@@ -4715,101 +4717,6 @@ void allDependencyManagementEntryVariants_allDependencyVariants() {
 
     }
 
-    @Test
-    void transitiveDependencyVersion() {
-        InMemoryExecutionContext ctx = new InMemoryExecutionContext();
-        rewriteRun(
-          spec -> spec.executionContext(ctx),
-          pomXml(
-            """
-            <project>
-              <groupId>com.example.my-app</groupId>
-              <artifactId>my-app-bom</artifactId>
-              <version>1</version>
-              <packaging>pom</packaging>
-              <dependencyManagement>
-                <dependencies>
-                  <dependency>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk18on</artifactId>
-                    <version>1.79</version>
-                  </dependency>
-                </dependencies>
-              </dependencyManagement>
-            </project>
-            """
-          ),
-          mavenProject("parent",
-            pomXml(
-              """
-                <project>
-                  <groupId>com.example.my-app</groupId>
-                  <artifactId>my-app-parent</artifactId>
-                  <version>1</version>
-                  <packaging>pom</packaging>
-                  <dependencyManagement>
-                    <dependencies>
-                      <dependency>
-                        <groupId>com.example.my-app</groupId>
-                        <artifactId>my-app-bom</artifactId>
-                        <version>1</version>
-                        <type>pom</type>
-                        <scope>import</scope>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.bouncycastle</groupId>
-                        <artifactId>bcprov-jdk18on</artifactId>
-                      </dependency>
-                    </dependencies>
-                  </dependencyManagement>
-                </project>
-                """
-            )
-          ),
-          mavenProject("my-app",
-            pomXml(
-              """
-                <project>
-                  <groupId>com.example.my-app</groupId>
-                  <artifactId>my-app</artifactId>
-                  <version>1</version>
-                  <parent>
-                    <groupId>com.example.my-app</groupId>
-                    <artifactId>my-app-parent</artifactId>
-                    <version>1</version>
-                  </parent>
-                  <dependencies>
-                     <dependency>
-                       <groupId>org.bouncycastle</groupId>
-                       <artifactId>bcpkix-jdk18on</artifactId>
-                       <version>1.71</version>
-                     </dependency>
-                  </dependencies>
-                </project>
-                """,
-              spec -> spec.afterRecipe(pom -> {
-                  assertThat(pom).isNotNull();
-                  Optional<MavenResolutionResult> maybeMrr = pom.getMarkers().findFirst(MavenResolutionResult.class);
-                  assertThat(maybeMrr).isPresent();
-
-                  MavenResolutionResult mrr = maybeMrr.get();
-                  assertThat(mrr.getDependencies().get(Scope.Compile).stream())
-                    .anyMatch(resolvedDependency -> "org.bouncycastle".equals(resolvedDependency.getGroupId()) &&
-                      "bcprov-jdk18on".equals(resolvedDependency.getArtifactId()) &&
-                      "1.79".equals(resolvedDependency.getVersion()))
-                    .noneMatch(resolvedDependency -> "org.bouncycastle".equals(resolvedDependency.getGroupId()) &&
-                      "bcprov-jdk18on".equals(resolvedDependency.getArtifactId()) &&
-                      !"1.79".equals(resolvedDependency.getVersion()));
-
-                  MavenPomCache pomCache = MavenExecutionContextView.view(ctx).getPomCache();
-                  assertThat(pomCache.getPom(new ResolvedGroupArtifactVersion(MavenRepository.MAVEN_CENTRAL.getUri(), "org.bouncycastle", "bcprov-jdk18on", "1.79", "1.79"))).isPresent();
-                  assertThat(pomCache.getPom(new ResolvedGroupArtifactVersion(MavenRepository.MAVEN_CENTRAL.getUri(), "org.bouncycastle", "bcprov-jdk18on", "1.71", "1.71"))).isNull();
-              })
-            )
-          )
-        );
-    }
-
     @Test
     void groupIdAndArtifactIdAsProperties() {
         rewriteRun(