Merge branch 'master' of https://github.com/eugenp/tutorials into BAEL-9696

parent-boot-1/pom.xml

@@ -17,7 +17,7 @@
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
-				<version>1.5.16.RELEASE</version>
+				<version>${spring-boot.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -42,7 +42,7 @@
 				<plugin>
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-maven-plugin</artifactId>
-					<version>1.5.15.RELEASE</version>
+					<version>${spring-boot.version}</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -50,6 +50,7 @@
 
 	<properties>
 		<rest-assured.version>3.1.0</rest-assured.version>
+		<spring-boot.version>1.5.16.RELEASE</spring-boot.version>
 	</properties>
-
-</project>
+	
+</project>

spring-activiti/pom.xml

@@ -41,9 +41,21 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot.version}</version>
+                <configuration>
+                    <mainClass>com.baeldung.activitiwithspring.ActivitiWithSpringApplication</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
     <properties>
-        <start-class>com.example.activitiwithspring.ActivitiWithSpringApplication</start-class>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <activiti.version>6.0.0</activiti.version>

spring-activiti/src/main/java/com/baeldung/activitiwithspring/ActivitiController.java

@@ -1,4 +1,4 @@
-package com.example.activitiwithspring;
+package com.baeldung.activitiwithspring;
 
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;

spring-activiti/src/main/java/com/baeldung/activitiwithspring/ActivitiWithSpringApplication.java

@@ -1,4 +1,4 @@
-package com.example.activitiwithspring;
+package com.baeldung.activitiwithspring;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

spring-activiti/src/main/java/com/baeldung/activitiwithspring/TaskRepresentation.java

@@ -1,4 +1,4 @@
-package com.example.activitiwithspring;
+package com.baeldung.activitiwithspring;
 
 class TaskRepresentation {
 

spring-activiti/src/main/java/com/baeldung/activitiwithspring/servicetasks/SendEmailServiceTask.java

@@ -1,4 +1,4 @@
-package com.example.activitiwithspring.servicetasks;
+package com.baeldung.activitiwithspring.servicetasks;
 
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.JavaDelegate;

spring-activiti/src/test/java/com/baeldung/SpringContextIntegrationTest.java

@@ -1,11 +1,11 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.example.activitiwithspring.ActivitiWithSpringApplication;
+import com.baeldung.activitiwithspring.ActivitiWithSpringApplication;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = ActivitiWithSpringApplication.class)

spring-activiti/src/test/java/com/baeldung/activitiwithspring/ActivitiControllerIntegrationTest.java

@@ -1,5 +1,6 @@
-package com.example.activitiwithspring;
+package com.baeldung.activitiwithspring;
 
+import com.baeldung.activitiwithspring.TaskRepresentation;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.runtime.ProcessInstance;

spring-activiti/src/test/java/com/baeldung/activitiwithspring/ActivitiSpringSecurityIntegrationTest.java

@@ -1,4 +1,4 @@
-package com.example.activitiwithspring;
+package com.baeldung.activitiwithspring;
 
 import org.activiti.engine.IdentityService;
 import org.junit.Test;

spring-activiti/src/test/java/com/baeldung/activitiwithspring/ActivitiWithSpringApplicationIntegrationTest.java

@@ -1,4 +1,4 @@
-package com.example.activitiwithspring;
+package com.baeldung.activitiwithspring;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

spring-activiti/src/test/java/com/baeldung/activitiwithspring/ProcessEngineCreationIntegrationTest.java

@@ -1,4 +1,4 @@
-package com.example.activitiwithspring;
+package com.baeldung.activitiwithspring;
 
 import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngineConfiguration;

spring-activiti/src/test/java/com/baeldung/activitiwithspring/ProcessExecutionIntegrationTest.java

@@ -1,4 +1,4 @@
-package com.example.activitiwithspring;
+package com.baeldung.activitiwithspring;
 
 
 import org.activiti.engine.ActivitiException;