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/04/23 11:25:34 UTC
[ignite-teamcity-bot] branch master updated: Version update,
packages refactoring
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 baa246a Version update, packages refactoring
baa246a is described below
commit baa246a4acd811d165fdb672e1e6570d9e788f3e
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Tue Apr 23 14:25:28 2019 +0300
Version update, packages refactoring
---
conf/apache.auth.properties | 4 ++--
conf/mail.auth.properties | 2 +-
.../src/main/java/org/apache/ignite/ci/HelperConfig.java | 1 -
.../src/main/java/org/apache/ignite/ci/jobs/CheckQueueJob.java | 4 ++--
.../apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java | 2 +-
.../java/org/apache/ignite/ci/{ => tcbot}/conf/BranchTracked.java | 2 +-
.../main/java/org/apache/ignite/ci/tcbot/conf/BranchesTracked.java | 2 --
.../java/org/apache/ignite/ci/{ => tcbot}/conf/ChainAtServer.java | 2 +-
.../org/apache/ignite/ci/{ => tcbot}/conf/ChainAtServerTracked.java | 2 +-
.../src/main/java/org/apache/ignite/ci/tcbot/conf/GitHubConfig.java | 3 +--
.../main/java/org/apache/ignite/ci/tcbot/conf/JiraServerConfig.java | 3 +--
.../java/org/apache/ignite/ci/tcbot/conf/NotificationsConfig.java | 1 -
.../java/org/apache/ignite/ci/{ => tcbot}/conf/PasswordEncoder.java | 2 +-
.../src/main/java/org/apache/ignite/ci/web/model/Version.java | 2 +-
.../main/java/org/apache/ignite/ci/web/rest/GetTrackedBranches.java | 4 ++--
.../apache/ignite/ci/{conf => web/rest}/ServerIntegrationLinks.java | 2 +-
.../src/main/java/org/apache/ignite/ci/web/rest/TriggerBuilds.java | 4 ----
.../org/apache/ignite/ci/tcbot/chain/TrackedBranchProcessorTest.java | 4 ++--
.../test/java/org/apache/ignite/ci/tcbot/issue/IssueDetectorTest.java | 4 ++--
19 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/conf/apache.auth.properties b/conf/apache.auth.properties
index eb56fbb..974ba25 100644
--- a/conf/apache.auth.properties
+++ b/conf/apache.auth.properties
@@ -10,7 +10,7 @@ logs=apache_logs
git.api_url=https://api.github.com/repos/apache/ignite/
# Specify GitHub Auth token (if needed), go to User->Settings->Developers options->create new.
-# Created token needs to be encrypted using org.apache.ignite.ci.conf.PasswordEncoder
+# Created token needs to be encrypted using org.apache.ignite.ci.tcbot.conf.PasswordEncoder
github.auth_token=
## Branch identification rules
@@ -28,5 +28,5 @@ jira.ticket_template=IGNITE-
# Specify JIRA Auth token (if needed).
# Base-64 pre-encoded username and password, which will be included into Basic Auth requests.
-# Encoded token needs to be encrypted using org.apache.ignite.ci.conf.PasswordEncoder
+# Encoded token needs to be encrypted using org.apache.ignite.ci.tcbot.conf.PasswordEncoder
jira.auth_token=
\ No newline at end of file
diff --git a/conf/mail.auth.properties b/conf/mail.auth.properties
index 0524291..cb3a6b6 100644
--- a/conf/mail.auth.properties
+++ b/conf/mail.auth.properties
@@ -2,7 +2,7 @@
#Enter email to send messages from, dev-list subsricption may be required
username=
-#Use org.apache.ignite.ci.conf.PasswordEncoder to encode password
+#Use org.apache.ignite.ci.tcbot.conf.PasswordEncoder to encode password
encoded_password=
#Specify slack Auth token
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/HelperConfig.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/HelperConfig.java
index 09f174c..ba9a6af 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/HelperConfig.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/HelperConfig.java
@@ -24,7 +24,6 @@ import java.io.FileReader;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.Properties;
-import org.apache.ignite.ci.conf.PasswordEncoder;
import org.apache.ignite.ci.tcbot.TcBotSystemProperties;
import org.apache.ignite.ci.tcbot.conf.BranchesTracked;
import org.apache.ignite.ci.util.Base64Util;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jobs/CheckQueueJob.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jobs/CheckQueueJob.java
index 5101778..21b6048 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jobs/CheckQueueJob.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jobs/CheckQueueJob.java
@@ -26,8 +26,8 @@ import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import javax.inject.Inject;
-import org.apache.ignite.ci.conf.BranchTracked;
-import org.apache.ignite.ci.conf.ChainAtServerTracked;
+import org.apache.ignite.ci.tcbot.conf.BranchTracked;
+import org.apache.ignite.ci.tcbot.conf.ChainAtServerTracked;
import org.apache.ignite.ci.di.AutoProfiling;
import org.apache.ignite.ci.di.MonitoredTask;
import org.apache.ignite.ci.tcbot.conf.ITcBotConfig;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java
index a261730..c118411 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java
@@ -24,7 +24,7 @@ import org.apache.ignite.ci.IAnalyticsEnabledTeamcity;
import org.apache.ignite.ci.analysis.FullChainRunCtx;
import org.apache.ignite.ci.analysis.mode.LatestRebuildMode;
import org.apache.ignite.ci.analysis.mode.ProcessLogsMode;
-import org.apache.ignite.ci.conf.BranchTracked;
+import org.apache.ignite.ci.tcbot.conf.BranchTracked;
import org.apache.ignite.ci.di.AutoProfiling;
import org.apache.ignite.ci.tcbot.conf.ITcBotConfig;
import org.apache.ignite.ci.tcbot.conf.TcServerConfig;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/BranchTracked.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/BranchTracked.java
similarity index 97%
rename from ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/BranchTracked.java
rename to ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/BranchTracked.java
index daf99d8..b7cecd3 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/BranchTracked.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/BranchTracked.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.ci.conf;
+package org.apache.ignite.ci.tcbot.conf;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/BranchesTracked.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/BranchesTracked.java
index c62ee2b..f5dbf3d 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/BranchesTracked.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/BranchesTracked.java
@@ -25,8 +25,6 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Nullable;
-import org.apache.ignite.ci.conf.BranchTracked;
-import org.apache.ignite.ci.conf.ChainAtServer;
/**
* TC Bot main JSON config file, Historically.
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/ChainAtServer.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/ChainAtServer.java
similarity index 97%
rename from ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/ChainAtServer.java
rename to ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/ChainAtServer.java
index fc61c75..9daccb7 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/ChainAtServer.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/ChainAtServer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.ci.conf;
+package org.apache.ignite.ci.tcbot.conf;
import java.util.Objects;
import javax.annotation.Nonnull;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/ChainAtServerTracked.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/ChainAtServerTracked.java
similarity index 98%
rename from ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/ChainAtServerTracked.java
rename to ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/ChainAtServerTracked.java
index 4260a99..b4cd6a0 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/ChainAtServerTracked.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/ChainAtServerTracked.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.ci.conf;
+package org.apache.ignite.ci.tcbot.conf;
import com.google.common.base.Strings;
import java.util.Objects;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/GitHubConfig.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/GitHubConfig.java
index 1eec1c0..eff42da 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/GitHubConfig.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/GitHubConfig.java
@@ -20,7 +20,6 @@ import com.google.common.base.Strings;
import java.util.Properties;
import javax.annotation.Nullable;
import org.apache.ignite.ci.HelperConfig;
-import org.apache.ignite.ci.conf.PasswordEncoder;
import org.jetbrains.annotations.NotNull;
import static com.google.common.base.Strings.isNullOrEmpty;
@@ -41,7 +40,7 @@ public class GitHubConfig implements IGitHubConfig {
private String branchPrefix;
/**
- * Git Auth token encoded to access non-public git repos, use {@link org.apache.ignite.ci.conf.PasswordEncoder#encodeJiraTok(String,
+ * Git Auth token encoded to access non-public git repos, use {@link PasswordEncoder#encodeJiraTok(String,
* String)} to set up value in a config.
*/
private String authTok;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/JiraServerConfig.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/JiraServerConfig.java
index e2a7a04..43441df 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/JiraServerConfig.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/JiraServerConfig.java
@@ -19,7 +19,6 @@ package org.apache.ignite.ci.tcbot.conf;
import com.google.common.base.Strings;
import java.util.Properties;
import org.apache.ignite.ci.HelperConfig;
-import org.apache.ignite.ci.conf.PasswordEncoder;
import org.apache.ignite.ci.jira.pure.Ticket;
import org.jetbrains.annotations.Nullable;
@@ -51,7 +50,7 @@ public class JiraServerConfig implements IJiraServerConfig {
private Properties props;
/**
- * JIRA Auth token encoded to access JIRA, use {@link org.apache.ignite.ci.conf.PasswordEncoder#encodeJiraTok(String,
+ * JIRA Auth token encoded to access JIRA, use {@link PasswordEncoder#encodeJiraTok(String,
* String)} to set up value in a config.
*/
private String authTok;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/NotificationsConfig.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/NotificationsConfig.java
index 27407d1..4f2ada4 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/NotificationsConfig.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/NotificationsConfig.java
@@ -26,7 +26,6 @@ import java.util.List;
import java.util.Properties;
import javax.annotation.Nonnull;
import org.apache.ignite.ci.HelperConfig;
-import org.apache.ignite.ci.conf.PasswordEncoder;
import org.jetbrains.annotations.NotNull;
import static com.google.common.base.Strings.isNullOrEmpty;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/PasswordEncoder.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/PasswordEncoder.java
similarity index 99%
rename from ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/PasswordEncoder.java
rename to ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/PasswordEncoder.java
index 9d04779..fa693ee 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/PasswordEncoder.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/PasswordEncoder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.ci.conf;
+package org.apache.ignite.ci.tcbot.conf;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
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 064c63c..f67eb87 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 = "20190419";
+ public static final String VERSION = "20190423";
/** Java version, where Web App is running. */
public String javaVer;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/GetTrackedBranches.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/GetTrackedBranches.java
index ecda88e..ed366db 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/GetTrackedBranches.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/GetTrackedBranches.java
@@ -33,8 +33,8 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
-import org.apache.ignite.ci.conf.BranchTracked;
-import org.apache.ignite.ci.conf.ChainAtServer;
+import org.apache.ignite.ci.tcbot.conf.BranchTracked;
+import org.apache.ignite.ci.tcbot.conf.ChainAtServer;
import org.apache.ignite.ci.tcbot.TcBotGeneralService;
import org.apache.ignite.ci.tcbot.conf.ITcBotConfig;
import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnitedProvider;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/ServerIntegrationLinks.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/ServerIntegrationLinks.java
similarity index 97%
rename from ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/ServerIntegrationLinks.java
rename to ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/ServerIntegrationLinks.java
index a0f0eb9..fa58ecb 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/ServerIntegrationLinks.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/ServerIntegrationLinks.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.ci.conf;
+package org.apache.ignite.ci.web.rest;
/**
*
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuilds.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuilds.java
index 791351b..727a286 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuilds.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuilds.java
@@ -31,11 +31,8 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
-import org.apache.ignite.ci.conf.ServerIntegrationLinks;
import org.apache.ignite.ci.github.pure.IGitHubConnection;
import org.apache.ignite.ci.github.pure.IGitHubConnectionProvider;
-import org.apache.ignite.ci.jira.pure.IJiraIntegration;
-import org.apache.ignite.ci.jira.pure.IJiraIntegrationProvider;
import org.apache.ignite.ci.tcbot.conf.IJiraServerConfig;
import org.apache.ignite.ci.tcbot.conf.ITcBotConfig;
import org.apache.ignite.ci.tcbot.trigger.TriggerResult;
@@ -43,7 +40,6 @@ import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnitedProvider;
import org.apache.ignite.ci.user.ICredentialsProv;
import org.apache.ignite.ci.tcbot.visa.TcBotTriggerAndSignOffService;
import org.apache.ignite.ci.web.CtxListener;
-import org.apache.ignite.ci.web.rest.exception.ServiceUnauthorizedException;
import org.apache.ignite.ci.web.model.SimpleResult;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchProcessorTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchProcessorTest.java
index 765789f..80b6fe9 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchProcessorTest.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchProcessorTest.java
@@ -26,8 +26,8 @@ import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.ignite.ci.ITeamcity;
-import org.apache.ignite.ci.conf.BranchTracked;
-import org.apache.ignite.ci.conf.ChainAtServerTracked;
+import org.apache.ignite.ci.tcbot.conf.BranchTracked;
+import org.apache.ignite.ci.tcbot.conf.ChainAtServerTracked;
import org.apache.ignite.ci.tcbot.conf.BranchesTracked;
import org.apache.ignite.ci.teamcity.ignited.IStringCompactor;
import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnitedProvider;
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/issue/IssueDetectorTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/issue/IssueDetectorTest.java
index c20fcf0..f689542 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/issue/IssueDetectorTest.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/issue/IssueDetectorTest.java
@@ -28,8 +28,8 @@ import java.util.OptionalInt;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.ignite.ci.ITeamcity;
-import org.apache.ignite.ci.conf.BranchTracked;
-import org.apache.ignite.ci.conf.ChainAtServerTracked;
+import org.apache.ignite.ci.tcbot.conf.BranchTracked;
+import org.apache.ignite.ci.tcbot.conf.ChainAtServerTracked;
import org.apache.ignite.ci.tcbot.chain.MockBasedTcBotModule;
import org.apache.ignite.ci.tcbot.conf.BranchesTracked;
import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrenceFull;