Skip to content

Fixed: GITHUB-297: The "connectTimeout" parameter is not configurable #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timols merged 3 commits into from
May 3, 2018
Merged

Fixed: GITHUB-297: The "connectTimeout" parameter is not configurable #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac1481f
Fixed: GITHUB-297: The "connectTimeout" parameter is not configurable
shaburov Apr 16, 2018
cf8e869
add unit tests + jupiter + logging + refactoring + fix smells & corru…
shaburov May 3, 2018
61b25cf
add dependencies to the pom.xml
shaburov May 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Current
Fixed: GITHUB-297: The "connectTimeout" parameter is not configurable.
22 changes: 18 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,17 @@ repositories {
}

dependencies {
compile(group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.5.+")
compile(group: "commons-io", name: "commons-io", version: "2.4")
testCompile(group: "org.hamcrest", name: "hamcrest-all", version: "1.3")
testCompile(group: "junit", name: "junit", version: "4.12")
compile(group: 'org.slf4j', name: 'slf4j-api', version: '1.8.0-beta2')
compile(group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.5.+")
compile(group: "commons-io", name: "commons-io", version: "2.4")
testCompile(group: "org.hamcrest", name: "hamcrest-all", version: "1.3")
testCompile(group: 'org.mockito', name: 'mockito-core', version: '2.18.3')
testCompile(group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0')
testCompile(group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.0')
testCompile(group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.2.0')
testRuntime(group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.2.0')
testCompile(group: "junit", name: "junit", version: "4.12")
testRuntime(group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '5.2.0')
}

jar {
Expand All @@ -51,3 +58,10 @@ artifacts { archives sourcesJar }
task wrapper(type: Wrapper) {
gradleVersion = "4.6"
}

test {
useJUnitPlatform {
includeEngines 'junit-jupiter'
includeEngines 'junit-vintage'
}
}
60 changes: 57 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@
<email>[email protected]</email>
<organization>Fuzz Productions</organization>
</contributor>
<contributor>
<name>Oleg Shaburov</name>
<email>[email protected]</email>
<roles>
<role>Automation QA</role>
</roles>
<timezone>+3</timezone>
</contributor>
</contributors>

<licenses>
Expand Down Expand Up @@ -67,6 +75,8 @@
<maven-surefire-plugin.version>2.20</maven-surefire-plugin.version>
<!-- wait three minutes for gitlab to start -->
<docker-maven-plugin.timeOut>180000</docker-maven-plugin.timeOut>
<log4j.version>2.11.0</log4j.version>
<junit.jupiter.version>5.2.0</junit.jupiter.version>
</properties>

<dependencies>
Expand All @@ -85,10 +95,23 @@
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.3</version>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.8.0-beta2</version>
</dependency>
<!-- Test -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -97,6 +120,37 @@
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<scope>test</scope>
</dependency>
<!-- Test provided -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>


Expand Down
Loading