Optimize build (#1592)

* Optimize build

* Optimize build

mesos-marathon/pom.xml

@@ -40,6 +40,16 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*IntegrationTest.java</exclude>
+                        <exclude>**/*LiveTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

mesos-marathon/src/main/java/com/baeldung/DemoApplication.java

@@ -1,10 +1,8 @@
-package com.mogronalol;
+package com.baeldung;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import javax.annotation.PostConstruct;
-
 @SpringBootApplication
 public class DemoApplication {
 

mesos-marathon/src/main/java/com/baeldung/HelloController.java

@@ -1,6 +1,5 @@
-package com.mogronalol;
+package com.baeldung;
 
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;

mesos-marathon/src/test/java/com/baeldung/DemoApplicationIntegrationTest.java

@@ -1,11 +1,10 @@
-package com.mogronalol;
+package com.baeldung;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.context.embedded.LocalServerPort;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.client.RestTemplate;
 
@@ -13,7 +12,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = {DemoApplication.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class DemoApplicationTests {
+public class DemoApplicationIntegrationTest {
 
     private RestTemplate restTemplate;
 

pom.xml

@@ -35,7 +35,7 @@
         <module>deltaspike</module>
         <module>dozer</module>
 
-        <module>ejb</module>
+        <!--<module>ejb</module>-->
 
         <module>feign</module>
         <module>flyway</module>
@@ -66,7 +66,7 @@
         <module>javax-servlets</module>
         <module>javaxval</module>
         <module>jaxb</module>
-        <module>jee7</module>
+        <!--<module>jee7</module>-->
         <!-- <module>jhipster</module> -->
         <module>jjwt</module>
         <module>jooq</module>

spring-amqp-simple/pom.xml

@@ -41,6 +41,16 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*IntegrationTest.java</exclude>
+                        <exclude>**/*LiveTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

spring-aop/pom.xml

@@ -2,10 +2,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
-    <artifactId>spring-custom-aop</artifactId>
+    <artifactId>spring-aop</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>war</packaging>
-    <name>spring-custom-aop</name>
+    <name>spring-aop</name>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -42,6 +42,18 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*IntegrationTest.java</exclude>
+                        <exclude>**/*LiveTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
+

spring-aop/src/test/java/org/baeldung/CustomAnnotationIntegrationTest.java

@@ -8,7 +8,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest
-public class CustomAnnotationTest {
+public class CustomAnnotationIntegrationTest {
 
     @Autowired
     private Service service;

spring-boot/src/test/java/org/baeldung/jsoncomponent/UserJsonDeserializerIntegrationTest.java

@@ -14,7 +14,7 @@ import static org.junit.Assert.assertEquals;
 
 @JsonTest
 @RunWith(SpringRunner.class)
-public class UserJsonDeserializerTest {
+public class UserJsonDeserializerIntegrationTest {
 
     @Autowired
     private ObjectMapper objectMapper;

spring-boot/src/test/java/org/baeldung/jsoncomponent/UserJsonSerializerIntegrationTest.java

@@ -14,7 +14,7 @@ import static org.junit.Assert.assertEquals;
 
 @JsonTest
 @RunWith(SpringRunner.class)
-public class UserJsonSerializerTest {
+public class UserJsonSerializerIntegrationTest {
 
     @Autowired
     private ObjectMapper objectMapper;

spring-hibernate4/src/test/java/com/baeldung/persistence/save/SaveMethodsIntegrationTest.java

@@ -16,7 +16,7 @@ import static org.junit.Assert.*;
  * Testing specific implementation details for different methods:
  * persist, save, merge, update, saveOrUpdate.
  */
-public class SaveMethodsTest {
+public class SaveMethodsIntegrationTest {
 
     private static SessionFactory sessionFactory;
 

spring-hibernate5/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java

@@ -1,15 +0,0 @@
-package com.baeldung.hibernate.criteria;
-
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
-
-public class HibernateCriteriaTestRunner {
-
-    public static void main(final String[] args) {
-        Result result = JUnitCore.runClasses(HibernateCriteriaTestSuite.class);
-        for (Failure failure : result.getFailures()) {
-            //
-        }
-    }
-}

spring-hibernate5/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java

@@ -1,11 +0,0 @@
-package com.baeldung.hibernate.criteria;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ HibernateCriteriaIntegrationTest.class })
-
-public class HibernateCriteriaTestSuite {
-
-}

spring-hibernate5/src/test/java/com/baeldung/persistence/save/SaveMethodIntegrationTest.java

@@ -1,14 +1,6 @@
 package com.baeldung.persistence.save;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-
-import javax.persistence.PersistenceException;
-
+import com.baeldung.persistence.model.Person;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
@@ -17,19 +9,17 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.service.ServiceRegistry;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
 
-import com.baeldung.persistence.model.Person;
+import javax.persistence.PersistenceException;
+
+import static org.junit.Assert.*;
 
 /**
  * Testing specific implementation details for different methods: persist, save,
  * merge, update, saveOrUpdate.
  */
-public class SaveMethodsTest {
+public class SaveMethodIntegrationTest {
 
     private static SessionFactory sessionFactory;
 

spring-mvc-java/src/test/java/com/baeldung/web/controller/EmployeeIntegrationTest.java

@@ -15,7 +15,7 @@ import com.baeldung.spring.web.config.WebConfig;
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextConfiguration(classes = WebConfig.class)
-public class EmployeeTestWithoutMockMvc {
+public class EmployeeIntegrationTest {
 
     @Autowired
     private EmployeeController employeeController;

spring-mvc-java/src/test/java/com/baeldung/web/controller/RequestMapingShortcutsIntegrationTest.java

@@ -21,7 +21,7 @@ import com.baeldung.spring.web.config.WebConfig;
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextConfiguration(classes = WebConfig.class)
-public class RequestMapingShortcutsUnitTest {
+public class RequestMapingShortcutsIntegrationTest {
 	
 	@Autowired
     private WebApplicationContext ctx;

spring-security-rest/pom.xml

@@ -259,10 +259,10 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>${maven-surefire-plugin.version}</version>
 				<configuration>
 					<excludes>
 						<exclude>**/*LiveTest.java</exclude>
+						<exclude>**/*IntegrationTest.java</exclude>
 					</excludes>
 					<systemPropertyVariables>
 						<!-- <provPersistenceTarget>h2</provPersistenceTarget> -->

spring-security-rest/src/test/java/org/baeldung/web/AsyncControllerIntegrationTest.java

@@ -1,7 +1,5 @@
 package org.baeldung.web;
 
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 import org.baeldung.spring.ClientWebConfig;
 import org.baeldung.spring.SecurityJavaConfig;
 import org.baeldung.spring.WebConfig;
@@ -20,10 +18,12 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextConfiguration(classes = { ClientWebConfig.class, SecurityJavaConfig.class, WebConfig.class })
-public class AsyncControllerTest {
+public class AsyncControllerIntegrationTest {
 
     @Autowired
     WebApplicationContext wac;

spring-state-machine/src/test/java/com/baeldung/spring/statemachine/ForkJoinStateMachineIntegrationTest.java

@@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = ForkJoinStateMachineConfiguration.class)
-public class ForkJoinStateMachineTest {
+public class ForkJoinStateMachineIntegrationTest {
 
     @Autowired
     private StateMachine<String, String> stateMachine;

spring-state-machine/src/test/java/com/baeldung/spring/statemachine/HierarchicalStateMachineIntegrationTest.java

@@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = HierarchicalStateMachineConfiguration.class)
-public class HierarchicalStateMachineTest {
+public class HierarchicalStateMachineIntegrationTest {
 
     @Autowired
     private StateMachine<String, String> stateMachine;

spring-state-machine/src/test/java/com/baeldung/spring/statemachine/JunctionStateMachineIntegrationTest.java

@@ -17,7 +17,7 @@ import javax.annotation.Resource;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = JunctionStateMachineConfiguration.class)
-public class JunctionStateMachineTest {
+public class JunctionStateMachineIntegrationTest {
 
     @Autowired
     private StateMachine<String, String> stateMachine;

spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateEnumMachineIntegrationTest.java

@@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = SimpleEnumStateMachineConfiguration.class)
-public class StateEnumMachineTest {
+public class StateEnumMachineIntegrationTest {
 
     @Autowired
     private StateMachine<ApplicationReviewStates, ApplicationReviewEvents> stateMachine;