The Unified and Autonomous Development Platform
Use latest commons
Robin Shena4944f97a1cc
diff --git a/pom.xml b/pom.xmlindex 0b9eb5ed5f..0e647cea66 100644--- a/pom.xml+++ b/pom.xml@@ -195,7 +195,7 @@</repository></repositories><properties>- <commons.version>1.1.7</commons.version>+ <commons.version>1.1.8</commons.version><antlr.version>4.7.2</antlr.version></properties></project>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex 8249f15c92..a1c0660566 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -398,7 +398,7 @@<dependency><groupId>io.onedev</groupId><artifactId>k8s-helper</artifactId>- <version>1.0.5</version>+ <version>1.0.6</version></dependency></dependencies><properties>diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.htmlindex 795b443f3a..0357cf9235 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html@@ -1,3 +1,4 @@<wicket:extend>- <a wicket:id="test">test</a>+ <a wicket:id="run">run</a>+ <a wicket:id="stop">stop</a></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex e52a2d491e..e18a7e1238 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -6,11 +6,15 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.commons.utils.command.Commandline;+import io.onedev.commons.utils.command.LineConsumer;import io.onedev.server.web.page.base.BasePage;@SuppressWarnings("serial")public class TestPage extends BasePage {+ static Thread thread;+public TestPage(PageParameters params) {super(params);}@@ -19,10 +23,48 @@ public class TestPage extends BasePage {protected void onInitialize() {super.onInitialize();- add(new Link<Void>("test") {+ add(new Link<Void>("run") {@Overridepublic void onClick() {+ thread = new Thread(new Runnable() {++ @Override+ public void run() {+ try {+ Commandline cmd = new Commandline("sh");+ cmd.addArgs("/home/robin/temp/test.sh");+ cmd.execute(new LineConsumer() {++ @Override+ public void consume(String line) {+ System.out.println(line);+ }++ }, new LineConsumer() {++ @Override+ public void consume(String line) {+ System.err.println(line);+ }++ }).checkReturnCode();+ } catch (Exception e) {+ e.printStackTrace();+ }+ }++ });+ thread.start();+ }++ });++ add(new Link<Void>("stop") {++ @Override+ public void onClick() {+ thread.interrupt();}});diff --git a/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.javaindex 6020660fd7..b549469312 100644--- a/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java+++ b/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java@@ -257,7 +257,6 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDagit.addArgs("config", "--global", "credential.helper", "\"\"");elsegit.addArgs("config", "--global", "credential.helper", "");-git.execute(logger, logger).checkReturnCode();git.clearArgs();@@ -291,20 +290,22 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDagit.execute(logger, logger).checkReturnCode();}- List<String> submoduleCredentials = new ArrayList<>();- for (SubmoduleCredential submoduleCredential: jobContext.getSubmoduleCredentials()) {- String url = submoduleCredential.getUrl();- String userName = URLEncoder.encode(submoduleCredential.getUserName(), Charsets.UTF_8.name());- String password = URLEncoder.encode(submoduleCredential.getPasswordSecret(), Charsets.UTF_8.name());- if (url.startsWith("http://")) {- submoduleCredentials.add("http://" + userName + ":" + password- + "@" + url.substring("http://".length()).replace(":", "%3a"));- } else {- submoduleCredentials.add("https://" + userName + ":" + password- + "@" + url.substring("https://".length()).replace(":", "%3a"));+ if (!jobContext.getSubmoduleCredentials().isEmpty()) {+ List<String> submoduleCredentials = new ArrayList<>();+ for (SubmoduleCredential submoduleCredential: jobContext.getSubmoduleCredentials()) {+ String url = submoduleCredential.getUrl();+ String userName = URLEncoder.encode(submoduleCredential.getUserName(), Charsets.UTF_8.name());+ String password = URLEncoder.encode(submoduleCredential.getPasswordSecret(), Charsets.UTF_8.name());+ if (url.startsWith("http://")) {+ submoduleCredentials.add("http://" + userName + ":" + password+ + "@" + url.substring("http://".length()).replace(":", "%3a"));+ } else {+ submoduleCredentials.add("https://" + userName + ":" + password+ + "@" + url.substring("https://".length()).replace(":", "%3a"));+ }}+ FileUtils.writeLines(new File(tempHome, ".git-credentials"), submoduleCredentials, "\n");}- FileUtils.writeLines(new File(tempHome, ".git-credentials"), submoduleCredentials, "\n");if (!new File(hostWorkspace, ".git").exists()) {git.clearArgs();@@ -392,7 +393,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDadocker.execute(newJobLogger(logger), newJobLogger(logger), null, new ProcessKiller() {@Override- public void kill(Process process) {+ public void kill(Process process, String executionId) {logger.log("Stopping container...");Commandline cmd = getDocker();cmd.addArgs("stop", dockerInstance);