Permalink
Browse files

Update Dependencies

  • Loading branch information...
Bez & Richard
Bez & Richard committed Nov 13, 2014
1 parent d025acd commit cf8d0300b92865b9072544272307570dd27c712a
View
@@ -1,20 +1,22 @@
apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'com.github.ben-manes.versions'
sourceCompatibility = '6'
ext {
junitVersion = '4.8.2'
junitVersion = '4.11'
artifactsDir = "$projectDir/artifacts"
artifactGroupId = 'au.com.ausregistry'
gradleWrapperVersion = '1.11'
gradleWrapperVersion = '2.1'
pagesProjectDir = "$projectDir/../ari-toolkit-gitpages"
commonsCodecVersion = '1.10'
simpleFrameworkVersion = '4.1.21'
httpClientVersion = '4.2.3'
httpClientVersion = '4.3.6'
powerMockVersion = '1.5'
hamcrestVersion = '1.3'
ariMockHttpServerVersion = '1.0.1'
ariMockHttpServerVersion = '1.0.2'
}
version = toolkitVersion
@@ -24,6 +26,17 @@ repositories {
flatDir name:'ExternalJars',dirs:'lib'
}
buildscript {
repositories {
mavenCentral()
jcenter()
}
dependencies {
classpath 'com.github.ben-manes:gradle-versions-plugin:0.5'
}
}
sourceSets {
test {
java.srcDir('src/test/unit/java')
@@ -40,7 +53,7 @@ sourceSets {
}
dependencies {
compile("commons-codec:commons-codec:1.7") {
compile("commons-codec:commons-codec:$commonsCodecVersion") {
exclude group: 'junit', module: 'junit'
}
@@ -61,12 +74,10 @@ dependencies {
integrationTestCompile sourceSets.main.output
integrationTestCompile configurations.testCompile
componentTestCompile "ari-mock-http-server:ari-mock-http-server:$ariMockHttpServerVersion"
componentTestCompile sourceSets.main.output
componentTestCompile configurations.testCompile
testCompile "ari-mock-http-server:ari-mock-http-server:$ariMockHttpServerVersion"
}
tasks.withType(Compile) {
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
options.compilerArgs << "-Xlint:-options"
}
@@ -96,13 +107,14 @@ test.dependsOn jar
task integrationTest(type: Test) {
testClassesDir = sourceSets.integrationTest.output.classesDir
testResultsDir = file('build/test-results/integration')
reports.junitXml.destination = "build/test-results/integration"
classpath += sourceSets.integrationTest.runtimeClasspath
}
task componentTest(type: Test) {
testClassesDir = sourceSets.componentTest.output.classesDir
testResultsDir = file('build/test-results/component')
reports.junitXml.destination = "build/test-results/component"
classpath += sourceSets.componentTest.runtimeClasspath
classpath += sourceSets.componentTest.runtimeClasspath
}
View
@@ -1 +1 @@
toolkitVersion=3.3.4
toolkitVersion=3.3.5
View
BIN +1.12 KB (100%) gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
@@ -1,6 +1,6 @@
#Mon May 05 10:53:39 EST 2014
#Thu Nov 13 13:39:43 EST 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip
View
@@ -7,7 +7,7 @@
##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS="-Dfile.encoding=UTF-8"
DEFAULT_JVM_OPTS=""
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
View
@@ -9,7 +9,7 @@
if "%OS%"=="Windows_NT" setlocal
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8
set DEFAULT_JVM_OPTS=
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
Binary file not shown.
View
@@ -1,7 +1,7 @@
[![Build Status](https://travis-ci.org/AusRegistry/ari-toolkit.png)](https://travis-ci.org/AusRegistry/ari-toolkit)
## Downloads
The latest ari-toolkit is available for download. [ari-toolkit v3.3.4](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk/3.3.4/arjtk-3.3.4.jar) ([sources](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk/3.3.4/arjtk-3.3.4-sources.jar) | [javadoc](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk/3.3.4/arjtk-3.3.4-javadoc.jar))
The latest ari-toolkit is available for download. [ari-toolkit v3.3.5](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk/3.3.5/arjtk-3.3.5.jar) ([sources](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk/3.3.5/arjtk-3.3.5-sources.jar) | [javadoc](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk/3.3.5/arjtk-3.3.5-javadoc.jar))
For more information, please read [Installation and Setup](#installation-and-setup).
@@ -43,7 +43,7 @@ This toolkit also provides a mechanism to perform the following Trademark Cleari
#### Direct download
Obtain the latest toolkit here: [Toolkit v3.3.4](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk/3.3.4/arjtk-3.3.4.jar) ([sources](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk/3.3.4/arjtk-3.3.4-sources.jar) | [javadoc](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk/3.3.4/arjtk-3.3.4-javadoc.jar))
Obtain the latest toolkit here: [Toolkit v3.3.5](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk/3.3.5/arjtk-3.3.5.jar) ([sources](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk/3.3.5/arjtk-3.3.5-sources.jar) | [javadoc](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk/3.3.5/arjtk-3.3.5-javadoc.jar))
#### Dependency Management
@@ -52,7 +52,7 @@ Use your build's dependency management tool to automatically download the toolki
* Repository: `http://ausregistry.github.com/repo/`
* groupId: `au.com.ausregistry`
* artifactId: `arjtk`
* version: `3.3.4`
* version: `3.3.5`
For example (using Maven):
@@ -67,7 +67,7 @@ For example (using Maven):
<dependency>
<groupId>au.com.ausregistry</groupId>
<artifactId>arjtk</artifactId>
<version>3.3.4</version>
<version>3.3.5</version>
</dependency>
</dependencies>
@@ -1,17 +1,15 @@
package com.ausregistry.jtoolkit2;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
import com.ausregistry.jtoolkit2.se.CommandType;
import com.ausregistry.jtoolkit2.se.StandardCommandType;
import com.ausregistry.jtoolkit2.session.SessionManagerProperties;
import com.ausregistry.jtoolkit2.session.SessionPoolProperties;
import com.ausregistry.jtoolkit2.session.SessionProperties;
import java.io.InputStream;
import java.io.IOException;
import java.io.FileNotFoundException;
import java.util.Properties;
import org.junit.Ignore;
@Ignore
@@ -38,8 +36,7 @@ public TestEnvironment() throws IOException {
sitePropsFile = DEFAULT_SITE_PROPS;
}
siteProps = new Properties();
InputStream in = getClass().getClassLoader().getResourceAsStream(
sitePropsFile);
InputStream in = getClass().getClassLoader().getResourceAsStream(sitePropsFile);
if (in == null) {
throw new FileNotFoundException(sitePropsFile);
@@ -2,9 +2,9 @@
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.powermock.api.mockito.PowerMockito.spy;
import static org.powermock.api.mockito.PowerMockito.whenNew;
import javax.net.ssl.HttpsURLConnection;
@@ -46,7 +46,7 @@ public void setUp() throws Exception {
when(mockTlsContext.createHttpsUrlConnection("TMDB server URL/lookupKey.xml", 1000)).thenReturn(mockConnection);
stringInputStream = spy(new ByteArrayInputStream("noticeXml".getBytes()));
stringInputStream = new ByteArrayInputStream("noticeXml".getBytes());
when(mockConnection.getInputStream()).thenReturn(stringInputStream);
whenNew(TmNoticeXmlParser.class).withNoArguments().thenReturn(mockTmNoticeXmlParser);
@@ -65,8 +65,11 @@ public void shouldCreateTlsContextWithTheRightParametersAndRequestAndParseNotice
@Test
public void shouldCloseStream() throws Exception {
InputStream inputStream = spy(stringInputStream);
when(mockConnection.getInputStream()).thenReturn(inputStream);
tmdbClient.requestNotice("lookupKey");
verify(stringInputStream).close();
verify(inputStream).close();
}
}

0 comments on commit cf8d030

Please sign in to comment.