Upgrade dependencies
Change-Id: I371c309923a3fc9a176b1e0a4e277119f1cb060c
diff --git a/build.gradle b/build.gradle
index ac02f8c..cd2bfee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,21 +7,21 @@
}
plugins {
- id 'org.sonarqube' version '1.2'
- id 'net.saliman.cobertura' version '2.3.0'
+ id "org.sonarqube" version "2.6.2"
+ id 'net.saliman.cobertura' version '2.5.4'
}
apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'signing'
-apply plugin: 'maven-publish'
apply plugin: 'checkstyle'
-group = 'com.intel.jndn.management'
-version = '1.1.3'
+// group = 'com.intel.jndn.management'
+group = 'net.named-data.jndn-extra'
+version = '1.1.4'
-sourceCompatibility = JavaVersion.VERSION_1_7
-targetCompatibility = JavaVersion.VERSION_1_7
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
compileJava.options.encoding = 'UTF-8'
repositories {
@@ -29,7 +29,7 @@
jcenter()
mavenCentral()
maven {
- url "https://oss.sonatype.org/content/repositories/snapshots/"
+ url "https://oss.sonatype.org/content/repositories/releases/"
}
}
@@ -56,13 +56,13 @@
}
dependencies {
- compile 'net.named-data:jndn:0.13'
+ compile 'net.named-data:jndn:0.17'
testCompile 'junit:junit:4.12'
- testCompile 'com.intel.jndn.mock:jndn-mock:1.0.3'
- testRuntime 'org.slf4j:slf4j-api:1.7.16'
+ testCompile 'net.named-data.jndn-extra:jndn-mock:1.1.1'
+ testRuntime 'org.slf4j:slf4j-api:1.7.25'
- checkstyleConfig "com.puppycrawl.tools:checkstyle:6.15"
+ checkstyleConfig "com.puppycrawl.tools:checkstyle:8.11"
}
task javadocJar(type: Jar) {
@@ -77,8 +77,12 @@
task integrationTest(type: Test) {
description 'Compile and run integration tests'
- testClassesDir = sourceSets.integrationTest.output.classesDir
+ group = 'verification'
+
+ testClassesDirs = sourceSets.integrationTest.output.classesDirs
classpath = sourceSets.integrationTest.runtimeClasspath
+
+ mustRunAfter test
}
tasks.withType(Test) {
@@ -88,7 +92,7 @@
showStandardStreams = true
exceptionFormat = "full"
}
-// outputs.upToDateWhen { false }
+ outputs.upToDateWhen { false }
}
tasks.withType(Checkstyle) {
@@ -116,15 +120,6 @@
archives javadocJar, sourcesJar
}
-publishing {
- publications {
- mavenJava(MavenPublication) {
- artifact javadocJar
- artifact sourcesJar
- }
- }
-}
-
signing {
required { gradle.taskGraph.hasTask("uploadArchives") }
sign configurations.archives