Skip to content
Permalink
Browse files
Version update, packages refactoring
  • Loading branch information
dspavlov committed Apr 23, 2019
1 parent 853d8e0 commit baa246a4acd811d165fdb672e1e6570d9e788f3e
Show file tree
Hide file tree
Showing 19 changed files with 20 additions and 30 deletions.
@@ -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=
@@ -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
@@ -24,7 +24,6 @@
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;
@@ -26,8 +26,8 @@
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;
@@ -24,7 +24,7 @@
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;
@@ -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;
@@ -25,8 +25,6 @@
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.
@@ -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;
@@ -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;
@@ -20,7 +20,6 @@
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;
@@ -19,7 +19,6 @@
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;
@@ -26,7 +26,6 @@
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;
@@ -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;
@@ -28,7 +28,7 @@
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;
@@ -33,8 +33,8 @@
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;
@@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.ignite.ci.conf;
package org.apache.ignite.ci.web.rest;

/**
*
@@ -31,19 +31,15 @@
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;
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;
@@ -26,8 +26,8 @@
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;
@@ -28,8 +28,8 @@
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;

0 comments on commit baa246a

Please sign in to comment.