diff --git a/Api-Layer-Java.ppf b/Api-Layer-Java.ppf
index 3cdfe870b1..4062fc3977 100644
--- a/Api-Layer-Java.ppf
+++ b/Api-Layer-Java.ppf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
   This program and the accompanying materials are made available under the terms of the
   Eclipse Public License v2.0 which accompanies this distribution, and is available at
   https://www.eclipse.org/legal/epl-v20.html
@@ -32,10 +32,6 @@
 	<Source exclude="false" path="./helloworld-spring/src/test/java" web="false"/>
 	<Source exclude="false" path="./integration-enabler-spring-v1-sample-app/src/main/java" web="false"/>
 	<Source exclude="false" path="./integration-enabler-spring-v1-sample-app/src/test/java" web="false"/>
-	<Source exclude="false" path="./integration-enabler-spring-v1/src/main/java" web="false"/>
-	<Source exclude="false" path="./integration-enabler-spring-v1/src/test/java" web="false"/>
-	<Source exclude="false" path="./integration-enabler-spring-v2/src/main/java" web="false"/>
-	<Source exclude="false" path="./integration-enabler-spring-v2/src/test/java" web="false"/>
 	<Source exclude="false" path="./integration-tests/src/test/java" web="false"/>
 	<Source exclude="false" path="./security-service-client-spring/src/main/java" web="false"/>
 	<Source exclude="false" path="./security-service-client-spring/src/test/java" web="false"/>
