iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7063 from eugenp/revert-junit-version

Browse Source 
revert junit version
This commit is contained in:
Loredana Crusoveanu 2019-06-01 21:15:45 +03:00 committed by GitHub
commit 75753023d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pom.xml
View File

@ -123,17 +123,22 @@
</excludes> </excludes>
</configuration> </configuration>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.platform</groupId>
<artifactId>junit-jupiter-engine</artifactId> <artifactId>junit-platform-surefire-provider</artifactId>
<version>${junit-jupiter.version}</version> <version>${junit-platform.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.vintage</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-vintage-engine</artifactId> <artifactId>junit-jupiter-engine</artifactId>
<version>${junit-jupiter.version}</version> <version>${junit-jupiter.version}</version>
</dependency> </dependency>
</dependencies> <dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit-jupiter.version}</version>
</dependency>
</dependencies>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -1550,8 +1555,8 @@
<jstl.version>1.2</jstl.version> <jstl.version>1.2</jstl.version>
<jackson.version>2.9.8</jackson.version> <jackson.version>2.9.8</jackson.version>
<commons-fileupload.version>1.3</commons-fileupload.version> <commons-fileupload.version>1.3</commons-fileupload.version>
<junit-platform.version>1.4.2</junit-platform.version> <junit-platform.version>1.2.0</junit-platform.version>
<junit-jupiter.version>5.4.2</junit-jupiter.version> <junit-jupiter.version>5.4.0</junit-jupiter.version>
<directory-maven-plugin.version>0.3.1</directory-maven-plugin.version> <directory-maven-plugin.version>0.3.1</directory-maven-plugin.version>
<maven-install-plugin.version>2.5.1</maven-install-plugin.version> <maven-install-plugin.version>2.5.1</maven-install-plugin.version>
<custom-pmd.version>0.0.1</custom-pmd.version> <custom-pmd.version>0.0.1</custom-pmd.version>

4
spring-boot-flowable/src/main/resources/processes/article-workflow.bpmn20.xml
View File

@ -38,12 +38,12 @@
</sequenceFlow> </sequenceFlow>
<serviceTask id="tutorialApproved" <serviceTask id="tutorialApproved"
name="Publish the approved tutorial." name="Publish the approved tutorial."
flowable:class="com.sapient.learning.service.PublishArticleService" /> flowable:class="com.baeldung.service.PublishArticleService" />
<sequenceFlow sourceRef="tutorialApproved" <sequenceFlow sourceRef="tutorialApproved"
targetRef="end" /> targetRef="end" />
<serviceTask id="tutorialRejected" <serviceTask id="tutorialRejected"
name="Send out rejection email" name="Send out rejection email"
flowable:class="com.sapient.learning.service.SendMailService" /> flowable:class="com.baeldung.service.SendMailService" />
<sequenceFlow sourceRef="tutorialRejected" <sequenceFlow sourceRef="tutorialRejected"
targetRef="end" /> targetRef="end" />
<endEvent id="end" /> <endEvent id="end" />

6
spring-boot-flowable/src/test/java/com/baeldung/processes/ArticleWorkflowUnitTest.java → spring-boot-flowable/src/test/java/com/baeldung/processes/ArticleWorkflowIntegrationTest.java
View File

@ -13,11 +13,11 @@ import org.flowable.task.api.Task;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.boot.test.context.SpringBootTest;
@ExtendWith(FlowableSpringExtension.class) @ExtendWith(FlowableSpringExtension.class)
@ExtendWith(SpringExtension.class) @SpringBootTest
public class ArticleWorkflowUnitTest { public class ArticleWorkflowIntegrationTest {
@Autowired @Autowired
private RuntimeService runtimeService; private RuntimeService runtimeService;
@Autowired @Autowired