Bring junit and slf4j-nop dependencies to parent modules in test scope

PoeppingT · PoeppingT · commit 4c77c08d3d51 · 2022-03-22T14:32:13.000-07:00
diff --git a/functions/alb-update/pom.xml b/functions/alb-update/pom.xml
@@ -82,10 +82,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
diff --git a/functions/core-stack-listener/pom.xml b/functions/core-stack-listener/pom.xml
@@ -82,14 +82,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-nop</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
diff --git a/functions/ecs-service-update/pom.xml b/functions/ecs-service-update/pom.xml
@@ -82,10 +82,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
diff --git a/functions/ecs-shutdown-services/pom.xml b/functions/ecs-shutdown-services/pom.xml
@@ -82,10 +82,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
diff --git a/functions/ecs-startup-services/pom.xml b/functions/ecs-startup-services/pom.xml
@@ -82,10 +82,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
diff --git a/functions/onboarding-app-stack-listener/pom.xml b/functions/onboarding-app-stack-listener/pom.xml
@@ -88,14 +88,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-nop</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
diff --git a/functions/onboarding-stack-listener/pom.xml b/functions/onboarding-stack-listener/pom.xml
@@ -82,10 +82,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
diff --git a/functions/pom.xml b/functions/pom.xml
@@ -46,5 +46,13 @@
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/functions/system-rest-api-client/pom.xml b/functions/system-rest-api-client/pom.xml
@@ -82,10 +82,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
diff --git a/functions/workload-deploy/pom.xml b/functions/workload-deploy/pom.xml
@@ -82,10 +82,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
diff --git a/installer/pom.xml b/installer/pom.xml
@@ -119,8 +119,6 @@ limitations under the License.
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.12.4</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
diff --git a/layers/apigw-helper/pom.xml b/layers/apigw-helper/pom.xml
@@ -61,14 +61,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-nop</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
diff --git a/layers/cloudformation-utils/pom.xml b/layers/cloudformation-utils/pom.xml
@@ -55,14 +55,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-nop</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
diff --git a/layers/pom.xml b/layers/pom.xml
@@ -47,5 +47,13 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/layers/utils/pom.xml b/layers/utils/pom.xml
@@ -55,14 +55,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-nop</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -41,6 +41,7 @@
         <aws.java.sdk.version>2.17.132</aws.java.sdk.version>
         <log4j.version>2.17.1</log4j.version>
         <junit.version>4.13.2</junit.version>
+        <mockito.version>3.12.4</mockito.version>
         <slf4j.version>1.7.32</slf4j.version>
     </properties>
     <!-- Define default configurations for some dependencies. Each child POM chooses which dependencies to include. -->
@@ -52,6 +53,12 @@
                 <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>${mockito.version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-nop</artifactId>
diff --git a/resources/custom-resources/app-services-ecr-macro/pom.xml b/resources/custom-resources/app-services-ecr-macro/pom.xml
@@ -81,14 +81,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-nop</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
diff --git a/resources/custom-resources/cidr-dynamodb/pom.xml b/resources/custom-resources/cidr-dynamodb/pom.xml
@@ -81,14 +81,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-nop</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
diff --git a/resources/custom-resources/fsx-dns-name/pom.xml b/resources/custom-resources/fsx-dns-name/pom.xml
@@ -81,10 +81,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
diff --git a/resources/custom-resources/pom.xml b/resources/custom-resources/pom.xml
@@ -40,5 +40,13 @@
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/resources/custom-resources/rds-bootstrap/pom.xml b/resources/custom-resources/rds-bootstrap/pom.xml
@@ -81,10 +81,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
diff --git a/resources/custom-resources/set-instance-protection/pom.xml b/resources/custom-resources/set-instance-protection/pom.xml
@@ -81,10 +81,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
diff --git a/services/onboarding-service/pom.xml b/services/onboarding-service/pom.xml
@@ -82,14 +82,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-nop</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
diff --git a/services/pom.xml b/services/pom.xml
@@ -43,5 +43,17 @@
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/services/settings-service/pom.xml b/services/settings-service/pom.xml
@@ -107,14 +107,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-nop</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
diff --git a/services/tenant-service/pom.xml b/services/tenant-service/pom.xml
@@ -82,14 +82,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-nop</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.amazon.aws.partners.saasfactory.saasboost</groupId>
             <artifactId>Utils</artifactId>
