You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/01/22 10:02:44 UTC
[ignite-teamcity-bot] branch master updated: IGNITE-10989: Version
update, small additional changes
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/master by this push:
new 3619492 IGNITE-10989: Version update, small additional changes
3619492 is described below
commit 361949235fb7e085ac87833efa7c298ad0235fd2
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Tue Jan 22 13:02:40 2019 +0300
IGNITE-10989: Version update, small additional changes
---
.../src/main/java/org/apache/ignite/ci/ITeamcity.java | 4 ----
.../main/java/org/apache/ignite/ci/IgniteTeamcityConnection.java | 6 +-----
.../main/java/org/apache/ignite/ci/teamcity/pure/TcLoginImpl.java | 1 +
.../src/main/java/org/apache/ignite/ci/web/model/Version.java | 2 +-
4 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
index a22d1c6..39d65c5 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
@@ -49,10 +49,6 @@ public interface ITeamcity extends ITeamcityConn {
@Deprecated
long DEFAULT_BUILDS_COUNT = 1000;
- @NotNull public static String buildHref(int id) {
- return "app/rest/latest/builds/id:" + id;
- }
-
CompletableFuture<File> unzipFirstFile(CompletableFuture<File> fut);
CompletableFuture<File> downloadBuildLogZip(int id);
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgniteTeamcityConnection.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgniteTeamcityConnection.java
index ca621d8..c667d66 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgniteTeamcityConnection.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgniteTeamcityConnection.java
@@ -48,7 +48,6 @@ import org.apache.ignite.ci.tcmodel.user.Users;
import org.apache.ignite.ci.teamcity.pure.ITeamcityHttpConnection;
import org.apache.ignite.ci.util.ExceptionUtil;
import org.apache.ignite.ci.util.HttpUtil;
-import org.apache.ignite.ci.util.UrlUtil;
import org.apache.ignite.ci.util.XmlUtil;
import org.apache.ignite.ci.util.ZipUtil;
import org.jetbrains.annotations.NotNull;
@@ -60,9 +59,7 @@ import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.xml.bind.JAXBException;
import java.io.*;
-import java.text.SimpleDateFormat;
import java.util.SortedSet;
-import java.util.Date;
import java.util.List;
import java.util.Properties;
import java.util.concurrent.*;
@@ -72,7 +69,6 @@ import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import static com.google.common.base.Strings.isNullOrEmpty;
import static java.util.concurrent.CompletableFuture.supplyAsync;
import static org.apache.ignite.ci.HelperConfig.ensureDirExist;
import static org.apache.ignite.ci.util.XmlUtil.xmlEscapeText;
@@ -371,7 +367,7 @@ public class IgniteTeamcityConnection implements ITeamcity {
/** {@inheritDoc} */
@AutoProfiling
@Override public Build getBuild(int buildId) {
- return getJaxbUsingHref(ITeamcity.buildHref(buildId), Build.class);
+ return getJaxbUsingHref("app/rest/latest/builds/id:" + buildId, Build.class);
}
/**
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TcLoginImpl.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TcLoginImpl.java
index e16a2d9..2cf6281 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TcLoginImpl.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/pure/TcLoginImpl.java
@@ -39,6 +39,7 @@ class TcLoginImpl implements ITcLogin {
@Override public User checkServiceUserAndPassword(String srvId, String username, String pwd) {
try {
ITeamcity tcConn = tcFactory.get();
+
tcConn.init(srvId);
tcConn.setAuthData(username, pwd);
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
index bb7f69a..4994b27 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
@@ -28,7 +28,7 @@ package org.apache.ignite.ci.web.model;
public static final String GITHUB_REF = "https://github.com/apache/ignite-teamcity-bot";
/** TC Bot Version. */
- public static final String VERSION = "20190118";
+ public static final String VERSION = "20190122";
/** TC Bot Version. */
public String version = VERSION;