Skip to content

Commit f6f261b

Browse files
committed
More build improvements
1 parent 978e60b commit f6f261b

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

pom.xml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,10 @@
9696
<version>${junit.jupiter.version}</version>
9797
<scope>test</scope>
9898
</dependency>
99-
<!-- added to support running JUnit5 tests with JUnit4. Remove when eclipse/infinitest catch up. -->
10099
<dependency>
101-
<groupId>org.junit.vintage</groupId>
102-
<artifactId>junit-vintage-engine</artifactId>
103-
<version>4.12.2</version>
100+
<groupId>org.junit.jupiter</groupId>
101+
<artifactId>junit-jupiter-engine</artifactId>
102+
<version>${junit.jupiter.version}</version>
104103
<scope>test</scope>
105104
</dependency>
106105
<dependency>
@@ -115,6 +114,16 @@
115114
<version>${junit.jupiter.version}</version>
116115
<scope>test</scope>
117116
</dependency>
117+
<!-- added to support running JUnit5 tests with JUnit4. Remove when Infinitest catches up. -->
118+
<!-- Note: DO NOT make this the org.junit.vintage support. All the tests are written with JUnit5.
119+
Once Infinitest is ready we can remove this dependency and the corresponding @RunWith annotations
120+
-->
121+
<dependency>
122+
<groupId>junit</groupId>
123+
<artifactId>junit</artifactId>
124+
<version>4.12</version>
125+
<scope>test</scope>
126+
</dependency>
118127

119128
<dependency>
120129
<groupId>org.assertj</groupId>

travis/after_success.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ echo "Current commit detected: ${commit_message}"
3535
if [ $TRAVIS_JDK_VERSION == "oraclejdk8" ] && [ $TRAVIS_REPO_SLUG == "mybatis/mybatis-dynamic-sql" ]; then
3636

3737
./mvnw clean test jacoco:report coveralls:report -q
38+
echo -e "Successfully ran coveralls under Travis job ${TRAVIS_JOB_NUMBER}"
3839

3940
if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ] && [[ "$commit_message" != *"[maven-release-plugin]"* ]]; then
4041
# Deploy to Sonatype

0 commit comments

Comments
 (0)