diff --git a/Jenkinsfile b/Jenkinsfile
index 3fca8f16a0..499e1f4969 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -305,17 +305,10 @@ pipeline {
 
         success {
             archiveArtifacts artifacts: 'api-catalog-services/build/libs/**/*.jar'
-            archiveArtifacts artifacts: 'api-catalog-services/build/pom.xml'
             archiveArtifacts artifacts: 'discoverable-client/build/libs/**/*.jar'
             archiveArtifacts artifacts: 'discovery-service/build/libs/**/*.jar'
-            archiveArtifacts artifacts: 'discovery-service/build/pom.xml'
             archiveArtifacts artifacts: 'gateway-service/build/libs/**/*.jar'
-            archiveArtifacts artifacts: 'gateway-service/build/pom.xml'
-            archiveArtifacts artifacts: 'integration-enabler-spring-v1/build/libs/**/*.jar'
-            archiveArtifacts artifacts: 'integration-enabler-spring-v2/build/libs/**/*.jar'
             archiveArtifacts artifacts: 'integration-enabler-spring-v1-sample-app/build/libs/**/*.jar'
-            archiveArtifacts artifacts: 'common-service-core/build/libs/**/*.jar'
-            archiveArtifacts artifacts: 'apiml-common/build/libs/**/*.jar'
             archiveArtifacts artifacts: 'api-layer.tar.gz'
 
             withCredentials([usernamePassword(credentialsId: 'zowe-robot-github', usernameVariable: 'ZOWE_GITHUB_USERID', passwordVariable: 'ZOWE_GITHUB_APIKEY')]) {
diff --git a/gradle/license.gradle b/gradle/license.gradle
index 0ea0314f67..0105d86eb6 100644
--- a/gradle/license.gradle
+++ b/gradle/license.gradle
@@ -8,8 +8,6 @@ ext.projectsNeedLicense = [
     'discovery-service',
     'gateway-common',
     'gateway-service',
-    'integration-enabler-spring-v1',
-    'integration-enabler-spring-v2',
     'integration-tests',
     'security-module',
     'security-service-client-spring',
diff --git a/integration-enabler-spring-v1/README.md b/integration-enabler-spring-v1/README.md
deleted file mode 100644
index dffb10310b..0000000000
--- a/integration-enabler-spring-v1/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Service Integration Enabler for Spring Boot applications
-
-This library enables Spring Boot REST API services to integration with MFaaS ecosystem 
-and make their APIs available via MFaaS API Gateway and API Catalog.
-
-It allows documentation REST endpoints to be exposed in Swagger format.
-
-You can find detailed documentations in our [docs][Documentation].
-
-[Documentation]: https://github.com/zowe/Giza-docs/tree/master/topics/api-mediation/onboard-an-existing-spring-boot-rest-api-service.md
diff --git a/integration-enabler-spring-v1/build.gradle b/integration-enabler-spring-v1/build.gradle
deleted file mode 100644
index 1185ae46ec..0000000000
--- a/integration-enabler-spring-v1/build.gradle
+++ /dev/null
@@ -1,37 +0,0 @@
-buildscript {
-    ext {
-        springBootVersion = "1.5.9.RELEASE"
-        springCloudVersion = "1.4.0.RELEASE"
-    }
-    repositories mavenRepositories
-    dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-    }
-}
-
-apply plugin: 'io.spring.dependency-management'
-
-jar {
-    baseName = "enabler-springboot-${springBootVersion}"
-    archiveName = "${baseName}.jar"
-}
-
-dependencies {
-    compile(project(':common-service-core'))
-
-    compile "org.springframework.boot:spring-boot-starter-actuator:${springBootVersion}"
-    compile "org.springframework.cloud:spring-cloud-starter-eureka:${springCloudVersion}"
-    compile "io.springfox:springfox-swagger2:2.7.0"
-    compile "io.springfox:springfox-spring-web:2.7.0"
-
-    compileOnly libraries.javax_servlet_api
-    compileOnly libraries.lombok
-
-    testCompile "org.springframework.boot:spring-boot-starter-test:${springBootVersion}"
-    testCompile libraries.javax_servlet_api
-    testCompile libraries.gson
-    testCompile libraries.powermock_api_mockito2
-    testCompile libraries.power_mock_junit4
-    testCompile libraries.power_mock_junit4_rule
-    testCompile libraries.lombok
-}
diff --git a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/EnableApiDiscovery.java b/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/EnableApiDiscovery.java
deleted file mode 100644
index 16ee7e04a3..0000000000
--- a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/EnableApiDiscovery.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable;
-
-import org.zowe.apiml.enable.model.ApiPropertiesContainerV1;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-import java.lang.annotation.*;
-
-@Configuration
-@ComponentScan
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-@EnableEurekaClient
-@EnableConfigurationProperties(value = {ApiPropertiesContainerV1.class})
-public @interface EnableApiDiscovery {
-
-}
diff --git a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/EnablerV1SpringFoxConfig.java b/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/EnablerV1SpringFoxConfig.java
deleted file mode 100644
index ab03696445..0000000000
--- a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/EnablerV1SpringFoxConfig.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable;
-
-import org.zowe.apiml.enable.conditions.ConditionalOnMissingProperty;
-import org.zowe.apiml.enable.model.ApiDocConfigException;
-import org.zowe.apiml.enable.model.ApiPropertiesContainerV1;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-import java.util.Collections;
-
-import static springfox.documentation.builders.PathSelectors.regex;
-
-@SuppressWarnings("Duplicates")
-@Slf4j
-@ConditionalOnProperty(prefix = "eureka.instance.metadata-map.mfaas.discovery", value = "enableApiDoc", havingValue = "true", matchIfMissing = true)
-@ConditionalOnMissingProperty("eureka.instance.metadata-map.mfaas.api-info.swagger.location")
-@Configuration
-@EnableSwagger2
-public class EnablerV1SpringFoxConfig {
-
-    @Autowired
-    public EnablerV1SpringFoxConfig(ApiPropertiesContainerV1 apiPropertiesContainerV1,
-                                    DefaultListableBeanFactory beanFactory) {
-        apiPropertiesContainerV1.getApiVersionProperties().forEach((apiVersion, apiInfo) -> {
-            Docket apiDocketBean;
-            try {
-                apiDocketBean = generateDocket(apiVersion, apiInfo);
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-                return;
-            }
-
-            // create a bean name based on the group
-            String beanName = apiVersion.trim() + "_API";
-            beanFactory.initializeBean(apiDocketBean, beanName);
-            beanFactory.autowireBeanProperties(apiDocketBean,
-                AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, true);
-            beanFactory.registerSingleton(beanName, apiDocketBean);
-            log.info("Generated bean: " + beanName + " for API version: " + apiVersion.trim());
-        });
-    }
-
-    /**
-     * Generate a docket for this API version
-     *
-     * @param apiVersion the version of the API
-     * @param apiInfo the API Info
-     * @return a SpringFox docket
-     * @throws ApiDocConfigException in case of error
-     */
-    private Docket generateDocket(String apiVersion, ApiPropertiesContainerV1.ApiProperties apiInfo) {
-        String groupName = apiVersion;
-        if (apiInfo.getGroupName() != null && !apiInfo.getGroupName().isEmpty()) {
-            groupName = apiInfo.getGroupName();
-        }
-        if (apiInfo.getBasePackage() == null && apiInfo.getApiPattern() == null) {
-            return new Docket(DocumentationType.SWAGGER_2)
-                .select()
-                .apis(RequestHandlerSelectors.any())
-                .build()
-                .apiInfo(
-                    new ApiInfo(apiInfo.getTitle(),
-                        apiInfo.getDescription(),
-                        apiInfo.getVersion(),
-                       null,
-                        null,
-                        null,
-                        null,
-                        Collections.emptyList()))
-                .groupName(groupName);
-        } else if (apiInfo.getBasePackage() != null && !apiInfo.getBasePackage().isEmpty()) {
-            return new Docket(DocumentationType.SWAGGER_2)
-                .select()
-                .apis(RequestHandlerSelectors.basePackage(apiInfo.getBasePackage()))
-                .build()
-                .apiInfo(
-                    new ApiInfo(apiInfo.getTitle(),
-                        apiInfo.getDescription(),
-                        apiInfo.getVersion(),
-                        null,
-                        null,
-                        null,
-                        null,
-                        Collections.emptyList()))
-                .groupName(groupName);
-        } else if (apiInfo.getApiPattern() != null && !apiInfo.getApiPattern().isEmpty()) {
-            return new Docket(DocumentationType.SWAGGER_2)
-                .select()
-                .paths(regex(apiInfo.getApiPattern()))
-                .build()
-                .apiInfo(
-                    new ApiInfo(apiInfo.getTitle(),
-                        apiInfo.getDescription(),
-                        apiInfo.getVersion(),
-                        null,
-                        null,
-                        null,
-                        null,
-                        Collections.emptyList()))
-                .groupName(groupName);
-        } else {
-            String msg = "A base package or API pattern was not found for version: " + apiVersion;
-            ApiDocConfigException t = new ApiDocConfigException(msg);
-            log.error(msg, t);
-            throw t;
-        }
-    }
-}
diff --git a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/EurekaDiscovery.java b/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/EurekaDiscovery.java
deleted file mode 100644
index 1f052880ea..0000000000
--- a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/EurekaDiscovery.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-import org.springframework.context.annotation.Configuration;
-
-import javax.annotation.PostConstruct;
-
-@Slf4j
-@Configuration
-@ConditionalOnProperty(prefix = "mfaas.discovery", value = "enabled", havingValue = "true", matchIfMissing = true)
-@EnableEurekaClient
-public class EurekaDiscovery {
-
-    @Value("${mfaas.discovery.enabled:true}")
-    private String discoveryEnabled;
-
-    @PostConstruct
-    public void init() {
-        if (Boolean.valueOf(discoveryEnabled)) {
-            log.info("This service is discoverable by Eureka.");
-        }
-    }
-}
diff --git a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/api/ApiDocController.java b/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/api/ApiDocController.java
deleted file mode 100644
index 4c7ca1275e..0000000000
--- a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/api/ApiDocController.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.api;
-
-
-import org.zowe.apiml.enable.services.LocalApiDocService;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.MediaType;
-import org.springframework.util.ResourceUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.swagger.web.InMemorySwaggerResourcesProvider;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-
-import static org.springframework.util.ResourceUtils.CLASSPATH_URL_PREFIX;
-
-/**
- * Controller for handling retrieval of API doc via the gateway
- */
-@Slf4j
-@Data
-@RestController
-@RequestMapping("/")
-public class ApiDocController {
-
-    private final boolean apiDocEnabled;
-    private LocalApiDocService localApiDocService;
-    private InMemorySwaggerResourcesProvider swaggerResourcesProvider;
-    private String swaggerLocation;
-
-    /**
-     * API Doc retrieval controller
-     * Autowire in dependencies to contoller
-     * @param apiDocEnabled does the service have API Documentation
-     * @param swaggerLocation optional parameter to tell the controller where to load a static swagger file
-     * @param localApiDocService retrieve the API doc locally and not through the gateway
-     */
-    @Autowired
-    public ApiDocController(
-        @Value("${eureka.instance.metadata-map.mfaas.discovery.enableApiDoc:true}") boolean apiDocEnabled,
-        @Value("${eureka.instance.metadata-map.mfaas.api-info.swagger.location:}") String swaggerLocation,
-        @Autowired(required = false) LocalApiDocService localApiDocService) {
-        this.apiDocEnabled = apiDocEnabled;
-        this.localApiDocService = localApiDocService;
-        this.swaggerLocation = swaggerLocation;
-    }
-
-    /**
-     * Retrieve the API doc for the given group (or default to the first alphanumeric version tag)
-     * @param apiDocGroup the group to retrieve
-     * @return the API doc for a group
-     * @throws IOException when retrieving the doc fails
-     */
-    @GetMapping(value = "/api-doc", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public String getApiDoc(@RequestParam(value = "group", required = false) String apiDocGroup) throws IOException {
-        if (swaggerLocation == null || swaggerLocation.isEmpty()) {
-            return this.localApiDocService.getApiDoc(apiDocGroup);
-        } else {
-            return loadApiDocumentationFromStaticResourceFileAsJson();
-        }
-    }
-
-    /**
-     * Is API Doc enabled for the implementing service
-     * @return true if enabled
-     */
-    @GetMapping(value = "/api-doc/enabled", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public boolean isApiDocEnabled() {
-        return this.apiDocEnabled;
-    }
-
-    /**
-     * Load the swagger/api doc info from a local resource file
-     * @return the swagger as a String
-     * @throws IOException when reading the file fails
-     */
-    @SuppressWarnings("Duplicates")
-    private String loadApiDocumentationFromStaticResourceFileAsJson() throws IOException {
-        log.debug("Loading Api Documentation from static resource: " + swaggerLocation);
-        try {
-            if (!swaggerLocation.startsWith(CLASSPATH_URL_PREFIX)) {
-                swaggerLocation = CLASSPATH_URL_PREFIX + swaggerLocation.trim();
-            }
-            File file = ResourceUtils.getFile(swaggerLocation);
-            if (!file.exists()) {
-                throw new IOException("Cannot find Api Documentation (swagger) file: " + swaggerLocation);
-            }
-            return new String(Files.readAllBytes(file.toPath()));
-        } catch (IOException e) {
-            log.error("An exception occurred when attempting to retrieve swagger file: "
-                + swaggerLocation + ". " + e.getMessage(), e);
-            throw e;
-        }
-    }
-
-}
diff --git a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/conditions/ConditionalOnMissingProperty.java b/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/conditions/ConditionalOnMissingProperty.java
deleted file mode 100644
index 7637cbeac4..0000000000
--- a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/conditions/ConditionalOnMissingProperty.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.conditions;
-
-import org.springframework.boot.autoconfigure.condition.ConditionMessage;
-import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
-import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
-import org.springframework.context.annotation.ConditionContext;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.core.type.AnnotatedTypeMetadata;
-import org.springframework.util.MultiValueMap;
-
-import java.lang.annotation.*;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.METHOD})
-@Documented
-@Conditional(ConditionalOnMissingProperty.OnMissingPropertyCondition.class)
-public @interface ConditionalOnMissingProperty {
-
-    String[] value();
-
-    @SuppressWarnings({"Duplicates","squid:S134"})
-    @Order(Ordered.HIGHEST_PRECEDENCE + 40)
-    class OnMissingPropertyCondition extends SpringBootCondition {
-
-        @Override
-        public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
-            MultiValueMap<String, Object> annotationAttributes
-                = metadata.getAllAnnotationAttributes(ConditionalOnMissingProperty.class.getName());
-            if (!annotationAttributes.isEmpty()) {
-                ConditionOutcome conditionOutcome = null;
-                for (Object values : annotationAttributes.get("value")) {
-                    for (String propertyName : (String[]) values) {
-                        if (context.getEnvironment().containsProperty(propertyName)) {
-                            conditionOutcome = checkPropertyValueForNullOrEmpty(context, propertyName);
-                        }
-                        if (conditionOutcome != null && !conditionOutcome.isMatch()) {
-                            return ConditionOutcome.noMatch(ConditionMessage.of("At least one property with a value was found."));
-                        }
-                    }
-                }
-            }
-
-            // return match if no matching property was found:
-            return ConditionOutcome.match(ConditionMessage.of("None of the given properties found"));
-        }
-
-        private ConditionOutcome checkPropertyValueForNullOrEmpty(ConditionContext context, String propertyName) {
-            ConditionOutcome conditionOutcome;
-            try {
-                conditionOutcome = checkPropertyContentsForEmptyMatch(context, propertyName);
-            } catch (Exception e) {
-                conditionOutcome = ConditionOutcome.match(ConditionMessage.of("Property found"));
-            }
-            return conditionOutcome;
-        }
-
-        /**
-         * Check the value of the property, an empty or null value should be considered as a no match
-         * @param context condition context
-         * @param propertyName the property
-         * @return not match found or match with a value
-         */
-        private ConditionOutcome checkPropertyContentsForEmptyMatch(ConditionContext context, String propertyName) {
-            String propertyValue = context.getEnvironment().getProperty(propertyName, "");
-            if (!propertyValue.isEmpty()) {
-                // return NO match if there is a property of the given name with a non null/non empty value
-                return ConditionOutcome.noMatch(ConditionMessage.of("Found property " + propertyName + " with value: " + propertyValue));
-            } else {
-                return ConditionOutcome.match(ConditionMessage.of("Found property " + propertyName + " with an empty/null value"));
-            }
-        }
-    }
-}
diff --git a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/discovery/EurekaClientSecurityConfiguration.java b/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/discovery/EurekaClientSecurityConfiguration.java
deleted file mode 100644
index 51459e09fc..0000000000
--- a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/discovery/EurekaClientSecurityConfiguration.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.discovery;
-
-import org.zowe.apiml.security.HttpsConfig;
-import org.zowe.apiml.security.HttpsFactory;
-import com.netflix.discovery.DiscoveryClient;
-import com.netflix.discovery.shared.transport.jersey.EurekaJerseyClient;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import javax.annotation.PostConstruct;
-
-@Configuration
-@Slf4j
-public class EurekaClientSecurityConfiguration {
-    @Value("${server.ssl.protocol:TLSv1.2}")
-    private String protocol;
-
-    @Value("${spring.application.name}")
-    private String serviceId;
-
-    @Value("${eureka.client.serviceUrl.defaultZone}")
-    private String eurekaServerUrl;
-
-    @Value("${server.ssl.trustStore:#{null}}")
-    private String trustStore;
-
-    @Value("${server.ssl.trustStorePassword:#{null}}")
-    private String trustStorePassword;
-
-    @Value("${server.ssl.trustStoreType:PKCS12}")
-    private String trustStoreType;
-
-    @Value("${server.ssl.keyAlias:#{null}}")
-    private String keyAlias;
-
-    @Value("${server.ssl.keyStore:#{null}}")
-    private String keyStore;
-
-    @Value("${server.ssl.keyPassword:#{null}}")
-    private String keyPassword;
-
-    @Value("${server.ssl.keyStorePassword:#{null}}")
-    private String keyStorePassword;
-
-    @Value("${server.ssl.keyStoreType:PKCS12}")
-    private String keyStoreType;
-
-    @Value("${apiml.security.ssl.verifySslCertificatesOfServices:true}")
-    private boolean verifySslCertificatesOfServices;
-
-    private EurekaJerseyClient eurekaJerseyClient;
-
-    @PostConstruct
-    public void init() {
-        HttpsConfig httpsConfig = HttpsConfig.builder().keyAlias(keyAlias).protocol(protocol).keyStore(keyStore).keyPassword(keyPassword)
-                .keyStorePassword(keyStorePassword).keyStoreType(keyStoreType).trustStore(trustStore)
-                .trustStoreType(trustStoreType).trustStorePassword(trustStorePassword)
-                .verifySslCertificatesOfServices(verifySslCertificatesOfServices).build();
-
-        log.info("Using HTTPS configuration: {}", httpsConfig.toString());
-
-        HttpsFactory factory = new HttpsFactory(httpsConfig);
-        eurekaJerseyClient = factory.createEurekaJerseyClientBuilder(eurekaServerUrl, serviceId).build();
-    }
-
-    @Bean
-    public DiscoveryClient.DiscoveryClientOptionalArgs discoveryClientOptionalArgs() {
-        DiscoveryClient.DiscoveryClientOptionalArgs args = new DiscoveryClient.DiscoveryClientOptionalArgs();
-        args.setEurekaJerseyClient(eurekaJerseyClient);
-        return args;
-    }
-}
diff --git a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/model/ApiDocConfigException.java b/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/model/ApiDocConfigException.java
deleted file mode 100644
index 68598382d8..0000000000
--- a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/model/ApiDocConfigException.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.model;
-
-public class ApiDocConfigException extends IllegalArgumentException {
-
-    public ApiDocConfigException(String msg) {
-        super(msg);
-    }
-}
diff --git a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/model/ApiPropertiesContainerV1.java b/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/model/ApiPropertiesContainerV1.java
deleted file mode 100644
index 53de9443f6..0000000000
--- a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/model/ApiPropertiesContainerV1.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.model;
-
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Retrieve information about this service from application.yml, used to send information to the apiDoc discovery service
- */
-@Component
-@ConditionalOnProperty(prefix = "eureka.instance.metadata-map.mfaas.discovery", value = "enableApiDoc", havingValue = "true", matchIfMissing = true)
-@ConfigurationProperties("eureka.instance.metadata-map.mfaas.api-info")
-@Data
-@Slf4j
-public class ApiPropertiesContainerV1 {
-
-    private Map<String, ApiProperties> apiVersionProperties = new HashMap<>();
-
-    @PostConstruct
-    public void displayConfiguredInformation() {
-        String toString = apiVersionProperties.toString().replace(",", ",\n");
-
-        log.trace("===========================================");
-        log.trace("=    CONFIGURED API HEADER INFORMATION ");
-        log.trace("=\n");
-        log.trace(toString);
-        log.trace("===========================================");
-    }
-
-    @Data
-    public static class ApiProperties {
-
-        private String title;
-
-        private String description;
-
-        private String version;
-
-        private String basePackage;
-        private String apiPattern;
-        private String groupName;
-    }
-}
diff --git a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/model/ApplicationWrapper.java b/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/model/ApplicationWrapper.java
deleted file mode 100644
index ed4d445af7..0000000000
--- a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/model/ApplicationWrapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.model;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import lombok.Data;
-
-@JsonDeserialize(as = ApplicationWrapper.class)
-@Data
-public class ApplicationWrapper {
-
-    private com.netflix.discovery.shared.Application application;
-}
diff --git a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/services/LocalApiDocService.java b/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/services/LocalApiDocService.java
deleted file mode 100644
index cda6e35025..0000000000
--- a/integration-enabler-spring-v1/src/main/java/org/zowe/apiml/enable/services/LocalApiDocService.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.services;
-
-import org.zowe.apiml.enable.conditions.ConditionalOnMissingProperty;
-import io.swagger.models.Swagger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Component;
-import springfox.documentation.service.Documentation;
-import springfox.documentation.spring.web.DocumentationCache;
-import springfox.documentation.spring.web.json.Json;
-import springfox.documentation.spring.web.json.JsonSerializer;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.mappers.ServiceModelToSwagger2Mapper;
-
-import java.util.*;
-
-@Component
-@ConditionalOnProperty(prefix = "eureka.instance.metadata-map.mfaas.discovery", value = "enableApiDoc", havingValue = "true", matchIfMissing = true)
-@ConditionalOnMissingProperty("eureka.instance.metadata-map.mfaas.api-info.swagger.location")
-public class LocalApiDocService {
-
-    private final DocumentationCache documentationCache;
-    private final JsonSerializer jsonSerializer;
-    private final ServiceModelToSwagger2Mapper mapper;
-
-    /**
-     * API Doc retrieval controller
-     * Autowire in dependencies to contoller
-     * @param documentationCache in memory cache of discovered API Docs
-     * @param jsonSerializer json serializer
-     * @param mapper json mapper
-     */
-    @Autowired
-    public LocalApiDocService(
-        DocumentationCache documentationCache,
-        JsonSerializer jsonSerializer,
-        ServiceModelToSwagger2Mapper mapper)  {
-        this.jsonSerializer = jsonSerializer;
-        this.mapper = mapper;
-        this.documentationCache = documentationCache;
-    }
-
-    /**
-     * Retrieve the API doc for this service
-     * @param apiDocGroup the API doc group to retrieve (can be null, the apply default)
-     * @return the swagger as a string
-     */
-    public String getApiDoc(String apiDocGroup)  {
-        String groupName = Optional.ofNullable(apiDocGroup).orElse(Docket.DEFAULT_GROUP_NAME);
-        Documentation documentation = documentationCache.documentationByGroup(groupName);
-        if (documentation == null) {
-
-            // default to lowest alphabetically sorted group name
-            List<Map.Entry<String, Documentation>> entries = new ArrayList<>(documentationCache.all().entrySet());
-            Collections.sort(entries, Comparator.comparing(o -> o.getValue().getGroupName()));
-            Map.Entry<String, Documentation> firstEntry = entries.get(0);
-            if (firstEntry == null) {
-                return "Could not find group: " + groupName;
-            } else {
-                documentation = firstEntry.getValue();
-            }
-        }
-        Swagger apiDoc = mapper.mapDocumentation(documentation);
-        Json json = jsonSerializer.toJson(apiDoc);
-        return json.value();
-    }
-}
diff --git a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/SpringBootTestClassForIntegrationEnablement.java b/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/SpringBootTestClassForIntegrationEnablement.java
deleted file mode 100644
index 4a13bc373f..0000000000
--- a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/SpringBootTestClassForIntegrationEnablement.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml;
-
-import org.zowe.apiml.enable.EnableApiDiscovery;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.ComponentScan;
-
-@SpringBootApplication
-@ComponentScan("org.zowe.apiml.enable")
-@EnableApiDiscovery
-@EnableConfigurationProperties
-public class SpringBootTestClassForIntegrationEnablement {
-    public static void main(String[] args) {
-        SpringApplication.run(SpringBootTestClassForIntegrationEnablement.class, args);
-    }
-}
diff --git a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/controllers/ContextPathTestController.java b/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/controllers/ContextPathTestController.java
deleted file mode 100644
index 6458faf2b3..0000000000
--- a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/controllers/ContextPathTestController.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.controllers;
-
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Data
-@RestController
-@RequestMapping("/")
-public class ContextPathTestController {
-
-    private final String contextPath;
-
-    @Autowired
-    public ContextPathTestController(
-        @Value("${server.contextPath}") final String contextPath) {
-        this.contextPath = contextPath;
-    }
-
-    @GetMapping(value = "/context")
-    public String getContextPath() {
-        return this.contextPath;
-    }
-}
diff --git a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/controllers/V3Controller.java b/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/controllers/V3Controller.java
deleted file mode 100644
index 7373829cc8..0000000000
--- a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/controllers/V3Controller.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.controllers;
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/api/v3")
-public class V3Controller {
-
-    @GetMapping(value = "/hello")
-    public String invoke() {
-        return "Hello from V3";
-    }
-}
diff --git a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/controllers/v1/V1Controller.java b/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/controllers/v1/V1Controller.java
deleted file mode 100644
index 9ac4e66812..0000000000
--- a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/controllers/v1/V1Controller.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.controllers.v1;
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/api/v1")
-public class V1Controller {
-
-    @GetMapping(value = "/hello")
-    public String invoke() {
-        return "Hello from V1";
-    }
-}
diff --git a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/controllers/v2/V2Controller.java b/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/controllers/v2/V2Controller.java
deleted file mode 100644
index 6e7be5f217..0000000000
--- a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/controllers/v2/V2Controller.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.controllers.v2;
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/api/v2")
-public class V2Controller {
-
-    @GetMapping(value = "/hello")
-    public String invoke() {
-        return "Hello from V2";
-    }
-}
diff --git a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/health/EndpointsTest.java b/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/health/EndpointsTest.java
deleted file mode 100644
index e9373cb982..0000000000
--- a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/health/EndpointsTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.health;
-
-import org.zowe.apiml.SpringBootTestClassForIntegrationEnablement;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.endpoint.InfoEndpoint;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
-import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.web.context.WebApplicationContext;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-    properties = {
-        "management.context-path=/application",
-        "spring.application.name=test-endpoints",
-    },
-    classes = {SpringBootTestClassForIntegrationEnablement.class})
-@DirtiesContext
-public class EndpointsTest {
-
-    @Autowired
-    private WebApplicationContext context;
-
-    private MockMvc mvc;
-
-    /**
-     * Called before each test.
-     */
-    @Before
-    public void setUp() {
-        this.context.getBean(InfoEndpoint.class).setEnabled(true);
-        this.mvc = MockMvcBuilders.webAppContextSetup(this.context).build();
-    }
-
-    /**
-     * Test for info page.
-     *
-     * @throws Exception On failure.
-     */
-    @Test
-    public void info()
-            throws Exception {
-        this.mvc.perform(MockMvcRequestBuilders.get("/application/info"))
-                .andExpect(MockMvcResultMatchers.status().isOk());
-    }
-
-    /**
-     * Test for health page.
-     *
-     * @throws Exception On failure.
-     */
-    @Test
-    public void health()
-        throws Exception {
-        this.mvc.perform(MockMvcRequestBuilders.get("/application/health"))
-            .andExpect(MockMvcResultMatchers.status().isOk());
-    }
-}
diff --git a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/swagger/ScannedSwaggerTests.java b/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/swagger/ScannedSwaggerTests.java
deleted file mode 100644
index ccc7a4d92f..0000000000
--- a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/swagger/ScannedSwaggerTests.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.swagger;
-
-import org.zowe.apiml.SpringBootTestClassForIntegrationEnablement;
-import org.zowe.apiml.enable.api.ApiDocController;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.io.IOException;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(
-    webEnvironment = SpringBootTest.WebEnvironment.MOCK,
-    properties = {
-        "eureka.client.enabled=false",
-        "mfaas.discovery.info.swaggerLocation="
-    },
-    classes = {SpringBootTestClassForIntegrationEnablement.class}
-)
-public class ScannedSwaggerTests {
-
-    @Autowired
-    private ApiDocController apiDocController;
-
-    @Test
-    public void contextLoads() {
-        Assert.assertNotNull(apiDocController);
-    }
-
-    @SuppressWarnings("Duplicates")
-    @Test
-    public void givenNoSwaggerLocationThenAutoscanForSwagger() throws IOException {
-        String apiDoc = apiDocController.getApiDoc(null);
-        Assert.assertNotNull(apiDoc);
-        ObjectMapper mapper = new ObjectMapper();
-
-        JsonNode rootNode = mapper.readValue(apiDoc, JsonNode.class);
-        JsonNode description = rootNode.path("info").path("description");
-        JsonNode version = rootNode.path("info").path("version");
-        Assert.assertNotNull(description);
-        Assert.assertNotNull(version);
-        Assert.assertEquals("Sample micro-service showing how to enable a Spring Boot v1.5.9 application"
-            , description.asText());
-        Assert.assertEquals("1.0.0", version.asText());
-    }
-}
diff --git a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/swagger/ScannedSwaggerTests2.java b/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/swagger/ScannedSwaggerTests2.java
deleted file mode 100644
index c240f30477..0000000000
--- a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/swagger/ScannedSwaggerTests2.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.swagger;
-
-import org.zowe.apiml.SpringBootTestClassForIntegrationEnablement;
-import org.zowe.apiml.enable.api.ApiDocController;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.io.IOException;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(
-    webEnvironment = SpringBootTest.WebEnvironment.MOCK,
-    properties = {
-        "eureka.client.fetchRegistry=false",
-        "eureka.client.registerWithEureka=false"
-    },
-    classes = {SpringBootTestClassForIntegrationEnablement.class}
-)
-public class ScannedSwaggerTests2 {
-
-    @Autowired
-    private ApiDocController apiDocController;
-
-    @SuppressWarnings("Duplicates")
-    @Test
-    public void givenNoSwaggerLocationThenAutoscanForSwagger() throws IOException {
-        String apiDoc = apiDocController.getApiDoc(null);
-        Assert.assertNotNull(apiDoc);
-        ObjectMapper mapper = new ObjectMapper();
-
-        JsonNode rootNode = mapper.readValue(apiDoc, JsonNode.class);
-        JsonNode description = rootNode.path("info").path("description");
-        JsonNode version = rootNode.path("info").path("version");
-        Assert.assertNotNull(description);
-        Assert.assertNotNull(version);
-        Assert.assertEquals("Sample micro-service showing how to enable a Spring Boot v1.5.9 application"
-            , description.asText());
-        Assert.assertEquals("1.0.0", version.asText());
-    }
-}
diff --git a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/swagger/StaticSwaggerFailureTests.java b/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/swagger/StaticSwaggerFailureTests.java
deleted file mode 100644
index bc21cb19e7..0000000000
--- a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/swagger/StaticSwaggerFailureTests.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.swagger;
-
-import org.zowe.apiml.SpringBootTestClassForIntegrationEnablement;
-import org.zowe.apiml.enable.api.ApiDocController;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(
-    webEnvironment = SpringBootTest.WebEnvironment.MOCK,
-    properties = {
-        "eureka.client.enabled=false",
-        "mfaas.discovery.info.swaggerLocation=missing_swagger.json"
-    },
-    classes = {SpringBootTestClassForIntegrationEnablement.class}
-)
-public class StaticSwaggerFailureTests {
-
-    @Autowired
-    private ApiDocController apiDocController;
-
-    @Test(expected = FileNotFoundException.class)
-    public void givenASwaggerLocationThatDoesntExistThenFail() throws IOException {
-        apiDocController.getApiDoc(null);
-    }
-}
diff --git a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/swagger/StaticSwaggerLoaderTests.java b/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/swagger/StaticSwaggerLoaderTests.java
deleted file mode 100644
index e32aa5231e..0000000000
--- a/integration-enabler-spring-v1/src/test/java/org/zowe/apiml/enable/swagger/StaticSwaggerLoaderTests.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.swagger;
-
-import org.zowe.apiml.SpringBootTestClassForIntegrationEnablement;
-import org.zowe.apiml.enable.api.ApiDocController;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.io.IOException;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(
-    webEnvironment = SpringBootTest.WebEnvironment.MOCK,
-    properties = {
-        "eureka.client.enabled=false",
-        "mfaas.discovery.info.swaggerLocation=swagger.json"
-    },
-    classes = {SpringBootTestClassForIntegrationEnablement.class}
-)
-public class StaticSwaggerLoaderTests {
-
-    @Autowired
-    private ApiDocController apiDocController;
-
-    @Test
-    public void givenASwaggerLocationThenLoadTheSwaggerFileNotAutoscan() throws IOException {
-        String apiDoc = apiDocController.getApiDoc(null);
-        Assert.assertNotNull(apiDoc);
-        ObjectMapper mapper = new ObjectMapper();
-
-        JsonNode rootNode = mapper.readValue(apiDoc, JsonNode.class);
-        JsonNode description = rootNode.path("info").path("description");
-        JsonNode version = rootNode.path("info").path("version");
-        Assert.assertNotNull(description);
-        Assert.assertNotNull(version);
-        Assert.assertEquals("Static Swagger Info for Sample micro-service " +
-            "showing how to enable a Spring Boot v1.x application", description.asText());
-        Assert.assertEquals("1.0.1", version.asText());
-    }
-}
diff --git a/integration-enabler-spring-v1/src/test/resources/application.yml b/integration-enabler-spring-v1/src/test/resources/application.yml
deleted file mode 100644
index a6d682243b..0000000000
--- a/integration-enabler-spring-v1/src/test/resources/application.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-spring:
-    application:
-        name: enablerv1sampleapp
-    output:
-        ansi:
-            enabled: always
-
-logging:
-    level:
-        ROOT: INFO
-        org.springframework: INFO
-        org.zowe.apiml: DEBUG
-
-##############################################################################################
-# MFAAS configuration section
-##############################################################################################
-mfaas:
-    discovery:
-        serviceId: ${environment.serviceId}
-        locations: ${environment.discoveryLocations}
-        enabled: ${environment.discoveryEnabled:true}
-        endpoints:
-            statusPage: ${mfaas.server.scheme}://${mfaas.service.hostname}:${mfaas.server.port}${mfaas.server.contextPath}/application/info
-            healthPage: ${mfaas.server.scheme}://${mfaas.service.hostname}:${mfaas.server.port}${mfaas.server.contextPath}/application/health
-            homePage:
-        info:
-            serviceTitle: ${environment.serviceTitle}
-            description:  ${environment.serviceDescription}
-            swaggerLocation: # populate this value with a json file from the resources folder to load a static swagger definition
-        fetchRegistry: false
-        region: default
-    service:
-        hostname: ${environment.hostname}
-        ipAddress: ${environment.ipAddress}
-    catalog-ui-tile:
-        id: cademoapps
-        title: Sample MFaaS applications
-        description: Applications which demonstrate how to make a service discoverable in the MFaaS ecosystem
-        version:  1.0.0
-    server:
-        port: ${environment.port}
-        contextPath: /${spring.application.name}
-        scheme: http
-
-eureka:
-    instance:
-        appName: ${mfaas.discovery.serviceId}
-        hostname: ${mfaas.service.hostname}
-        statusPageUrlPath: ${mfaas.discovery.endpoints.statusPage}
-        healthCheckUrlPath: ${mfaas.discovery.endpoints.healthPage}
-        homePageUrlPath: ${mfaas.discovery.endpoints.homePage}
-        metadata-map:
-            routed-services:
-                api_v1:
-                    gateway-url: "api/v1"
-                    service-url: ${mfaas.server.contextPath}/api/v1
-                api-doc:
-                    gateway-url: "api/v1/api-doc"
-                    service-url: ${mfaas.server.contextPath}/api-doc
-            mfaas:
-                api-info:
-                    swagger:
-                        location: ${mfaas.discovery.info.swaggerLocation:}
-                    apiVersionProperties:
-                        v1:
-                            title: Service Integration Enabler V1 Sample App (spring boot 1.x)
-                            description: Sample micro-service showing how to enable a Spring Boot v1.5.9 application
-                            version: 1.0.0
-                            basePackage: org.zowe.apiml.sample.enable.v1.controller
-                discovery:
-                    catalogUiTile:
-                        id: ${mfaas.catalog-ui-tile.id}
-                        title:  ${mfaas.catalog-ui-tile.title}
-                        description: ${mfaas.catalog-ui-tile.description}
-                        version: ${mfaas.catalog-ui-tile.version}
-                    enableApiDoc: ${mfaas.discovery.info.enableApiDoc:true}
-                    service:
-                        title: ${mfaas.discovery.info.serviceTitle}
-                        description: ${mfaas.discovery.info.description}
-    client:
-        healthcheck:
-            enabled: true
-        serviceUrl:
-            defaultZone: ${mfaas.discovery.locations}
-        fetchRegistry:  ${mfaas.discovery.fetchRegistry}
-        region: ${mfaas.discovery.region}
-        enabled: ${mfaas.discovery.enabled}
-
-##############################################################################################
-management:
-    context-path: /application
-
-server:
-    address: ${mfaas.service.hostname}
-    port: ${mfaas.server.port}
-    contextPath: ${mfaas.server.contextPath}
-    ssl:
-        enabled: false
-        protocol: TLS
-
diff --git a/integration-enabler-spring-v1/src/test/resources/bootstrap.yml b/integration-enabler-spring-v1/src/test/resources/bootstrap.yml
deleted file mode 100644
index 2eb744820a..0000000000
--- a/integration-enabler-spring-v1/src/test/resources/bootstrap.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-environment:
-    hostname: localhost
-    port: 10021
-    discoveryLocations: http://eureka:password@localhost:10011/eureka/
-    preferIpAddress: false
-    ipAddress: 127.0.0.1
-    serverIpAddress: 127.0.0.1
-    serviceTitle: samplev1client
-    serviceDescription: Sample V1 Client
-
diff --git a/integration-enabler-spring-v1/src/test/resources/swagger.json b/integration-enabler-spring-v1/src/test/resources/swagger.json
deleted file mode 100644
index 2976370913..0000000000
--- a/integration-enabler-spring-v1/src/test/resources/swagger.json
+++ /dev/null
@@ -1,474 +0,0 @@
-{
-    "swagger": "2.0",
-    "info": {
-        "description": "Static Swagger Info for Sample micro-service showing how to enable a Spring Boot v1.x application",
-        "version": "1.0.1",
-        "title": "Service Integration Enabler V1 Sample App (spring boot 1.x)"
-    },
-    "basePath": "/samplev1client",
-    "tags": [
-        {
-            "name": "Instance",
-            "description": "Instance Controller"
-        },
-        {
-            "name": "Movie",
-            "description": "Movie Controller"
-        },
-        {
-            "name": "Suspects",
-            "description": "Suspects Controller"
-        }
-    ],
-    "paths": {
-        "/instance/configured-port": {
-            "get": {
-                "tags": [
-                    "Instance"
-                ],
-                "summary": "What port is this controller configured for",
-                "description": "What port is this controller configured for",
-                "operationId": "getPortUsingGET",
-                "produces": [
-                    "text/plain"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    "401": {
-                        "description": "Unauthorized"
-                    },
-                    "403": {
-                        "description": "Forbidden"
-                    },
-                    "404": {
-                        "description": "URI not found"
-                    }
-                }
-            }
-        },
-        "/instance/gateway-url": {
-            "get": {
-                "tags": [
-                    "Instance"
-                ],
-                "summary": "What is the URI of the Gateway",
-                "description": "What is the URI of the Gateway",
-                "operationId": "getGatewayLocationUsingGET",
-                "produces": [
-                    "text/plain"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    "401": {
-                        "description": "Unauthorized"
-                    },
-                    "403": {
-                        "description": "Forbidden"
-                    },
-                    "404": {
-                        "description": "URI not found"
-                    },
-                    "500": {
-                        "description": "Internal Error Occurred"
-                    }
-                }
-            }
-        },
-        "/movies/list": {
-            "get": {
-                "tags": [
-                    "Movie"
-                ],
-                "summary": "Retrieve all movies",
-                "description": "Return a list of movies",
-                "operationId": "listUsingGET",
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "type": "array",
-                            "items": {
-                                "$ref": "#/definitions/Movie"
-                            }
-                        }
-                    },
-                    "401": {
-                        "description": "Unauthorized"
-                    },
-                    "403": {
-                        "description": "Forbidden"
-                    },
-                    "404": {
-                        "description": "URI not found"
-                    }
-                },
-                "security": [
-                    {
-                        "MoieControlleroauth": [
-                            "list"
-                        ]
-                    }
-                ]
-            }
-        },
-        "/movies/show/{id}": {
-            "get": {
-                "tags": [
-                    "Movie"
-                ],
-                "summary": "Retrieve a movie",
-                "description": "Return a movie for a given {id}",
-                "operationId": "showMovieUsingGET",
-                "produces": [
-                    "application/json"
-                ],
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "description": "id",
-                        "required": true,
-                        "type": "integer",
-                        "format": "int32"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/Movie"
-                        }
-                    },
-                    "401": {
-                        "description": "Unauthorized"
-                    },
-                    "403": {
-                        "description": "Forbidden"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        },
-        "/suspects/add": {
-            "post": {
-                "tags": [
-                    "Suspects"
-                ],
-                "summary": "Save a suspect",
-                "description": "Persists a suspect",
-                "operationId": "saveSuspectUsingPOST",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "suspect",
-                        "description": "suspect",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/Suspect"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    "201": {
-                        "description": "Created"
-                    },
-                    "401": {
-                        "description": "Unauthorized"
-                    },
-                    "403": {
-                        "description": "Forbidden"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        },
-        "/suspects/delete/{id}": {
-            "delete": {
-                "tags": [
-                    "Suspects"
-                ],
-                "summary": "Deletes a suspect",
-                "description": "Deletes a suspect",
-                "operationId": "deleteUsingDELETE",
-                "produces": [
-                    "application/json"
-                ],
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "description": "id",
-                        "required": true,
-                        "type": "integer",
-                        "format": "int32"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    "204": {
-                        "description": "No Content"
-                    },
-                    "401": {
-                        "description": "Unauthorized"
-                    },
-                    "403": {
-                        "description": "Forbidden"
-                    }
-                }
-            }
-        },
-        "/suspects/list": {
-            "get": {
-                "tags": [
-                    "Suspects"
-                ],
-                "summary": "Retrieve all movies",
-                "description": "Return a list of movies",
-                "operationId": "listUsingGET_1",
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "type": "array",
-                            "items": {
-                                "$ref": "#/definitions/Suspect"
-                            }
-                        }
-                    },
-                    "401": {
-                        "description": "Unauthorized"
-                    },
-                    "403": {
-                        "description": "Forbidden"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        },
-        "/suspects/show/{id}": {
-            "get": {
-                "tags": [
-                    "Suspects"
-                ],
-                "summary": "Retrieve a suspect",
-                "description": "Return a suspect for a given {id}",
-                "operationId": "showSuspectUsingGET",
-                "produces": [
-                    "application/json"
-                ],
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "description": "id",
-                        "required": true,
-                        "type": "integer",
-                        "format": "int32"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/Suspect"
-                        }
-                    },
-                    "401": {
-                        "description": "Unauthorized"
-                    },
-                    "403": {
-                        "description": "Forbidden"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        },
-        "/suspects/update/{id}": {
-            "put": {
-                "tags": [
-                    "Suspects"
-                ],
-                "summary": "Updates a suspect",
-                "description": "Updates a suspect",
-                "operationId": "updateSuspectUsingPUT",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "description": "id",
-                        "required": true,
-                        "type": "integer",
-                        "format": "int32"
-                    },
-                    {
-                        "in": "body",
-                        "name": "suspect",
-                        "description": "suspect",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/Suspect"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    "201": {
-                        "description": "Created"
-                    },
-                    "401": {
-                        "description": "Unauthorized"
-                    },
-                    "403": {
-                        "description": "Forbidden"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        }
-    },
-    "definitions": {
-        "Iterable«Movie»": {
-            "type": "object",
-            "title": "Iterable«Movie»"
-        },
-        "Iterable«Suspect»": {
-            "type": "object",
-            "title": "Iterable«Suspect»"
-        },
-        "Movie": {
-            "type": "object",
-            "properties": {
-                "description": {
-                    "type": "string",
-                    "example": "Episode IV",
-                    "description": "The description of the movie",
-                    "allowEmptyValue": false
-                },
-                "id": {
-                    "type": "integer",
-                    "format": "int32",
-                    "example": 1,
-                    "description": "The database generated movie ID",
-                    "allowEmptyValue": false
-                },
-                "name": {
-                    "type": "string",
-                    "example": "Star Wars",
-                    "description": "The movie name",
-                    "allowEmptyValue": false
-                },
-                "version": {
-                    "type": "integer",
-                    "format": "int32",
-                    "example": 1,
-                    "description": "The auto-generated version of the movie",
-                    "allowEmptyValue": false
-                }
-            },
-            "title": "Movie",
-            "description": "A Movie Database Object"
-        },
-        "Suspect": {
-            "type": "object",
-            "required": [
-                "description"
-            ],
-            "properties": {
-                "actorname": {
-                    "type": "string",
-                    "description": "The name of the actor who played the suspect",
-                    "allowEmptyValue": false
-                },
-                "description": {
-                    "type": "string",
-                    "description": "The description of the suspect",
-                    "allowEmptyValue": false
-                },
-                "id": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "The database generated suspect ID",
-                    "allowEmptyValue": false
-                },
-                "imageUrl": {
-                    "type": "string",
-                    "description": "The image URL of the actor",
-                    "allowEmptyValue": false
-                },
-                "name": {
-                    "type": "string",
-                    "description": "The suspect name",
-                    "allowEmptyValue": false
-                },
-                "suspectId": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "The application-specific suspect ID",
-                    "allowEmptyValue": false
-                },
-                "version": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "The auto-generated version of the suspect",
-                    "allowEmptyValue": false
-                }
-            },
-            "title": "Suspect",
-            "description": "A Suspect Database Object"
-        }
-    }
-}
diff --git a/integration-enabler-spring-v2/README.md b/integration-enabler-spring-v2/README.md
deleted file mode 100644
index dffb10310b..0000000000
--- a/integration-enabler-spring-v2/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Service Integration Enabler for Spring Boot applications
-
-This library enables Spring Boot REST API services to integration with MFaaS ecosystem 
-and make their APIs available via MFaaS API Gateway and API Catalog.
-
-It allows documentation REST endpoints to be exposed in Swagger format.
-
-You can find detailed documentations in our [docs][Documentation].
-
-[Documentation]: https://github.com/zowe/Giza-docs/tree/master/topics/api-mediation/onboard-an-existing-spring-boot-rest-api-service.md
diff --git a/integration-enabler-spring-v2/build.gradle b/integration-enabler-spring-v2/build.gradle
deleted file mode 100644
index 9787375e40..0000000000
--- a/integration-enabler-spring-v2/build.gradle
+++ /dev/null
@@ -1,38 +0,0 @@
-buildscript {
-    repositories mavenRepositories
-    dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-    }
-}
-
-apply plugin: 'io.spring.dependency-management'
-
-jar {
-    baseName = "enabler-springboot-${springBootVersion}"
-    archiveName = "${baseName}.jar"
-}
-
-dependencies {
-    compile(project(':common-service-core'))
-
-    compile libraries.springFox
-    compile libraries.springFoxWeb
-    compile libraries.javax_validation
-    compile libraries.spring_cloud_starter_eureka
-    compile libraries.spring_boot_starter_actuator
-
-    compileOnly libraries.lombok
-    compileOnly libraries.spring_boot_starter_web
-    compileOnly libraries.javax_servlet_api
-
-    testCompile libraries.gson
-    testCompile libraries.powermock_api_mockito2
-    testCompile libraries.power_mock_junit4
-    testCompile libraries.power_mock_junit4_rule
-    testCompile libraries.spring_boot_starter_web
-    testCompile libraries.spring_boot_starter_test
-    testCompile libraries.lombok
-    testCompile libraries.javax_servlet_api
-    testCompile libraries.snakeyaml
-    testCompile libraries.javax_servlet_api
-}
diff --git a/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/EnableApiDiscovery.java b/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/EnableApiDiscovery.java
deleted file mode 100644
index cdf25b9cbd..0000000000
--- a/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/EnableApiDiscovery.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable;
-
-import org.zowe.apiml.enable.model.ApiPropertiesContainer;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-import java.lang.annotation.*;
-
-@Configuration
-@ComponentScan
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-@EnableConfigurationProperties(value = {ApiPropertiesContainer.class})
-public @interface EnableApiDiscovery {
-
-}
diff --git a/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/EnablerV2SpringFoxConfig.java b/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/EnablerV2SpringFoxConfig.java
deleted file mode 100644
index 774df6fba1..0000000000
--- a/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/EnablerV2SpringFoxConfig.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable;
-
-import org.zowe.apiml.enable.conditions.ConditionalOnMissingProperty;
-import org.zowe.apiml.enable.model.ApiDocConfigException;
-import org.zowe.apiml.enable.model.ApiPropertiesContainer;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-import java.util.Collections;
-
-import static springfox.documentation.builders.PathSelectors.regex;
-
-@SuppressWarnings("Duplicates")
-@Slf4j
-@ConditionalOnProperty(prefix = "eureka.instance.metadata-map.mfaas.discovery", value = "enableApiDoc", havingValue = "true", matchIfMissing = true)
-@ConditionalOnMissingProperty("eureka.instance.metadata-map.mfaas.api-info.swagger.location")
-@Configuration
-@EnableSwagger2
-public class EnablerV2SpringFoxConfig {
-
-    @Autowired
-    public EnablerV2SpringFoxConfig(ApiPropertiesContainer apiPropertiesContainer,
-                                    DefaultListableBeanFactory beanFactory) {
-        apiPropertiesContainer.getApiVersionProperties().forEach((apiVersion, apiInfo) -> {
-            Docket apiDocketBean;
-            try {
-                apiDocketBean = generateDocket(apiVersion, apiInfo);
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-                return;
-            }
-
-            // create a bean name based on the group
-            String beanName = apiVersion.trim() + "_API";
-            beanFactory.initializeBean(apiDocketBean, beanName);
-            beanFactory.autowireBeanProperties(apiDocketBean,
-                AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, true);
-            beanFactory.registerSingleton(beanName, apiDocketBean);
-            log.info("Generated bean: " + beanName + " for API version: " + apiVersion.trim());
-        });
-    }
-
-    /**
-     * Generate a docket for this API version
-     *
-     * @param apiVersion the version of the API
-     * @param apiInfo the API Info
-     * @return a SpringFox docket
-     * @throws ApiDocConfigException in case of error
-     */
-    private Docket generateDocket(String apiVersion, ApiPropertiesContainer.ApiProperties apiInfo) {
-        String groupName = apiVersion;
-        if (apiInfo.getGroupName() != null && !apiInfo.getGroupName().isEmpty()) {
-            groupName = apiInfo.getGroupName();
-        }
-        if (apiInfo.getBasePackage() == null && apiInfo.getApiPattern() == null) {
-            return new Docket(DocumentationType.SWAGGER_2)
-                .select()
-                .apis(RequestHandlerSelectors.any())
-                .build()
-                .apiInfo(
-                    new ApiInfo(apiInfo.getTitle(),
-                        apiInfo.getDescription(),
-                        apiInfo.getVersion(),
-                       null,
-                        null,
-                        null,
-                        null,
-                        Collections.emptyList()))
-                .groupName(groupName);
-        } else if (apiInfo.getBasePackage() != null && !apiInfo.getBasePackage().isEmpty()) {
-            return new Docket(DocumentationType.SWAGGER_2)
-                .select()
-                .apis(RequestHandlerSelectors.basePackage(apiInfo.getBasePackage()))
-                .build()
-                .apiInfo(
-                    new ApiInfo(apiInfo.getTitle(),
-                        apiInfo.getDescription(),
-                        apiInfo.getVersion(),
-                        null,
-                        null,
-                        null,
-                        null,
-                        Collections.emptyList()))
-                .groupName(groupName);
-        } else if (apiInfo.getApiPattern() != null && !apiInfo.getApiPattern().isEmpty()) {
-            return new Docket(DocumentationType.SWAGGER_2)
-                .select()
-                .paths(regex(apiInfo.getApiPattern()))
-                .build()
-                .apiInfo(
-                    new ApiInfo(apiInfo.getTitle(),
-                        apiInfo.getDescription(),
-                        apiInfo.getVersion(),
-                        null,
-                        null,
-                        null,
-                        null,
-                        Collections.emptyList()))
-                .groupName(groupName);
-        } else {
-            String msg = "A base package or API pattern was not found for version: " + apiVersion;
-            ApiDocConfigException t = new ApiDocConfigException(msg);
-            log.error(msg, t);
-            throw t;
-        }
-    }
-}
diff --git a/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/api/ApiDocController.java b/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/api/ApiDocController.java
deleted file mode 100644
index dda0f4109f..0000000000
--- a/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/api/ApiDocController.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.api;
-
-
-import org.zowe.apiml.enable.services.LocalApiDocService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.http.MediaType;
-import org.springframework.util.FileCopyUtils;
-import org.springframework.util.ResourceUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Nullable;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-
-import static org.springframework.util.ResourceUtils.CLASSPATH_URL_PREFIX;
-
-/**
- * Controller for handling retrieval of API doc via the gateway
- */
-@Slf4j
-@RestController
-@RequestMapping("/")
-@ConditionalOnProperty(prefix = "eureka.instance.metadata-map.mfaas.discovery", value = "enableApiDoc", havingValue = "true", matchIfMissing = true)
-public class ApiDocController {
-
-    private final boolean apiDocEnabled;
-    private String swaggerLocation;
-    private LocalApiDocService localApiDocService;
-
-    /**
-     * API Doc retrieval controller
-     * Autowire in dependencies to controller
-     * @param apiDocEnabled does the service have API Documentation
-     * @param swaggerLocation optional parameter to tell the controller where to load a static swagger file
-     * @param localApiDocService retrieve the API doc locally and not through the gateway
-     */
-    @Autowired
-    public ApiDocController(
-        @Value("${eureka.instance.metadata-map.mfaas.discovery.enableApiDoc:true}") boolean apiDocEnabled,
-        @Value("${eureka.instance.metadata-map.mfaas.api-info.swagger.location:}") String swaggerLocation,
-        @Nullable LocalApiDocService localApiDocService)  {
-        this.apiDocEnabled = apiDocEnabled;
-        this.swaggerLocation = swaggerLocation;
-        this.localApiDocService = localApiDocService;
-    }
-
-    /**
-     * Retrieve the API doc for the given group (or default to the first alphanumeric version tag)
-     * @param apiDocGroup the group to retrieve
-     * @return the API doc for a group
-     * @throws IOException when loading the swagger resource fails
-     */
-    @GetMapping(value = "/api-doc", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public String getApiDoc(@RequestParam(value = "group", required = false) String apiDocGroup) throws IOException {
-        if (swaggerLocation == null || swaggerLocation.isEmpty()) {
-            return this.localApiDocService.getApiDoc(apiDocGroup);
-        } else {
-            return loadApiDocumentationFromStaticResourceFileAsJson();
-        }
-    }
-
-    /**
-     * Load the swagger/api doc info from a local resource file
-     * @return the swagger as a String
-     * @throws IOException when reading the file fails
-     */
-    private String loadApiDocumentationFromStaticResourceFileAsJson() throws IOException {
-        log.debug("Loading Api Documentation from static resource: " + swaggerLocation);
-        try {
-            if (!swaggerLocation.startsWith(CLASSPATH_URL_PREFIX)) {
-                swaggerLocation = CLASSPATH_URL_PREFIX + swaggerLocation.trim();
-            }
-            try {
-                File file = ResourceUtils.getFile(swaggerLocation);
-                if (!file.exists()) {
-                    return loadDocumentationAsFileInJar();
-                } else {
-                    return new String(Files.readAllBytes(file.toPath()));
-                }
-            } catch (FileNotFoundException e) {
-                return loadDocumentationAsFileInJar();
-            }
-        } catch (IOException e) {
-            log.error("An exception occurred when attempting to retrieve swagger file: "
-                + swaggerLocation + ". " + e.getMessage(), e);
-            throw e;
-        }
-    }
-
-    /**
-     * Load the swagger as a file system file in a jar
-     * @return the swagger as a string
-     * @throws IOException if something bad happened
-     */
-    private String loadDocumentationAsFileInJar() throws IOException {
-        log.debug("Loading Api Documentation from jar resource: " + swaggerLocation);
-        ClassPathResource cpr = new ClassPathResource(swaggerLocation);
-        try {
-            byte[] bytes = FileCopyUtils.copyToByteArray(cpr.getInputStream());
-            return new String(bytes, StandardCharsets.UTF_8);
-        } catch (IOException e) {
-            throw new IOException("Cannot find Api Documentation (swagger) file: " + swaggerLocation);
-        }
-    }
-
-    /**
-     * Is API Doc enabled for the implementing service
-     * @return true if enabled
-     */
-    @GetMapping(value = "/api-doc/enabled", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public boolean isApiDocEnabled()  {
-        return this.apiDocEnabled;
-    }
-}
diff --git a/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/conditions/ConditionalOnMissingProperty.java b/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/conditions/ConditionalOnMissingProperty.java
deleted file mode 100644
index 0df2d5e428..0000000000
--- a/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/conditions/ConditionalOnMissingProperty.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.conditions;
-
-import org.springframework.boot.autoconfigure.condition.ConditionMessage;
-import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
-import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
-import org.springframework.context.annotation.ConditionContext;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.core.type.AnnotatedTypeMetadata;
-import org.springframework.util.MultiValueMap;
-
-import java.lang.annotation.*;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.METHOD})
-@Documented
-@Conditional(ConditionalOnMissingProperty.OnMissingPropertyCondition.class)
-public @interface ConditionalOnMissingProperty {
-
-    String[] value();
-
-    @Order(Ordered.HIGHEST_PRECEDENCE + 40)
-    @SuppressWarnings({"Duplicates","squid:S134"})
-    class OnMissingPropertyCondition extends SpringBootCondition {
-
-        @Override
-        public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
-            MultiValueMap<String, Object> annotationAttributes
-                = metadata.getAllAnnotationAttributes(ConditionalOnMissingProperty.class.getName());
-            if (!annotationAttributes.isEmpty()) {
-                ConditionOutcome conditionOutcome = null;
-                for (Object values : annotationAttributes.get("value")) {
-                    for (String propertyName : (String[]) values) {
-                        if (context.getEnvironment().containsProperty(propertyName)) {
-                            conditionOutcome = checkPropertyValueForNullOrEmpty(context, propertyName);
-                        }
-                        if (conditionOutcome != null && !conditionOutcome.isMatch()) {
-                            return ConditionOutcome.noMatch(ConditionMessage.of("At least one property with a value was found."));
-                        }
-                    }
-                }
-            }
-
-            // return match if no matching property was found:
-            return ConditionOutcome.match(ConditionMessage.of("None of the given properties found"));
-        }
-
-        private ConditionOutcome checkPropertyValueForNullOrEmpty(ConditionContext context, String propertyName) {
-            ConditionOutcome conditionOutcome;
-            try {
-                conditionOutcome = checkPropertyContentsForEmptyMatch(context, propertyName);
-            } catch (Exception e) {
-                conditionOutcome = ConditionOutcome.match(ConditionMessage.of("Property found"));
-            }
-            return conditionOutcome;
-        }
-
-        /**
-         * Check the value of the property, an empty or null value should be considered as a no match
-         * @param context condition context
-         * @param propertyName the property
-         * @return not match found or match with a value
-         */
-        private ConditionOutcome checkPropertyContentsForEmptyMatch(ConditionContext context, String propertyName) {
-            String propertyValue = context.getEnvironment().getProperty(propertyName, "");
-            if (!propertyValue.isEmpty()) {
-                // return NO match if there is a property of the given name with a non null/non empty value
-                return ConditionOutcome.noMatch(ConditionMessage.of("Found property " + propertyName + " with value: " + propertyValue));
-            } else {
-                return ConditionOutcome.match(ConditionMessage.of("Found property " + propertyName + " with an empty/null value"));
-            }
-        }
-    }
-}
diff --git a/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/discovery/EurekaClientSecurityConfiguration.java b/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/discovery/EurekaClientSecurityConfiguration.java
deleted file mode 100644
index 51459e09fc..0000000000
--- a/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/discovery/EurekaClientSecurityConfiguration.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.discovery;
-
-import org.zowe.apiml.security.HttpsConfig;
-import org.zowe.apiml.security.HttpsFactory;
-import com.netflix.discovery.DiscoveryClient;
-import com.netflix.discovery.shared.transport.jersey.EurekaJerseyClient;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import javax.annotation.PostConstruct;
-
-@Configuration
-@Slf4j
-public class EurekaClientSecurityConfiguration {
-    @Value("${server.ssl.protocol:TLSv1.2}")
-    private String protocol;
-
-    @Value("${spring.application.name}")
-    private String serviceId;
-
-    @Value("${eureka.client.serviceUrl.defaultZone}")
-    private String eurekaServerUrl;
-
-    @Value("${server.ssl.trustStore:#{null}}")
-    private String trustStore;
-
-    @Value("${server.ssl.trustStorePassword:#{null}}")
-    private String trustStorePassword;
-
-    @Value("${server.ssl.trustStoreType:PKCS12}")
-    private String trustStoreType;
-
-    @Value("${server.ssl.keyAlias:#{null}}")
-    private String keyAlias;
-
-    @Value("${server.ssl.keyStore:#{null}}")
-    private String keyStore;
-
-    @Value("${server.ssl.keyPassword:#{null}}")
-    private String keyPassword;
-
-    @Value("${server.ssl.keyStorePassword:#{null}}")
-    private String keyStorePassword;
-
-    @Value("${server.ssl.keyStoreType:PKCS12}")
-    private String keyStoreType;
-
-    @Value("${apiml.security.ssl.verifySslCertificatesOfServices:true}")
-    private boolean verifySslCertificatesOfServices;
-
-    private EurekaJerseyClient eurekaJerseyClient;
-
-    @PostConstruct
-    public void init() {
-        HttpsConfig httpsConfig = HttpsConfig.builder().keyAlias(keyAlias).protocol(protocol).keyStore(keyStore).keyPassword(keyPassword)
-                .keyStorePassword(keyStorePassword).keyStoreType(keyStoreType).trustStore(trustStore)
-                .trustStoreType(trustStoreType).trustStorePassword(trustStorePassword)
-                .verifySslCertificatesOfServices(verifySslCertificatesOfServices).build();
-
-        log.info("Using HTTPS configuration: {}", httpsConfig.toString());
-
-        HttpsFactory factory = new HttpsFactory(httpsConfig);
-        eurekaJerseyClient = factory.createEurekaJerseyClientBuilder(eurekaServerUrl, serviceId).build();
-    }
-
-    @Bean
-    public DiscoveryClient.DiscoveryClientOptionalArgs discoveryClientOptionalArgs() {
-        DiscoveryClient.DiscoveryClientOptionalArgs args = new DiscoveryClient.DiscoveryClientOptionalArgs();
-        args.setEurekaJerseyClient(eurekaJerseyClient);
-        return args;
-    }
-}
diff --git a/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/model/ApiDocConfigException.java b/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/model/ApiDocConfigException.java
deleted file mode 100644
index a150f0b1d9..0000000000
--- a/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/model/ApiDocConfigException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.model;
-
-public class ApiDocConfigException extends RuntimeException {
-
-    public ApiDocConfigException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ApiDocConfigException(String msg) {
-        super(msg);
-    }
-}
diff --git a/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/model/ApiPropertiesContainer.java b/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/model/ApiPropertiesContainer.java
deleted file mode 100644
index 59c294a8a3..0000000000
--- a/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/model/ApiPropertiesContainer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.model;
-
-import lombok.Data;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-import javax.validation.constraints.NotBlank;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Retrieve information about this service from application.yml, used to send information to the apiDoc discovery service
- */
-@Component
-@ConditionalOnProperty(prefix = "eureka.instance.metadata-map.mfaas.discovery", value = "enableApiDoc", havingValue = "true", matchIfMissing = true)
-@ConfigurationProperties("eureka.instance.metadata-map.mfaas.api-info")
-@Data
-public class ApiPropertiesContainer {
-
-    private Map<String, ApiProperties> apiVersionProperties = new HashMap<>();
-
-    @Data
-    public static class ApiProperties {
-
-        @NotBlank
-        private String title;
-
-        @NotBlank
-        private String description;
-
-        @NotBlank
-        private String version;
-
-        private String basePackage;
-        private String apiPattern;
-        private String groupName;
-    }
-}
diff --git a/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/services/LocalApiDocService.java b/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/services/LocalApiDocService.java
deleted file mode 100644
index 541369b71e..0000000000
--- a/integration-enabler-spring-v2/src/main/java/org/zowe/apiml/enable/services/LocalApiDocService.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.services;
-
-import org.zowe.apiml.enable.conditions.ConditionalOnMissingProperty;
-import io.swagger.models.Swagger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
-import springfox.documentation.service.Documentation;
-import springfox.documentation.spring.web.DocumentationCache;
-import springfox.documentation.spring.web.json.Json;
-import springfox.documentation.spring.web.json.JsonSerializer;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.mappers.ServiceModelToSwagger2Mapper;
-
-import java.util.*;
-
-@Service
-@ConditionalOnProperty(prefix = "eureka.instance.metadata-map.mfaas.discovery", value = "enableApiDoc", havingValue = "true", matchIfMissing = true)
-@ConditionalOnMissingProperty("eureka.instance.metadata-map.mfaas.api-info.swagger.location")
-public class LocalApiDocService {
-
-    private final DocumentationCache documentationCache;
-    private final JsonSerializer jsonSerializer;
-    private final ServiceModelToSwagger2Mapper mapper;
-
-    /**
-     * API Doc retrieval controller
-     * Autowire in dependencies to contoller
-     * @param documentationCache in memory cache of discovered API Docs
-     * @param jsonSerializer json serializer
-     * @param mapper json mapper
-     */
-    @Autowired
-    public LocalApiDocService(
-        DocumentationCache documentationCache,
-        JsonSerializer jsonSerializer,
-        ServiceModelToSwagger2Mapper mapper)  {
-        this.jsonSerializer = jsonSerializer;
-        this.mapper = mapper;
-        this.documentationCache = documentationCache;
-    }
-
-    /**
-     * Retrieve the API doc for this service
-     * @param apiDocGroup the API doc group to retrieve (can be null, the apply default)
-     * @return the swagger as a string
-     */
-    public String getApiDoc(String apiDocGroup)  {
-        String groupName = Optional.ofNullable(apiDocGroup).orElse(Docket.DEFAULT_GROUP_NAME);
-        Documentation documentation = documentationCache.documentationByGroup(groupName);
-        if (documentation == null) {
-
-            // default to lowest alphabetically sorted group name
-            List<Map.Entry<String, Documentation>> entries = new ArrayList<>(documentationCache.all().entrySet());
-            entries.sort(Comparator.comparing(o -> o.getValue().getGroupName()));
-            Map.Entry<String, Documentation> firstEntry = entries.get(0);
-            if (firstEntry == null) {
-                return "Could not find group: " + groupName;
-            } else {
-                documentation = firstEntry.getValue();
-            }
-        }
-        Swagger apiDoc = mapper.mapDocumentation(documentation);
-        Json json = jsonSerializer.toJson(apiDoc);
-        return json.value();
-    }
-}
diff --git a/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/SpringBootTestClassForIntegrationEnablement.java b/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/SpringBootTestClassForIntegrationEnablement.java
deleted file mode 100644
index 2401e11a52..0000000000
--- a/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/SpringBootTestClassForIntegrationEnablement.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
-import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
-import org.springframework.context.annotation.Bean;
-
-@SpringBootApplication
-public class SpringBootTestClassForIntegrationEnablement {
-    public static void main(String[] args) {
-        SpringApplication.run(SpringBootTestClassForIntegrationEnablement.class, args);
-    }
-
-    @Bean
-    public ServletWebServerFactory servletWebServerFactory() {
-        return new TomcatServletWebServerFactory();
-    }
-}
diff --git a/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/controllers/ContextPathTestController.java b/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/controllers/ContextPathTestController.java
deleted file mode 100644
index 847697a7ed..0000000000
--- a/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/controllers/ContextPathTestController.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.controllers;
-
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Data
-@RestController
-@RequestMapping("/")
-public class ContextPathTestController {
-
-    private final String contextPath;
-
-    @Autowired
-    public ContextPathTestController(
-        @Value("${server.contextPath:}") final String contextPath) {
-        this.contextPath = contextPath;
-    }
-
-    @GetMapping(value = "/context")
-    public String getContextPath() {
-        return this.contextPath;
-    }
-}
diff --git a/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/controllers/v1/V1Controller.java b/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/controllers/v1/V1Controller.java
deleted file mode 100644
index 9ac4e66812..0000000000
--- a/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/controllers/v1/V1Controller.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.controllers.v1;
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/api/v1")
-public class V1Controller {
-
-    @GetMapping(value = "/hello")
-    public String invoke() {
-        return "Hello from V1";
-    }
-}
diff --git a/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/controllers/v2/V2Controller.java b/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/controllers/v2/V2Controller.java
deleted file mode 100644
index 6e7be5f217..0000000000
--- a/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/controllers/v2/V2Controller.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.controllers.v2;
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/api/v2")
-public class V2Controller {
-
-    @GetMapping(value = "/hello")
-    public String invoke() {
-        return "Hello from V2";
-    }
-}
diff --git a/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/swagger/ScannedSwaggerTests.java b/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/swagger/ScannedSwaggerTests.java
deleted file mode 100644
index 396e940432..0000000000
--- a/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/swagger/ScannedSwaggerTests.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.swagger;
-
-import org.zowe.apiml.enable.api.ApiDocController;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.io.IOException;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(
-    webEnvironment = SpringBootTest.WebEnvironment.MOCK,
-    properties = {
-        "eureka.client.enabled=false",
-        "mfaas.discovery.info.swaggerLocation="
-    },
-    classes = {StaticSwaggerApplication.class}
-)
-public class ScannedSwaggerTests {
-
-    @Autowired
-    private ApiDocController apiDocController;
-
-    @Test
-    public void contextLoads() {
-        Assert.assertNotNull(apiDocController);
-    }
-
-    @SuppressWarnings("Duplicates")
-    @Test
-    public void givenNoSwaggerLocationThenAutoscanForSwagger() throws IOException {
-        String apiDoc = apiDocController.getApiDoc(null);
-        Assert.assertNotNull(apiDoc);
-        ObjectMapper mapper = new ObjectMapper();
-
-        JsonNode rootNode = mapper.readValue(apiDoc, JsonNode.class);
-        JsonNode description = rootNode.path("info").path("description");
-        JsonNode version = rootNode.path("info").path("version");
-        Assert.assertNotNull(description);
-        Assert.assertNotNull(version);
-        Assert.assertEquals("Sample micro-service showing how to enable a Spring Boot v2.x application"
-            , description.asText());
-        Assert.assertEquals("1.0.0", version.asText());
-    }
-}
diff --git a/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/swagger/ScannedSwaggerTests2.java b/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/swagger/ScannedSwaggerTests2.java
deleted file mode 100644
index 38c5501cf3..0000000000
--- a/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/swagger/ScannedSwaggerTests2.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.swagger;
-
-import org.zowe.apiml.enable.api.ApiDocController;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.io.IOException;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(
-    webEnvironment = SpringBootTest.WebEnvironment.MOCK,
-    properties = {
-        "eureka.client.enabled=false"
-    },
-    classes = {StaticSwaggerApplication.class}
-)
-public class ScannedSwaggerTests2 {
-
-    @Autowired
-    private ApiDocController apiDocController;
-
-    @SuppressWarnings("Duplicates")
-    @Test
-    public void givenNoSwaggerLocationThenAutoscanForSwagger() throws IOException {
-        String apiDoc = apiDocController.getApiDoc(null);
-        Assert.assertNotNull(apiDoc);
-        ObjectMapper mapper = new ObjectMapper();
-
-        JsonNode rootNode = mapper.readValue(apiDoc, JsonNode.class);
-        JsonNode description = rootNode.path("info").path("description");
-        JsonNode version = rootNode.path("info").path("version");
-        Assert.assertNotNull(description);
-        Assert.assertNotNull(version);
-        Assert.assertEquals("Sample micro-service showing how to enable a Spring Boot v2.x application"
-            , description.asText());
-        Assert.assertEquals("1.0.0", version.asText());
-    }
-}
diff --git a/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/swagger/StaticSwaggerApplication.java b/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/swagger/StaticSwaggerApplication.java
deleted file mode 100644
index 4c353e5324..0000000000
--- a/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/swagger/StaticSwaggerApplication.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.swagger;
-
-import org.zowe.apiml.enable.EnableApiDiscovery;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.ComponentScan;
-
-@SpringBootApplication
-@EnableApiDiscovery
-@EnableConfigurationProperties
-@ComponentScan({"org.zowe.apiml.enable"})
-public class StaticSwaggerApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(StaticSwaggerApplication.class, args);
-    }
-}
diff --git a/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/swagger/StaticSwaggerFailureTests.java b/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/swagger/StaticSwaggerFailureTests.java
deleted file mode 100644
index dd5b508105..0000000000
--- a/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/swagger/StaticSwaggerFailureTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.swagger;
-
-import org.zowe.apiml.enable.api.ApiDocController;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.io.IOException;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(
-    webEnvironment = SpringBootTest.WebEnvironment.MOCK,
-    properties = {
-        "eureka.client.enabled=false",
-        "mfaas.discovery.info.swaggerLocation=missing_swagger.json"
-    },
-    classes = {StaticSwaggerApplication.class}
-)
-public class StaticSwaggerFailureTests {
-
-    @Autowired
-    private ApiDocController apiDocController;
-
-    @Test(expected = IOException.class)
-    public void givenASwaggerLocationThatDoesntExistThenFail() throws IOException {
-        apiDocController.getApiDoc(null);
-    }
-}
diff --git a/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/swagger/StaticSwaggerLoaderTests.java b/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/swagger/StaticSwaggerLoaderTests.java
deleted file mode 100644
index f4f1d47476..0000000000
--- a/integration-enabler-spring-v2/src/test/java/org/zowe/apiml/enable/swagger/StaticSwaggerLoaderTests.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- */
-package org.zowe.apiml.enable.swagger;
-
-import org.zowe.apiml.enable.api.ApiDocController;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.io.IOException;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(
-    webEnvironment = SpringBootTest.WebEnvironment.MOCK,
-    properties = {
-        "eureka.client.enabled=false",
-        "mfaas.discovery.info.swaggerLocation=swagger.json"
-    },
-    classes = {StaticSwaggerApplication.class}
-)
-public class StaticSwaggerLoaderTests {
-
-    @Autowired
-    private ApiDocController apiDocController;
-
-    @Test
-    public void givenASwaggerLocationThenLoadTheSwaggerFileNotAutoscan() throws IOException {
-        String apiDoc = apiDocController.getApiDoc(null);
-        Assert.assertNotNull(apiDoc);
-        ObjectMapper mapper = new ObjectMapper();
-
-        JsonNode rootNode = mapper.readValue(apiDoc, JsonNode.class);
-        JsonNode description = rootNode.path("info").path("description");
-        JsonNode version = rootNode.path("info").path("version");
-        Assert.assertNotNull(description);
-        Assert.assertNotNull(version);
-        Assert.assertEquals("Static Swagger Info for Sample micro-service " +
-            "showing how to enable a Spring Boot v2.x application", description.asText());
-        Assert.assertEquals("1.0.1", version.asText());
-    }
-}
diff --git a/integration-enabler-spring-v2/src/test/resources/application.yml b/integration-enabler-spring-v2/src/test/resources/application.yml
deleted file mode 100644
index 953c1af319..0000000000
--- a/integration-enabler-spring-v2/src/test/resources/application.yml
+++ /dev/null
@@ -1,115 +0,0 @@
-spring:
-    application:
-        name: discoverableclient
-    output:
-        ansi:
-            enabled: always
-
-logging:
-    level:
-        ROOT: INFO
-        org.springframework: INFO
-        org.zowe.apiml: DEBUG
-
-##############################################################################################
-# MFAAS configuration section
-##############################################################################################
-
-environment:
-    hostname: localhost
-    port: 10021
-    discoveryLocations: http://eureka:password@localhost:10011/eureka/
-    preferIpAddress: false
-    ipAddress: 127.0.0.1
-    serverIpAddress: 127.0.0.1
-    serviceTitle: Sample V2 Client
-    serviceDescription: Sample V2 Client
-
-mfaas:
-    discovery:
-        serviceId: ${environment.serviceId:${spring.application.name}}
-        locations: ${environment.discoveryLocations}
-        enabled: ${environment.discoveryEnabled:true}
-        endpoints:
-            statusPage: ${mfaas.server.scheme}://${mfaas.service.hostname}:${mfaas.server.port}${mfaas.server.contextPath}/application/info
-            healthPage: ${mfaas.server.scheme}://${mfaas.service.hostname}:${mfaas.server.port}${mfaas.server.contextPath}/application/health
-            homePage: ${mfaas.server.scheme}://${mfaas.service.hostname}:${mfaas.server.port}${mfaas.server.contextPath}/
-        info:
-            serviceTitle: ${environment.serviceTitle}
-            description:  ${environment.serviceDescription}
-            swaggerLocation: # populate this value with a json file from the resources folder to load a static swagger definition
-        fetchRegistry: true
-        region: default
-    service:
-        hostname: ${environment.hostname}
-        ipAddress: ${environment.ipAddress}
-    catalog-ui-tile:
-        id: cademoapps
-        title: Sample MFaaS applications
-        description: Applications which demonstrate how to make a service discoverable in the MFaaS ecosystem
-        version:  1.0.0
-    server:
-        port: ${environment.port}
-        contextPath: /discoverableclient
-        scheme: http
-
-eureka:
-    instance:
-        appName: ${mfaas.discovery.serviceId}
-        hostname: ${mfaas.service.hostname}
-        statusPageUrlPath: ${mfaas.discovery.endpoints.statusPage}
-        healthCheckUrlPath: ${mfaas.discovery.endpoints.healthPage}
-        homePageUrlPath: ${mfaas.discovery.endpoints.homePage}
-        metadata-map:
-            routed-services:
-                api_v1:
-                    gateway-url: "api/v1"
-                    service-url: ${mfaas.server.contextPath}
-                api-doc:
-                    gateway-url: "api/v1/api-doc"
-                    service-url: ${mfaas.server.contextPath}/api-doc
-            mfaas:
-                api-info:
-                    swagger:
-                        location: ${mfaas.discovery.info.swaggerLocation:}
-                    apiVersionProperties:
-                        v1:
-                            title: Service Integration Enabler V2 Sample App (spring boot 2.x)
-                            description: Sample micro-service showing how to enable a Spring Boot v2.x application
-                            version: 1.0.0
-                            basePackage: org.zowe.apiml.client.controller.controllers.api
-
-                discovery:
-                    catalogUiTile:
-                        id: ${mfaas.catalog-ui-tile.id}
-                        title:  ${mfaas.catalog-ui-tile.title}
-                        description: ${mfaas.catalog-ui-tile.description}
-                        version: ${mfaas.catalog-ui-tile.version}
-                    enableApiDoc: ${mfaas.discovery.info.enableApiDoc:true}
-                    service:
-                        title: ${mfaas.discovery.info.serviceTitle}
-                        description: ${mfaas.discovery.info.description}
-    client:
-        healthcheck:
-            enabled: true
-        serviceUrl:
-            defaultZone: ${mfaas.discovery.locations}
-        fetchRegistry:  ${mfaas.discovery.fetchRegistry}
-        region: ${mfaas.discovery.region}
-        enabled: ${mfaas.discovery.enabled}
-
-##############################################################################################
-
-management:
-    endpoints:
-        web:
-            base-path: /application
-            exposure:
-                include: "health,info,routes"
-
-server:
-    address: ${mfaas.service.hostname}
-    port: ${mfaas.server.port}
-    servlet:
-        contextPath: ${mfaas.server.contextPath}
-
diff --git a/integration-enabler-spring-v2/src/test/resources/swagger.json b/integration-enabler-spring-v2/src/test/resources/swagger.json
deleted file mode 100644
index f341604072..0000000000
--- a/integration-enabler-spring-v2/src/test/resources/swagger.json
+++ /dev/null
@@ -1,474 +0,0 @@
-{
-    "swagger": "2.0",
-    "info": {
-        "description": "Static Swagger Info for Sample micro-service showing how to enable a Spring Boot v2.x application",
-        "version": "1.0.1",
-        "title": "Service Integration Enabler V2 Sample App (spring boot 2.x)"
-    },
-    "basePath": "/discoverableclient",
-    "tags": [
-        {
-            "name": "Instance",
-            "description": "Instance Controller"
-        },
-        {
-            "name": "Movie",
-            "description": "Movie Controller"
-        },
-        {
-            "name": "Suspects",
-            "description": "Suspects Controller"
-        }
-    ],
-    "paths": {
-        "/instance/configured-port": {
-            "get": {
-                "tags": [
-                    "Instance"
-                ],
-                "summary": "What port is this controller configured for",
-                "description": "What port is this controller configured for",
-                "operationId": "getPortUsingGET",
-                "produces": [
-                    "text/plain"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    "401": {
-                        "description": "Unauthorized"
-                    },
-                    "403": {
-                        "description": "Forbidden"
-                    },
-                    "404": {
-                        "description": "URI not found"
-                    }
-                }
-            }
-        },
-        "/instance/gateway-url": {
-            "get": {
-                "tags": [
-                    "Instance"
-                ],
-                "summary": "What is the URI of the Gateway",
-                "description": "What is the URI of the Gateway",
-                "operationId": "getGatewayLocationUsingGET",
-                "produces": [
-                    "text/plain"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    "401": {
-                        "description": "Unauthorized"
-                    },
-                    "403": {
-                        "description": "Forbidden"
-                    },
-                    "404": {
-                        "description": "URI not found"
-                    },
-                    "500": {
-                        "description": "Internal Error Occurred"
-                    }
-                }
-            }
-        },
-        "/movies/list": {
-            "get": {
-                "tags": [
-                    "Movie"
-                ],
-                "summary": "Retrieve all movies",
-                "description": "Return a list of movies",
-                "operationId": "listUsingGET",
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "type": "array",
-                            "items": {
-                                "$ref": "#/definitions/Movie"
-                            }
-                        }
-                    },
-                    "401": {
-                        "description": "Unauthorized"
-                    },
-                    "403": {
-                        "description": "Forbidden"
-                    },
-                    "404": {
-                        "description": "URI not found"
-                    }
-                },
-                "security": [
-                    {
-                        "MoieControlleroauth": [
-                            "list"
-                        ]
-                    }
-                ]
-            }
-        },
-        "/movies/show/{id}": {
-            "get": {
-                "tags": [
-                    "Movie"
-                ],
-                "summary": "Retrieve a movie",
-                "description": "Return a movie for a given {id}",
-                "operationId": "showMovieUsingGET",
-                "produces": [
-                    "application/json"
-                ],
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "description": "id",
-                        "required": true,
-                        "type": "integer",
-                        "format": "int32"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/Movie"
-                        }
-                    },
-                    "401": {
-                        "description": "Unauthorized"
-                    },
-                    "403": {
-                        "description": "Forbidden"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        },
-        "/suspects/add": {
-            "post": {
-                "tags": [
-                    "Suspects"
-                ],
-                "summary": "Save a suspect",
-                "description": "Persists a suspect",
-                "operationId": "saveSuspectUsingPOST",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "suspect",
-                        "description": "suspect",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/Suspect"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    "201": {
-                        "description": "Created"
-                    },
-                    "401": {
-                        "description": "Unauthorized"
-                    },
-                    "403": {
-                        "description": "Forbidden"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        },
-        "/suspects/delete/{id}": {
-            "delete": {
-                "tags": [
-                    "Suspects"
-                ],
-                "summary": "Deletes a suspect",
-                "description": "Deletes a suspect",
-                "operationId": "deleteUsingDELETE",
-                "produces": [
-                    "application/json"
-                ],
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "description": "id",
-                        "required": true,
-                        "type": "integer",
-                        "format": "int32"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    "204": {
-                        "description": "No Content"
-                    },
-                    "401": {
-                        "description": "Unauthorized"
-                    },
-                    "403": {
-                        "description": "Forbidden"
-                    }
-                }
-            }
-        },
-        "/suspects/list": {
-            "get": {
-                "tags": [
-                    "Suspects"
-                ],
-                "summary": "Retrieve all movies",
-                "description": "Return a list of movies",
-                "operationId": "listUsingGET_1",
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "type": "array",
-                            "items": {
-                                "$ref": "#/definitions/Suspect"
-                            }
-                        }
-                    },
-                    "401": {
-                        "description": "Unauthorized"
-                    },
-                    "403": {
-                        "description": "Forbidden"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        },
-        "/suspects/show/{id}": {
-            "get": {
-                "tags": [
-                    "Suspects"
-                ],
-                "summary": "Retrieve a suspect",
-                "description": "Return a suspect for a given {id}",
-                "operationId": "showSuspectUsingGET",
-                "produces": [
-                    "application/json"
-                ],
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "description": "id",
-                        "required": true,
-                        "type": "integer",
-                        "format": "int32"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/Suspect"
-                        }
-                    },
-                    "401": {
-                        "description": "Unauthorized"
-                    },
-                    "403": {
-                        "description": "Forbidden"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        },
-        "/suspects/update/{id}": {
-            "put": {
-                "tags": [
-                    "Suspects"
-                ],
-                "summary": "Updates a suspect",
-                "description": "Updates a suspect",
-                "operationId": "updateSuspectUsingPUT",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "description": "id",
-                        "required": true,
-                        "type": "integer",
-                        "format": "int32"
-                    },
-                    {
-                        "in": "body",
-                        "name": "suspect",
-                        "description": "suspect",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/Suspect"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    "201": {
-                        "description": "Created"
-                    },
-                    "401": {
-                        "description": "Unauthorized"
-                    },
-                    "403": {
-                        "description": "Forbidden"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        }
-    },
-    "definitions": {
-        "Iterable«Movie»": {
-            "type": "object",
-            "title": "Iterable«Movie»"
-        },
-        "Iterable«Suspect»": {
-            "type": "object",
-            "title": "Iterable«Suspect»"
-        },
-        "Movie": {
-            "type": "object",
-            "properties": {
-                "description": {
-                    "type": "string",
-                    "example": "Episode IV",
-                    "description": "The description of the movie",
-                    "allowEmptyValue": false
-                },
-                "id": {
-                    "type": "integer",
-                    "format": "int32",
-                    "example": 1,
-                    "description": "The database generated movie ID",
-                    "allowEmptyValue": false
-                },
-                "name": {
-                    "type": "string",
-                    "example": "Star Wars",
-                    "description": "The movie name",
-                    "allowEmptyValue": false
-                },
-                "version": {
-                    "type": "integer",
-                    "format": "int32",
-                    "example": 1,
-                    "description": "The auto-generated version of the movie",
-                    "allowEmptyValue": false
-                }
-            },
-            "title": "Movie",
-            "description": "A Movie Database Object"
-        },
-        "Suspect": {
-            "type": "object",
-            "required": [
-                "description"
-            ],
-            "properties": {
-                "actorname": {
-                    "type": "string",
-                    "description": "The name of the actor who played the suspect",
-                    "allowEmptyValue": false
-                },
-                "description": {
-                    "type": "string",
-                    "description": "The description of the suspect",
-                    "allowEmptyValue": false
-                },
-                "id": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "The database generated suspect ID",
-                    "allowEmptyValue": false
-                },
-                "imageUrl": {
-                    "type": "string",
-                    "description": "The image URL of the actor",
-                    "allowEmptyValue": false
-                },
-                "name": {
-                    "type": "string",
-                    "description": "The suspect name",
-                    "allowEmptyValue": false
-                },
-                "suspectId": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "The application-specific suspect ID",
-                    "allowEmptyValue": false
-                },
-                "version": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "The auto-generated version of the suspect",
-                    "allowEmptyValue": false
-                }
-            },
-            "title": "Suspect",
-            "description": "A Suspect Database Object"
-        }
-    }
-}
diff --git a/onboarding-enabler-spring/build.gradle b/onboarding-enabler-spring/build.gradle
index d67843b302..54b962626a 100644
--- a/onboarding-enabler-spring/build.gradle
+++ b/onboarding-enabler-spring/build.gradle
@@ -40,4 +40,7 @@ dependencies {
     testCompile libraries.gson
 }
 
