Fix more merge issues

Author: jwj019

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java

@@ -353,19 +353,6 @@ private void addNpmPackageGeneration(SemVer ngVersion) {
         if (!additionalProperties.containsKey(RXJS_VERSION)) {
             additionalProperties.put(RXJS_VERSION, angularDependencies.getRxjsVersion());
         }
-        
-        // Set the rxJS version compatible to the Angular version
-        if (ngVersion.atLeast("15.0.0")) {
-            additionalProperties.put("rxjsVersion", "7.5.5");
-        } else if (ngVersion.atLeast("14.0.0")) {
-            additionalProperties.put("rxjsVersion", "7.5.5");
-        } else if (ngVersion.atLeast("13.0.0")) {
-            additionalProperties.put("rxjsVersion", "7.4.0");
-        } else if (ngVersion.atLeast("10.0.0")) {
-            additionalProperties.put("rxjsVersion", "6.6.0");
-        } else if (ngVersion.atLeast("9.0.0")) {
-            additionalProperties.put("rxjsVersion", "6.5.3");
-        }
 
         if (!additionalProperties.containsKey(NGPACKAGR_VERSION)) {
             additionalProperties.put(NGPACKAGR_VERSION, angularDependencies.getNgPackagrVersion());

modules/openapi-generator/src/test/java/org/openapitools/codegen/config/GlobalSettingsTest.java

@@ -8,7 +8,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNoException;
 
-import org.junit.jupiter.api.Disabled;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -29,7 +28,7 @@ public void setUp() {
         System.getProperties().putAll(props);
     }
 
-    @Test @Disabled
+    @Test(enabled = false)
     // comment out the following tests as it generates false alarms from time to time
     // also using system property will eventually be decommissioned
     public void testNonStringSystemProperties() {

modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptAngularClientOptionsProvider.java

@@ -72,7 +72,6 @@ public Map<String, String> createOptions() {
                 .put(TypeScriptAngularClientCodegen.RXJS_VERSION, RXJS_VERSION)
                 .put(TypeScriptAngularClientCodegen.NGPACKAGR_VERSION, NGPACKAGR_VERSION)
                 .put(TypeScriptAngularClientCodegen.ZONEJS_VERSION, ZONEJS_VERSION)
-                .put(CodegenConstants.ENUM_UNKNOWN_DEFAULT_CASE, ENUM_UNKNOWN_DEFAULT_CASE_VALUE)
                 .put(TypeScriptAngularClientCodegen.HTTP_OPTIONS_NAME, HTTP_OPTIONS_NAME_VALUE)
                 .build();
     }