Revert "feat(plugins): Add gate-plugins-test module (#1145)" (#1151)

This reverts commit b49f04a.
spinnaker · Apr 14, 2020 · fd924d7 · fd924d7
1 parent b49f04a
commit fd924d7
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 328 deletions.
diff --git a/gate-plugins-test/gate-plugins-test.gradle b/gate-plugins-test/gate-plugins-test.gradle
diff --git a/gate-plugins-test/src/main/kotlin/com/netflix/spinnaker/gate/plugins/GateApiExtension.kt b/gate-plugins-test/src/main/kotlin/com/netflix/spinnaker/gate/plugins/GateApiExtension.kt
diff --git a/gate-plugins-test/src/main/kotlin/com/netflix/spinnaker/gate/plugins/GatePlugin.kt b/gate-plugins-test/src/main/kotlin/com/netflix/spinnaker/gate/plugins/GatePlugin.kt
diff --git a/...lugins-test/src/test/kotlin/com/netflix/spinnaker/gate/plugins/test/GatePluginsFixture.kt b/...lugins-test/src/test/kotlin/com/netflix/spinnaker/gate/plugins/test/GatePluginsFixture.kt
diff --git a/gate-plugins-test/src/test/kotlin/com/netflix/spinnaker/gate/plugins/test/GatePluginsTest.kt b/gate-plugins-test/src/test/kotlin/com/netflix/spinnaker/gate/plugins/test/GatePluginsTest.kt
diff --git a/gate-plugins-test/src/test/resources/gate-plugins-test.yml b/gate-plugins-test/src/test/resources/gate-plugins-test.yml
diff --git a/gate-web/gate-web.gradle b/gate-web/gate-web.gradle
@@ -75,15 +75,3 @@ configurations.all {
   exclude group: 'javax.servlet', module: 'servlet-api'
   exclude group: "org.slf4j", module: "slf4j-log4j12"
 }
-
-test {
-  //The Implementation-Version is set in the MANIFEST.MF for the JAR produced via testing so that
-  //assertions can be made against the version (see gate-plugins-test, for example).
-  jar {
-    manifest {
-      attributes(
-        'Implementation-Version': '1.0.0'
-      )
-    }
-  }
-}
diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/Main.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/Main.groovy
@@ -18,25 +18,24 @@ package com.netflix.spinnaker.gate
 
 import com.netflix.spinnaker.hystrix.spectator.HystrixSpectatorConfig
 import org.springframework.boot.actuate.autoconfigure.ldap.LdapHealthContributorAutoConfiguration
-import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration
 import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration
 import org.springframework.boot.builder.SpringApplicationBuilder
 import org.springframework.boot.context.properties.EnableConfigurationProperties
+import org.springframework.context.annotation.ComponentScan
+import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Import
 import org.springframework.scheduling.annotation.EnableAsync
 
 @EnableAsync
+@Configuration
 @EnableConfigurationProperties
 @Import([HystrixSpectatorConfig])
-@SpringBootApplication(
-  scanBasePackages = [
-    "com.netflix.spinnaker.gate",
-    "com.netflix.spinnaker.config"
-  ],
-  exclude = [GroovyTemplateAutoConfiguration, GsonAutoConfiguration,
-    LdapHealthContributorAutoConfiguration]
-)
+@ComponentScan(["com.netflix.spinnaker.gate", "com.netflix.spinnaker.config"])
+@EnableAutoConfiguration(exclude = [GroovyTemplateAutoConfiguration,
+  GsonAutoConfiguration,
+  LdapHealthContributorAutoConfiguration])
 class Main {
 
   static final Map<String, String> DEFAULT_PROPS = [

diff --git a/settings.gradle b/settings.gradle
@@ -19,7 +19,6 @@ rootProject.name = "gate"
 include "gate-api",
   "gate-core",
   "gate-plugins",
-  "gate-plugins-test",
   "gate-basic",
   "gate-bom",
   "gate-iap",