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/06/18 16:45:13 UTC
[ignite-teamcity-bot] branch master updated: Build and tests fix
after modules refactoring, version update
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 c38dcdb Build and tests fix after modules refactoring, version update
c38dcdb is described below
commit c38dcdb34ca606bf4b100f6e9063900e652dc629
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Tue Jun 18 18:58:51 2019 +0300
Build and tests fix after modules refactoring, version update
---
ignite-tc-helper-web/build.gradle | 4 ----
.../java/org/apache/ignite/ci/web/model/Version.java | 2 +-
.../ignite/ci/github/pure/GitHubPrsParseTest.java | 0
.../ignite/tcbot/common/conf/PasswordEncoder.java | 7 +++----
tcbot-github/build.gradle | 19 ++++++++++++++++++-
.../ignite/githubservice/GitHubPrsParseTest.java | 2 +-
.../src/test/resources/prsList.json | 0
7 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/ignite-tc-helper-web/build.gradle b/ignite-tc-helper-web/build.gradle
index 313f275..a9cb41f 100644
--- a/ignite-tc-helper-web/build.gradle
+++ b/ignite-tc-helper-web/build.gradle
@@ -68,12 +68,8 @@ dependencies {
}
processResources {
-
- // Minify json resources
from(sourceSets.test.resources.srcDirs) {
include "**/*.json"
-
- // Minify every file here
}
}
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 7457916..dcc646e 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 = "20190607";
+ public static final String VERSION = "20190613";
/** Java version, where Web App is running. */
public String javaVer;
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/github/pure/GitHubPrsParseTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/github/pure/GitHubPrsParseTest.java
deleted file mode 100644
index e69de29..0000000
diff --git a/tcbot-common/src/main/java/org/apache/ignite/tcbot/common/conf/PasswordEncoder.java b/tcbot-common/src/main/java/org/apache/ignite/tcbot/common/conf/PasswordEncoder.java
index e86801b..166d888 100644
--- a/tcbot-common/src/main/java/org/apache/ignite/tcbot/common/conf/PasswordEncoder.java
+++ b/tcbot-common/src/main/java/org/apache/ignite/tcbot/common/conf/PasswordEncoder.java
@@ -19,14 +19,13 @@ package org.apache.ignite.tcbot.common.conf;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
-import org.apache.ignite.tcbot.common.util.Base64Util;
-import org.apache.ignite.tcbot.common.util.CryptUtil;
-
import java.security.SecureRandom;
import javax.annotation.Nonnull;
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;
import javax.xml.bind.DatatypeConverter;
+import org.apache.ignite.tcbot.common.util.Base64Util;
+import org.apache.ignite.tcbot.common.util.CryptUtil;
import static javax.xml.bind.DatatypeConverter.parseHexBinary;
import static javax.xml.bind.DatatypeConverter.printHexBinary;
@@ -118,7 +117,7 @@ public class PasswordEncoder {
}
public static void main1(String[] args) {
- encodeJiraTok("ignitetcbot", "21313");
+ encodeJiraTok("ignitetcbot", "enterClearPasswordOrTokenForUser");
}
public static void encodeJiraTok(String user, String pwd) {
diff --git a/tcbot-github/build.gradle b/tcbot-github/build.gradle
index 1dd6eba..2bacd40 100644
--- a/tcbot-github/build.gradle
+++ b/tcbot-github/build.gradle
@@ -25,4 +25,21 @@ dependencies {
testCompile group: 'junit', name: 'junit', version: junitVer
testCompile group: 'org.mockito', name: 'mockito-core', version: mockitoVer
}
-
\ No newline at end of file
+
+
+processResources {
+ from(sourceSets.test.resources.srcDirs) {
+ include "**/*.json"
+ }
+}
+
+test {
+ // set JVM arguments for the test JVM(s)
+ jvmArgs "-XX:+IgnoreUnrecognizedVMOptions",
+ "--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED",
+ "--add-exports=java.base/sun.nio.ch=ALL-UNNAMED",
+ "--add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED",
+ "--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED",
+ "--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED",
+ "--illegal-access=permit"
+}
diff --git a/tcbot-github/src/test/java/org/apache/ignite/githubservice/GitHubPrsParseTest.java b/tcbot-github/src/test/java/org/apache/ignite/githubservice/GitHubPrsParseTest.java
index e311008..754fcc7 100644
--- a/tcbot-github/src/test/java/org/apache/ignite/githubservice/GitHubPrsParseTest.java
+++ b/tcbot-github/src/test/java/org/apache/ignite/githubservice/GitHubPrsParseTest.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.ignite.githubservice;
import com.google.common.base.Preconditions;
@@ -25,7 +26,6 @@ import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import org.apache.ignite.ci.github.PullRequest;
-import org.apache.ignite.githubservice.GitHubConnectionImpl;
import org.junit.Test;
import static junit.framework.TestCase.assertEquals;
diff --git a/ignite-tc-helper-web/src/test/resources/prsList.json b/tcbot-github/src/test/resources/prsList.json
similarity index 100%
rename from ignite-tc-helper-web/src/test/resources/prsList.json
rename to tcbot-github/src/test/resources/prsList.json