-jar.baseName = "${jar.baseName}-${springBootVersion}"
+jar {
+    baseName = "enabler-springboot-${springBootVersion}"
+    archiveName = "${baseName}.jar"
+}
diff --git a/settings.gradle b/settings.gradle
index 533bd6fc48..dc43076204 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,8 +2,6 @@ rootProject.name = 'api-layer'
 
 include 'helloworld-jersey'
 include 'discovery-service'
-include 'integration-enabler-spring-v2'
-include 'integration-enabler-spring-v1'
 include 'apiml-utility'
 include 'apiml-common'
 include 'apiml-security-common'
diff --git a/zowe-install/build.gradle b/zowe-install/build.gradle
index d7a2aa90dd..4fa5f1e172 100644
--- a/zowe-install/build.gradle
+++ b/zowe-install/build.gradle
@@ -7,7 +7,6 @@ configurations {
     catalogServiceJar
     discoveryServiceJar
     gatewayServiceJar
-    enablerSpringBootJar
     discoverableClientJar
     zip
 }
@@ -16,7 +15,6 @@ dependencies {
     catalogServiceJar(project(path: ":api-catalog-services", configuration: "bootArchives"))
     discoveryServiceJar(project(path: ":discovery-service", configuration: "bootArchives"))
     gatewayServiceJar(project(path: ":gateway-service", configuration: "bootArchives"))
-    enablerSpringBootJar(project(path: ":integration-enabler-spring-v1", configuration: "archives"))
     discoverableClientJar(project(path: ":discoverable-client", configuration: "bootArchives"))
 }
 
@@ -28,7 +26,6 @@ task packageApiMediationZowe(type: Zip) {
         from configurations.catalogServiceJar
         from configurations.discoveryServiceJar
         from configurations.gatewayServiceJar
-        from configurations.enablerSpringBootJar
         from configurations.discoverableClientJar
     }