From a6686d69104c212889d9c2daece9974b967f40b4 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Mon, 12 Nov 2018 16:04:28 +0800
Subject: [PATCH 1/4] test run-in-docker in travis
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index af7d9a2d910..a7a3d064801 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -122,8 +122,8 @@ script:
# fail if generators contain tab '\t'
- /bin/bash ./bin/utils/detect_tab_in_java_class.sh
# run integration tests defined in maven pom.xml
- - mvn --quiet clean install
- - mvn --quiet verify -Psamples
+ - ./bin/run-in-docker.sh mvn --quiet --batch clean install
+ - mvn --quiet --batch verify -Psamples
after_success:
# push to maven repo
- if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
--
GitLab
From 6028792dcbbc5020d560b662f94838e4b5e7c819 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Mon, 12 Nov 2018 16:32:09 +0800
Subject: [PATCH 2/4] fix command path
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index a7a3d064801..adf4ba3ff5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -122,7 +122,7 @@ script:
# fail if generators contain tab '\t'
- /bin/bash ./bin/utils/detect_tab_in_java_class.sh
# run integration tests defined in maven pom.xml
- - ./bin/run-in-docker.sh mvn --quiet --batch clean install
+ - ./run-in-docker.sh mvn --quiet --batch clean install
- mvn --quiet --batch verify -Psamples
after_success:
# push to maven repo
--
GitLab
From b0fd8ad3a4205ffd9afb17debc121fd7e2592721 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Mon, 12 Nov 2018 16:43:04 +0800
Subject: [PATCH 3/4] correct batch mode arg
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index adf4ba3ff5b..efb305c8c55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -122,8 +122,8 @@ script:
# fail if generators contain tab '\t'
- /bin/bash ./bin/utils/detect_tab_in_java_class.sh
# run integration tests defined in maven pom.xml
- - ./run-in-docker.sh mvn --quiet --batch clean install
- - mvn --quiet --batch verify -Psamples
+ - ./run-in-docker.sh mvn --quiet --batch-mode clean install
+ - mvn --quiet --batch-mode verify -Psamples
after_success:
# push to maven repo
- if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
--
GitLab
From ae8361ab19bda738ccc61e178c173f9b0e659f70 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Mon, 12 Nov 2018 17:01:56 +0800
Subject: [PATCH 4/4] disable useSystemClassLoader
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index 12adf445566..589afaf479f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,6 +156,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-version}</version>
<configuration>
+ <useSystemClassLoader>false</useSystemClassLoader>
<testNGArtifactName>none:none</testNGArtifactName>
<argLine>-XX:+StartAttachListener</argLine>
<argLine>-javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit-version}/jmockit-${jmockit-version}.jar</argLine>
--
GitLab